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

l2cap: fix event ids and pts test

Browse Source
This commit is contained in:
Matthias Ringwald 2021-11-22 17:36:47 +01:00
parent feadaffdb1
commit d2102f77fe
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform/daemon/src/daemon.c
View File

@ -882,7 +882,6 @@ static int btstack_command_handler(connection_t *connection, uint8_t *packet, ui
uint16_t psm;
uint16_t service_channel;
uint16_t mtu;
uint8_t reason;
uint8_t rfcomm_channel;
uint8_t rfcomm_credits;
uint32_t service_record_handle;

8
src/btstack_defines.h
View File

@ -854,7 +854,7 @@ typedef uint8_t sm_key_t[16];
* @format 2
* @param local_cid
*/
#define L2CAP_EVENT_CAN_SEND_NOW 0x78
#define L2CAP_EVENT_CAN_SEND_NOW 0x79
/*
* @format 2
@ -926,7 +926,7 @@ typedef uint8_t sm_key_t[16];
* @param local_mtu
* @param remote_mtu
*/
#define L2CAP_EVENT_ECBM_CHANNEL_OPENED 0x84
#define L2CAP_EVENT_ECBM_CHANNEL_OPENED 0x8a
/*
* @format 222
@ -934,14 +934,14 @@ typedef uint8_t sm_key_t[16];
* @param mtu
* @param mps
*/
#define L2CAP_EVENT_ECBM_RECONFIGURED 0x85
#define L2CAP_EVENT_ECBM_RECONFIGURED 0x8b
/*
* @format 22
* @param local_cid
* @param reconfigure_result
*/
#define L2CAP_EVENT_ECBM_RECONFIGURATION_COMPLETE 0x86
#define L2CAP_EVENT_ECBM_RECONFIGURATION_COMPLETE 0x8c
// RFCOMM EVENTS

2
src/l2cap.c
View File

@ -1298,8 +1298,10 @@ uint8_t l2cap_send(uint16_t local_cid, const uint8_t *data, uint16_t len){
return L2CAP_LOCAL_CID_DOES_NOT_EXIST;
}
switch (channel->channel_type){
#ifdef ENABLE_CLASSIC
case L2CAP_CHANNEL_TYPE_CLASSIC:
return l2cap_classic_send(channel, data, len);
#endif
#ifdef ENABLE_L2CAP_LE_CREDIT_BASED_FLOW_CONTROL_MODE
case L2CAP_CHANNEL_TYPE_CHANNEL_CBM:
return l2cap_credit_based_send_data(channel, data, len);

26
test/pts/l2cap_cbm_ecbm.c
View File

@ -199,10 +199,10 @@ static void app_packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *
printf("L2CAP: Clasic Channel closed 0x%02x\n", cid);
break;
// LE Data Channels
// LE CBM
case L2CAP_EVENT_CBM_INCOMING_CONNECTION:
psm = l2cap_event_le_incoming_connection_get_psm(packet);
cid = l2cap_event_le_incoming_connection_get_local_cid(packet);
psm = l2cap_event_cbm_incoming_connection_get_psm(packet);
cid = l2cap_event_cbm_incoming_connection_get_local_cid(packet);
if (psm != TSPX_LE_PSM) break;
printf("L2CAP: Accepting incoming LE connection request for 0x%02x, PSM %02x\n", cid, psm);
l2cap_cbm_accept_connection(cid, receive_buffer_X, sizeof(receive_buffer_X), initial_credits);
@ -211,10 +211,10 @@ static void app_packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *
case L2CAP_EVENT_CBM_CHANNEL_OPENED:
// inform about new l2cap connection
l2cap_event_le_channel_opened_get_address(packet, event_address);
psm = l2cap_event_le_channel_opened_get_psm(packet);
cid = l2cap_event_le_channel_opened_get_local_cid(packet);
handle = l2cap_event_le_channel_opened_get_handle(packet);
l2cap_event_cbm_channel_opened_get_address(packet, event_address);
psm = l2cap_event_cbm_channel_opened_get_psm(packet);
cid = l2cap_event_cbm_channel_opened_get_local_cid(packet);
handle = l2cap_event_cbm_channel_opened_get_handle(packet);
if (packet[2] == 0) {
enhanced_data_channel = false;
printf("L2CAP: LE Data Channel successfully opened: %s, handle 0x%02x, psm 0x%02x, local cid 0x%02x, remote cid 0x%02x\n",
@ -243,24 +243,24 @@ static void app_packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *
break;
case L2CAP_EVENT_PACKET_SENT:
cid = l2cap_event_le_packet_sent_get_local_cid(packet);
cid = l2cap_event_packet_sent_get_local_cid(packet);
printf("L2CAP: LE Data Channel Packet sent0x%02x\n", cid);
break;
case L2CAP_EVENT_ECBM_CHANNEL_OPENED:
enhanced_data_channel = true;
cid = l2cap_event_data_channel_opened_get_local_cid(packet);
cid = l2cap_event_ecbm_channel_opened_get_local_cid(packet);
status = l2cap_event_channel_opened_get_status(packet);
if (l2cap_event_channel_opened_get_status(packet) == 0){
cid_credit_based = cid;
enhanced_remote_mtu = l2cap_event_data_channel_opened_get_remote_mtu(packet);
enhanced_remote_mtu = l2cap_event_ecbm_channel_opened_get_remote_mtu(packet);
}
printf("L2CAP_EVENT_ECBM_CHANNEL_OPENED - cid 0x%04x mtu %u, status 0x%02x\n", cid, enhanced_remote_mtu, status);
break;
case L2CAP_EVENT_ECBM_INCOMING_CONNECTION:
printf("L2CAP_EVENT_ECBM_INCOMING_CONNECTION\n");
cid = l2cap_event_data_channel_incoming_get_local_cid(packet);
cid = l2cap_event_ecbm_incoming_connection_get_local_cid(packet);
if (enhanced_authorization_required){
enhanced_authorization_required = false;
l2cap_ecbm_decline_channels(cid, 0x0006);
@ -275,9 +275,9 @@ static void app_packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *
break;
case L2CAP_EVENT_ECBM_RECONFIGURED:
enhanced_remote_mtu = l2cap_event_data_channel_reconfigured_get_mtu(packet);
enhanced_remote_mtu = l2cap_event_ecbm_reconfigured_get_mtu(packet);
printf("L2CAP_EVENT_ECBM_RECONFIGURED - remote mps %u, remote mtu %u\n",
l2cap_event_data_channel_reconfigured_get_mps(packet), enhanced_remote_mtu);
l2cap_event_ecbm_reconfigured_get_mps(packet), enhanced_remote_mtu);
break;
case SM_EVENT_JUST_WORKS_REQUEST: