mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-27 15:35:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

rfcomm: fix compile with ERTM enabled

Browse Source
This commit is contained in:
Matthias Ringwald 2019-09-16 11:24:05 +02:00
parent 71a95af981
commit 895065ea12
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/classic/rfcomm.c
View File

@ -147,7 +147,7 @@ static btstack_linked_list_t rfcomm_services = NULL;
static gap_security_level_t rfcomm_security_level; static gap_security_level_t rfcomm_security_level;
#ifdef RFCOMM_USE_ERTM #ifdef RFCOMM_USE_ERTM
static uint16_t ertm_id; static uint16_t rfcomm_ertm_id;
void (*rfcomm_ertm_request_callback)(rfcomm_ertm_request_t * request); void (*rfcomm_ertm_request_callback)(rfcomm_ertm_request_t * request);
void (*rfcomm_ertm_released_callback)(uint16_t ertm_id); void (*rfcomm_ertm_released_callback)(uint16_t ertm_id);
#endif #endif
@ -195,7 +195,7 @@ static rfcomm_multiplexer_t * rfcomm_multiplexer_for_ertm_id(uint16_t ertm_id) {
btstack_linked_item_t *it; btstack_linked_item_t *it;
for (it = (btstack_linked_item_t *) rfcomm_multiplexers; it ; it = it->next){ for (it = (btstack_linked_item_t *) rfcomm_multiplexers; it ; it = it->next){
rfcomm_multiplexer_t * multiplexer = ((rfcomm_multiplexer_t *) it); rfcomm_multiplexer_t * multiplexer = ((rfcomm_multiplexer_t *) it);
if (multiplexer->ertm_id == l2cap_cid) { if (multiplexer->ertm_id == ertm_id) {
return multiplexer; return multiplexer;
}; };
} }
@ -204,14 +204,14 @@ static rfcomm_multiplexer_t * rfcomm_multiplexer_for_ertm_id(uint16_t ertm_id) {
static uint16_t rfcomm_next_ertm_id(void){ static uint16_t rfcomm_next_ertm_id(void){
do { do {
if (ertm_id == 0xffff) { if (rfcomm_ertm_id == 0xffff) {
// don't use 0 as channel id // don't use 0 as channel id
ertm_id = 1; rfcomm_ertm_id = 1;
} else { } else {
ertm_id++; rfcomm_ertm_id++;
} }
} while (rfcomm_multiplexer_for_ertm_id(ertm_id) != NULL); } while (rfcomm_multiplexer_for_ertm_id(rfcomm_ertm_id) != NULL);
return ertm_id; return rfcomm_ertm_id;
} }
#endif #endif