From 7214b7e12aa062a4b16009a75e6903e006119229 Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@trand>
Date: Tue, 7 Feb 2012 17:38:24 -0800
Subject: [PATCH] turn off the palmos-era bt wrapper stuff I was trying to use
 to know when to reset the stack.  It breaks Android when I turn on
 XWFEATURE_BLUETOOTH and adds no value I can see.

---
 xwords4/common/comms.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/xwords4/common/comms.c b/xwords4/common/comms.c
index 7f860a3e7..85d4285c8 100644
--- a/xwords4/common/comms.c
+++ b/xwords4/common/comms.c
@@ -139,7 +139,7 @@ struct CommsCtxt {
     MPSLOT
 };
 
-#if defined XWFEATURE_BLUETOOTH || defined XWFEATURE_IP_DIRECT
+#if defined XWFEATURE_IP_DIRECT
 typedef enum {
     BTIPMSG_NONE = 0
     ,BTIPMSG_DATA
@@ -186,7 +186,7 @@ static void setHeartbeatTimer( CommsCtxt* comms );
 #else
 # define setHeartbeatTimer( comms )
 #endif
-#if defined XWFEATURE_BLUETOOTH || defined XWFEATURE_IP_DIRECT
+#if defined XWFEATURE_IP_DIRECT
 static XP_S16 send_via_bt_or_ip( CommsCtxt* comms, BTIPMsgType typ, 
                                  XP_PlayerAddr channelNo,
                                  void* data, int dlen );
@@ -647,7 +647,7 @@ sendConnect( CommsCtxt* comms, XP_Bool breakExisting )
         }
         break;
 #endif
-#if defined XWFEATURE_BLUETOOTH || defined XWFEATURE_IP_DIRECT
+#if defined XWFEATURE_IP_DIRECT
     case COMMS_CONN_BT:
     case COMMS_CONN_IP_DIRECT:
         /* This will only work on host side when there's a single guest! */
@@ -1126,7 +1126,7 @@ sendMsg( CommsCtxt* comms, MsgQueueElem* elem )
             XP_LOGF( "%s: skipping message: not connected", __func__ );
         }
 #endif
-#if defined XWFEATURE_BLUETOOTH || defined XWFEATURE_IP_DIRECT
+#if defined XWFEATURE_IP_DIRECT
     } else if ( conType == COMMS_CONN_BT || conType == COMMS_CONN_IP_DIRECT ) {
         result = send_via_bt_or_ip( comms, BTIPMSG_DATA, channelNo, 
                                     elem->msg, elem->len );
@@ -1415,7 +1415,7 @@ noteHBReceived( CommsCtxt* comms/* , const CommsAddrRec* addr */ )
 # define noteHBReceived(a)
 #endif
 
-#if defined XWFEATURE_BLUETOOTH || defined XWFEATURE_IP_DIRECT
+#if defined XWFEATURE_IP_DIRECT
 static XP_Bool
 btIpPreProcess( CommsCtxt* comms, XWStreamCtxt* stream )
 {
@@ -1454,7 +1454,7 @@ preProcess( CommsCtxt* comms, XWStreamCtxt* stream,
         }
         break;
 #endif
-#if defined XWFEATURE_BLUETOOTH || defined XWFEATURE_IP_DIRECT
+#if defined XWFEATURE_IP_DIRECT
     case COMMS_CONN_BT:
     case COMMS_CONN_IP_DIRECT:
         consumed = btIpPreProcess( comms, stream );
@@ -2187,7 +2187,7 @@ relayConnect( CommsCtxt* comms )
 } /* relayConnect */
 #endif
 
-#if defined XWFEATURE_BLUETOOTH || defined XWFEATURE_IP_DIRECT
+#if defined XWFEATURE_IP_DIRECT
 static XP_S16
 send_via_bt_or_ip( CommsCtxt* comms, BTIPMsgType typ, XP_PlayerAddr channelNo,
                    void* data, int dlen )