Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-15 15:41:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

turn off the palmos-era bt wrapper stuff I was trying to use to know

Browse source 
when to reset the stack.  It breaks Android when I turn on
XWFEATURE_BLUETOOTH and adds no value I can see.
This commit is contained in:
Eric House 2012-02-07 17:38:24 -08:00
parent aca4e1fed8
commit 7214b7e12a
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
xwords4/common/comms.c
View file

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