Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-11-16 07:48:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add method to lookup hostname without access to btlib state. Some cleanup.

Browse source
This commit is contained in:
ehouse 2008-01-07 01:27:45 +00:00
parent b4f2df5eb5
commit 7153bbb574
2 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
xwords4/palm/palmbt.c
View file

@ -163,13 +163,17 @@ static void waitACL( PalmBTStuff* btStuff );
static void pbt_reset_buffers( PalmBTStuff* btStuff );
static void pbt_killLinks( PalmBTStuff* btStuff );
static XP_Bool pbt_checkAddress( PalmBTStuff* btStuff, const CommsAddrRec* addr );
static void pbt_setstate( PalmBTStuff* btStuff, PBT_STATE newState,
const char* whence );
static Err pbt_nameForAddr( PalmBTStuff* btStuff,
const BtLibDeviceAddressType* addr,
char* const out, XP_U16 outlen );
#define SET_STATE(b,s) pbt_setstate((b),(s),__func__)
#ifdef DEBUG
static void pbt_setstate( PalmBTStuff* btStuff, PBT_STATE newState,
const char* whence );
# define SET_STATE(b,s) pbt_setstate((b),(s),__func__)
#else
# define SET_STATE(b,s) (b)->p_connState = (s)
#endif
#define GET_STATE(b) ((b)->p_connState)
#ifdef DEBUG
@ -356,6 +360,19 @@ palm_bt_browse_device( PalmAppGlobals* globals, XP_BtAddr* btAddr,
return success;
} /* palm_bt_browse_device */
Err
palm_bt_nameForAddr( PalmAppGlobals* globals, const XP_BtAddr* addr,
char* const out, XP_U16 outlen )
{
PalmBTStuff* btStuff = globals->btStuff;
Err err = 1; /* whatever */
if ( !!btStuff ) {
err = pbt_nameForAddr( btStuff, (BtLibDeviceAddressType*)addr->bits,
out, outlen );
}
return err;
}
#ifdef DEBUG
void
palm_bt_getStats( PalmAppGlobals* globals, XWStreamCtxt* stream )
@ -411,11 +428,12 @@ pbt_nameForAddr( PalmBTStuff* btStuff, const BtLibDeviceAddressType* addr,
CALL_ERR( err, BtLibGetRemoteDeviceName, btStuff->btLibRefNum,
(BtLibDeviceAddressType*)addr, &nameType,
btLibCachedThenRemote );
XP_ASSERT( errNone == err ); /* deal with btLibErrPending */
XP_LOGF( "%s: got name %s", __func__, nameType.name );
if ( errNone == err ) {
XP_LOGF( "%s: got name %s", __func__, nameType.name );
XP_ASSERT( outlen >= nameType.nameLength );
XP_MEMCPY( out, nameType.name, nameType.nameLength );
XP_ASSERT( outlen >= nameType.nameLength );
XP_MEMCPY( out, nameType.name, nameType.nameLength );
}
return err;
}
@ -1120,12 +1138,14 @@ pbt_checkAddress( PalmBTStuff* btStuff, const CommsAddrRec* addr )
return addrOk;
} /* pbt_checkAddress */
#ifdef DEBUG
static void
pbt_setstate( PalmBTStuff* btStuff, PBT_STATE newState, const char* whence )
{
btStuff->p_connState = newState;
XP_LOGF( "setting state to %s, from %s", stateToStr(newState), whence );
}
#endif
#ifdef BT_USE_RFCOMM

5
xwords4/palm/palmbt.h
View file

@ -81,6 +81,11 @@ XP_S16 palm_bt_send( const XP_U8* buf, XP_U16 len, const CommsAddrRec* addr,
XP_Bool palm_bt_browse_device( PalmAppGlobals* globals, XP_BtAddr* btAddr,
XP_UCHAR* out, XP_U16 len );
/* It's ok to call palm_bt_nameForAddr when BT is not initialized. It will
simply fail. */
Err palm_bt_nameForAddr( PalmAppGlobals* globals, const XP_BtAddr* addr,
char* const out, XP_U16 outlen );
#ifdef DEBUG
void palm_bt_getStats( PalmAppGlobals* globals, XWStreamCtxt* stream );
#endif