diff --git a/example/test.c b/example/test.c index f92e91a2b..b2483bddd 100644 --- a/example/test.c +++ b/example/test.c @@ -28,7 +28,7 @@ void event_handler(uint8_t *packet, uint16_t size){ bt_send_cmd(&hci_write_local_name, "BTstack-Test"); } - // use pairing + // use pairing yes/no if ( COMMAND_COMPLETE_EVENT(packet, hci_write_local_name) ) { bt_send_cmd(&hci_write_authentication_enable, 0); } @@ -46,7 +46,7 @@ void event_handler(uint8_t *packet, uint16_t size){ // inform about new l2cap connection if (packet[0] == HCI_EVENT_L2CAP_CHANNEL_OPENED){ - printf("Channel successfully opened, handle 0x%02x, local cid 0x%02x\n", READ_BT_16(packet, 2), READ_BT_16(packet, 4));; + printf("Channel successfully opened, handle 0x%02x, source cid 0x%02x, dest cid 0x%02x\n", READ_BT_16(packet, 2), READ_BT_16(packet, 4), READ_BT_16(packet, 6));; } } diff --git a/src/btstack.c b/src/btstack.c index be8b081b9..d3b5f4390 100644 --- a/src/btstack.c +++ b/src/btstack.c @@ -119,11 +119,12 @@ void l2cap_signaling_handler(l2cap_channel_t *channel, uint8_t *packet, uint16_t channel->state = L2CAP_STATE_OPEN; // notify client - uint8_t event[6]; + uint8_t event[8]; event[0] = HCI_EVENT_L2CAP_CHANNEL_OPENED; - event[1] = 4; + event[1] = 6; bt_store_16(event, 2, channel->handle); bt_store_16(event, 4, channel->source_cid); + bt_store_16(event, 6, channel->dest_cid); (*channel->event_callback)(event, sizeof(event)); break; } @@ -264,7 +265,34 @@ l2cap_channel_t * l2cap_create_channel(bd_addr_t address, uint16_t psm, void (*e return chan; } -void l2cap_disconnect(l2cap_channel_t *channel, uint8_t reason){ +void l2cap_send(uint16_t source_cid, uint8_t *data, uint16_t len){ + // find channel for source_cid, construct l2cap packet and send + linked_item_t *it; + for (it = (linked_item_t *) l2cap_channels; it ; it = it->next){ + l2cap_channel_t * channel = (l2cap_channel_t *) it; + if ( channel->source_cid == source_cid) { + + // use hci_cmd_buffer for now + + // 0 - Connection handle : PB=10 : BC=00 + bt_store_16(hci_cmd_buffer, 0, channel->handle | (2 << 12) | (0 << 14)); + // 2 - ACL length + bt_store_16(hci_cmd_buffer, 2, len + 4); + // 4 - L2CAP packet length + bt_store_16(hci_cmd_buffer, 4, len + 0); + // 6 - L2CAP channel DEST + bt_store_16(hci_cmd_buffer, 6, channel->dest_cid); + // 8 - data + memcpy(&hci_cmd_buffer[8], data, len); + // send + bt_send_acl_packet(hci_cmd_buffer, len+8); + + return; + } + } +} + +void l2cap_disconnect(uint16_t source_cid, uint8_t reason){ // TODO implement } diff --git a/src/btstack.h b/src/btstack.h index ba72e446f..fb58c4c1a 100644 --- a/src/btstack.h +++ b/src/btstack.h @@ -36,4 +36,6 @@ int bt_send_l2cap_signaling_packet(hci_con_handle_t handle, L2CAP_SIGNALING_COMM // outgoing connections l2cap_channel_t * l2cap_create_channel(bd_addr_t bd_addr, uint16_t psm, void (*event_cb)(uint8_t *packet, uint16_t size), void (*data_cb)(uint8_t *packet, uint16_t size)); -void l2cap_disconnect(l2cap_channel_t *channel, uint8_t reason); +void l2cap_disconnect(uint16_t source_cid, uint8_t reason); + +void l2cap_send(uint16_t source_cid, uint8_t *data, uint16_t len);