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

Merge branch 'develop'

Browse Source
This commit is contained in:
Milanka Ringwald 2016-06-03 12:06:40 +02:00
commit f7edf77f96
3 changed files with 630 additions and 565 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

2
src/btstack_util.c
View File

@ -261,7 +261,7 @@ int sscanf_bd_addr(const char * addr_string, bd_addr_t addr){
int single_byte = scan_hex_byte(addr_string);
if (single_byte < 0) break;
addr_string += 2;
addr[i] = single_byte;
buffer[i] = single_byte;
// don't check seperator after last byte
if (i == BD_ADDR_LEN - 1) {
result = 1;

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);
if (!multiplexer) break;
log_info("L2CAP_EVENT_CHANNEL_CLOSED state %u", multiplexer->state);
switch (multiplexer->state) {
case RFCOMM_MULTIPLEXER_W4_CONNECT:
case RFCOMM_MULTIPLEXER_SEND_SABM_0:
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;
// no need to call l2cap_disconnect here, as it's already closed
rfcomm_multiplexer_finalize(multiplexer);
return 1;
default:
break;
}