mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-05 18:40:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Matthias Ringwald 2016-05-25 21:02:53 +02:00
commit 448d4b74f1
2 changed files with 629 additions and 564 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1175
port/nrf5x/main.c
View File

File diff suppressed because it is too large Load Diff

18
src/classic/rfcomm.c
View File

@ -1027,20 +1027,10 @@ static int rfcomm_hci_event_handler(uint8_t *packet, uint16_t size){
log_info("L2CAP_EVENT_CHANNEL_CLOSED cid 0x%0x, mult %p", l2cap_cid, multiplexer); log_info("L2CAP_EVENT_CHANNEL_CLOSED cid 0x%0x, mult %p", l2cap_cid, multiplexer);
if (!multiplexer) break; if (!multiplexer) break;
log_info("L2CAP_EVENT_CHANNEL_CLOSED state %u", multiplexer->state); log_info("L2CAP_EVENT_CHANNEL_CLOSED state %u", multiplexer->state);
switch (multiplexer->state) { // no need to call l2cap_disconnect here, as it's already closed
case RFCOMM_MULTIPLEXER_W4_CONNECT: rfcomm_multiplexer_finalize(multiplexer);
case RFCOMM_MULTIPLEXER_SEND_SABM_0: return 1;
case RFCOMM_MULTIPLEXER_W4_SABM_0:
case RFCOMM_MULTIPLEXER_SEND_UA_0:
case RFCOMM_MULTIPLEXER_W4_UA_0:
case RFCOMM_MULTIPLEXER_OPEN:
// don't call l2cap_disconnect as it's alreay closed
rfcomm_multiplexer_finalize(multiplexer);
return 1;
default:
break;
}
break;
default: default:
break; break;
} }