Merge branch 'develop'

This commit is contained in:
Matthias Ringwald 2016-07-05 11:07:21 +02:00
commit abef3b9e5d
2 changed files with 4 additions and 6 deletions

View File

@ -40,7 +40,7 @@
#include <string.h>
#include "ant_cmds.h"
#include "ant_cmd.h"
#include "classic/sdp_util.h"
#include "btstack_config.h"
#include "hci.h"

View File

@ -2260,11 +2260,9 @@ uint8_t rfcomm_create_channel(btstack_packet_handler_t packet_handler, bd_addr_t
void rfcomm_disconnect(uint16_t rfcomm_cid){
log_info("RFCOMM_DISCONNECT cid 0x%02x", rfcomm_cid);
rfcomm_channel_t * channel = rfcomm_channel_for_rfcomm_cid(rfcomm_cid);
if (channel) {
channel->state = RFCOMM_CHANNEL_SEND_DISC;
}
// process
if (!channel) return;
channel->state = RFCOMM_CHANNEL_SEND_DISC;
l2cap_request_can_send_now_event(channel->multiplexer->l2cap_cid);
}