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

l2cap: fold cbm/ecbm request can send now into l2cap_request_can_send_now_event

Browse Source
This commit is contained in:
Matthias Ringwald 2021-11-22 11:22:29 +01:00
parent 169f7220e3
commit ef59d01394
3 changed files with 37 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/l2cap.c
View File

@ -169,7 +169,7 @@ static int l2cap_channel_ready_for_open(l2cap_channel_t *channel);
static void l2cap_cbm_emit_channel_opened(l2cap_channel_t *channel, uint8_t status);
static void l2cap_cbm_emit_channel_closed(l2cap_channel_t * channel);
static void l2cap_cbm_emit_incoming_connection(l2cap_channel_t *channel);
static void l2cap_cbm_notify_channel_can_send(l2cap_channel_t *channel);
static void l2cap_credit_based_notify_channel_can_send(l2cap_channel_t *channel);
static void l2cap_cbm_finialize_channel_close(l2cap_channel_t *channel);
static inline l2cap_service_t * l2cap_cbm_get_service(uint16_t le_psm);
#endif
@ -1234,11 +1234,13 @@ static l2cap_channel_t * l2cap_get_channel_for_remote_handle_and_cid(hci_con_han
}
#endif
#ifdef ENABLE_CLASSIC
#ifdef L2CAP_USES_CHANNELS
uint8_t l2cap_request_can_send_now_event(uint16_t local_cid){
l2cap_channel_t *channel = l2cap_get_channel_for_local_cid(local_cid);
if (!channel) return L2CAP_LOCAL_CID_DOES_NOT_EXIST;
channel->waiting_for_can_send_now = 1;
switch (channel->channel_type){
case L2CAP_CHANNEL_TYPE_CLASSIC:
#ifdef ENABLE_L2CAP_ENHANCED_RETRANSMISSION_MODE
if (channel->mode == L2CAP_CHANNEL_MODE_ENHANCED_RETRANSMISSION){
l2cap_ertm_notify_channel_can_send(channel);
@ -1246,9 +1248,25 @@ uint8_t l2cap_request_can_send_now_event(uint16_t local_cid){
}
#endif
l2cap_notify_channel_can_send();
break;
#ifdef ENABLE_L2CAP_LE_CREDIT_BASED_FLOW_CONTROL_MODE
case L2CAP_CHANNEL_TYPE_CHANNEL_CBM:
l2cap_credit_based_notify_channel_can_send(channel);
break;
#endif
#ifdef ENABLE_L2CAP_ENHANCED_CREDIT_BASED_FLOW_CONTROL_MODE
case L2CAP_CHANNEL_TYPE_CHANNEL_ECBM:
l2cap_credit_based_notify_channel_can_send(channel);
break;
#endif
default:
break;
}
return ERROR_CODE_SUCCESS;
}
#endif
#ifdef ENABLE_CLASSIC
bool l2cap_can_send_packet_now(uint16_t local_cid){
l2cap_channel_t *channel = l2cap_get_channel_for_local_cid(local_cid);
if (!channel) return false;
@ -4802,7 +4820,7 @@ static void l2cap_credit_based_send_pdu(l2cap_channel_t *channel) {
// send done event
l2cap_emit_simple_event_with_cid(channel, L2CAP_EVENT_CBM_PACKET_SENT);
// inform about can send now
l2cap_cbm_notify_channel_can_send(channel);
l2cap_credit_based_notify_channel_can_send(channel);
}
}
@ -4942,18 +4960,17 @@ static void l2cap_credit_based_handle_pdu(l2cap_channel_t * l2cap_channel, const
l2cap_channel->receive_sdu_len = 0;
}
}
#endif
#ifdef ENABLE_L2CAP_LE_CREDIT_BASED_FLOW_CONTROL_MODE
static void l2cap_cbm_notify_channel_can_send(l2cap_channel_t *channel){
static void l2cap_credit_based_notify_channel_can_send(l2cap_channel_t *channel){
if (!channel->waiting_for_can_send_now) return;
if (channel->send_sdu_buffer) return;
channel->waiting_for_can_send_now = 0;
log_debug("le can send now, local_cid 0x%x", channel->local_cid);
l2cap_emit_simple_event_with_cid(channel, L2CAP_EVENT_CBM_CAN_SEND_NOW);
}
#endif
#ifdef ENABLE_L2CAP_LE_CREDIT_BASED_FLOW_CONTROL_MODE
// 1BH2222
static void l2cap_cbm_emit_incoming_connection(l2cap_channel_t *channel) {
log_info("le incoming addr_type %u, addr %s handle 0x%x psm 0x%x local_cid 0x%x remote_cid 0x%x, remote_mtu %u",
@ -5196,17 +5213,6 @@ uint8_t l2cap_cbm_provide_credits(uint16_t local_cid, uint16_t credits){
return l2cap_credit_based_provide_credits(local_cid, credits);
}
uint8_t l2cap_cbm_request_can_send_now_event(uint16_t local_cid){
l2cap_channel_t * channel = l2cap_get_channel_for_local_cid(local_cid);
if (!channel) {
log_error("can send now, no channel for cid 0x%02x", local_cid);
return L2CAP_LOCAL_CID_DOES_NOT_EXIST;
}
channel->waiting_for_can_send_now = 1;
l2cap_cbm_notify_channel_can_send(channel);
return ERROR_CODE_SUCCESS;
}
uint8_t l2cap_cbm_send_data(uint16_t local_cid, uint8_t * data, uint16_t size){
return l2cap_credit_based_send_data(local_cid, data, size);
}
@ -5391,17 +5397,6 @@ uint8_t l2cap_ecbm_decline_channels(uint16_t local_cid, uint16_t result){
return ERROR_CODE_SUCCESS;
}
uint8_t l2cap_ecbm_request_can_send_now_event(uint16_t local_cid){
l2cap_channel_t * channel = l2cap_get_channel_for_local_cid(local_cid);
if (!channel) {
log_error("can send now, no channel for cid 0x%02x", local_cid);
return L2CAP_LOCAL_CID_DOES_NOT_EXIST;
}
channel->waiting_for_can_send_now = 1;
l2cap_cbm_notify_channel_can_send(channel);
return ERROR_CODE_SUCCESS;
}
uint8_t l2cap_ecbm_reconfigure_channels(uint8_t num_cids, uint16_t * local_cids, int16_t receive_buffer_size, uint8_t ** receive_buffers){
btstack_assert(receive_buffers != NULL);
btstack_assert(local_cids != NULL);
@ -5513,10 +5508,10 @@ bool l2cap_le_can_send_now(uint16_t local_cid){
return l2cap_can_send_packet_now(local_cid);
}
// @deprecated - please use l2cap_cbm_request_can_send_now_event
// @deprecated - please use l2cap_request_can_send_now_event
uint8_t l2cap_le_request_can_send_now_event(uint16_t local_cid){
log_error("deprecated - please use l2cap_cbm_request_can_send_now_event");
return l2cap_cbm_request_can_send_now_event(local_cid);
log_error("deprecated - please use l2cap_request_can_send_now_event");
return l2cap_request_can_send_now_event(local_cid);
}
// @deprecated - please use l2cap_cbm_send_data

13
src/l2cap.h
View File

@ -694,15 +694,6 @@ uint8_t l2cap_cbm_create_channel(btstack_packet_handler_t packet_handler, hci_co
*/
uint8_t l2cap_cbm_provide_credits(uint16_t local_cid, uint16_t credits);
/**
* @brief Request emission of L2CAP_EVENT_CBM_CAN_SEND_NOW as soon as possible
* @note L2CAP_EVENT_CAN_SEND_NOW might be emitted during call to this function
* so packet handler should be ready to handle it
* @param local_cid L2CAP Channel Identifier
*/
uint8_t l2cap_cbm_request_can_send_now_event(uint16_t local_cid);
/**
* @brief Send data for channel in LE Credit-Based Flow-Control Mode
* @note Since data larger then the maximum PDU needs to be segmented into multiple PDUs, data needs to stay valid until ... event
@ -873,6 +864,10 @@ uint8_t l2cap_le_disconnect(uint16_t local_cid);
// @deprecated - please use l2cap_can_send_now
bool l2cap_cbm_can_send_now(uint16_t local_cid);
// @deprecated - please use l2cap_request_can_send_now_event
uint8_t l2cap_cbm_request_can_send_now_event(uint16_t local_cid);
#if defined __cplusplus
}
#endif

2
test/l2cap-channel/l2cap_cbm_test.cpp
View File

@ -227,7 +227,7 @@ TEST(L2CAP_CHANNELS, outgoing_1){
CHECK(hci_number_free_acl_slots_for_handle(HCI_CON_HANDLE_TEST_LE) > 0);
bool can_send_now = l2cap_can_send_packet_now(l2cap_cid);
CHECK(can_send_now);
l2cap_cbm_request_can_send_now_event(l2cap_cid);
l2cap_request_can_send_now_event(l2cap_cid);
CHECK(hci_number_free_acl_slots_for_handle(HCI_CON_HANDLE_TEST_LE) > 0);
l2cap_cbm_send_data(l2cap_cid, (uint8_t *) "hallo", 5);
// CHECK(hci_number_free_acl_slots_for_handle(HCI_CON_HANDLE_TEST) > 0);