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

l2cap: fix compile if le data channels not used

Browse Source
This commit is contained in:
Matthias Ringwald 2016-10-18 15:51:58 +02:00
parent f30489e747
commit a3dc965a0a
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/l2cap.c
View File

@ -161,8 +161,11 @@ void l2cap_init(void){
l2cap_channels = NULL; l2cap_channels = NULL;
l2cap_services = NULL; l2cap_services = NULL;
#ifdef ENABLE_LE_DATA_CHANNELS
l2cap_le_services = NULL; l2cap_le_services = NULL;
l2cap_le_channels = NULL; l2cap_le_channels = NULL;
#endif
l2cap_event_packet_handler = NULL; l2cap_event_packet_handler = NULL;
memset(fixed_channels, 0, sizeof(fixed_channels)); memset(fixed_channels, 0, sizeof(fixed_channels));
@ -1096,7 +1099,7 @@ static void l2cap_hci_event_handler(uint8_t packet_type, uint16_t cid, uint8_t *
btstack_linked_list_iterator_remove(&it); btstack_linked_list_iterator_remove(&it);
btstack_memory_l2cap_channel_free(channel); btstack_memory_l2cap_channel_free(channel);
} }
#ifdef ENABLE_BLE #ifdef ENABLE_LE_DATA_CHANNELS
btstack_linked_list_iterator_init(&it, &l2cap_le_channels); btstack_linked_list_iterator_init(&it, &l2cap_le_channels);
while (btstack_linked_list_iterator_has_next(&it)){ while (btstack_linked_list_iterator_has_next(&it)){
l2cap_channel_t * channel = (l2cap_channel_t *) btstack_linked_list_iterator_next(&it); l2cap_channel_t * channel = (l2cap_channel_t *) btstack_linked_list_iterator_next(&it);
@ -1525,11 +1528,11 @@ static int l2cap_le_signaling_handler_dispatch(hci_con_handle_t handle, uint8_t
hci_connection_t * connection; hci_connection_t * connection;
uint16_t result; uint16_t result;
uint8_t event[10]; uint8_t event[10];
uint16_t local_cid;
l2cap_channel_t * channel;
btstack_linked_list_iterator_t it;
#ifdef ENABLE_LE_DATA_CHANNELS #ifdef ENABLE_LE_DATA_CHANNELS
btstack_linked_list_iterator_t it;
l2cap_channel_t * channel;
uint16_t local_cid;
uint16_t le_psm; uint16_t le_psm;
uint16_t new_credits; uint16_t new_credits;
uint16_t credits_before; uint16_t credits_before;
@ -1591,6 +1594,8 @@ static int l2cap_le_signaling_handler_dispatch(hci_con_handle_t handle, uint8_t
(*l2cap_event_packet_handler)( HCI_EVENT_PACKET, 0, event, sizeof(event)); (*l2cap_event_packet_handler)( HCI_EVENT_PACKET, 0, event, sizeof(event));
break; break;
#ifdef ENABLE_LE_DATA_CHANNELS
case COMMAND_REJECT: case COMMAND_REJECT:
// Find channel for this sig_id and connection handle // Find channel for this sig_id and connection handle
channel = NULL; channel = NULL;
@ -1617,7 +1622,6 @@ static int l2cap_le_signaling_handler_dispatch(hci_con_handle_t handle, uint8_t
} }
break; break;
#ifdef ENABLE_LE_DATA_CHANNELS
case LE_CREDIT_BASED_CONNECTION_REQUEST: case LE_CREDIT_BASED_CONNECTION_REQUEST:
// get hci connection, bail if not found (must not happen) // get hci connection, bail if not found (must not happen)
@ -1767,7 +1771,6 @@ static int l2cap_le_signaling_handler_dispatch(hci_con_handle_t handle, uint8_t
} }
log_info("l2cap: %u credits for 0x%02x, now %u", new_credits, local_cid, channel->credits_outgoing); log_info("l2cap: %u credits for 0x%02x, now %u", new_credits, local_cid, channel->credits_outgoing);
break; break;
#endif
case DISCONNECTION_REQUEST: case DISCONNECTION_REQUEST:
// find channel // find channel
@ -1781,6 +1784,8 @@ static int l2cap_le_signaling_handler_dispatch(hci_con_handle_t handle, uint8_t
channel->state = L2CAP_STATE_WILL_SEND_DISCONNECT_RESPONSE; channel->state = L2CAP_STATE_WILL_SEND_DISCONNECT_RESPONSE;
break; break;
#endif
case DISCONNECTION_RESPONSE: case DISCONNECTION_RESPONSE:
break; break;
@ -1848,7 +1853,8 @@ static void l2cap_acl_handler(uint8_t packet_type, uint16_t channel, uint8_t *pa
if (l2cap_channel) { if (l2cap_channel) {
l2cap_dispatch_to_channel(l2cap_channel, L2CAP_DATA_PACKET, &packet[COMPLETE_L2CAP_HEADER], size-COMPLETE_L2CAP_HEADER); l2cap_dispatch_to_channel(l2cap_channel, L2CAP_DATA_PACKET, &packet[COMPLETE_L2CAP_HEADER], size-COMPLETE_L2CAP_HEADER);
} }
#ifdef ENABLE_BLE
#ifdef ENABLE_LE_DATA_CHANNELS
l2cap_channel = l2cap_le_get_channel_for_local_cid(channel_id); l2cap_channel = l2cap_le_get_channel_for_local_cid(channel_id);
if (l2cap_channel) { if (l2cap_channel) {
// credit counting // credit counting