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

l2cap: move get next channel ID and next signaling sequence num to l2cap

Browse Source
This commit is contained in:
Milanka Ringwald 2019-09-02 11:39:26 +02:00
parent 4536712cf5
commit 6ddef68dd2
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/l2cap.c
View File

@ -84,6 +84,8 @@ static void l2cap_hci_event_handler(uint8_t packet_type, uint16_t channel, uint8
static void l2cap_acl_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size );
static void l2cap_notify_channel_can_send(void);
static void l2cap_emit_can_send_now(btstack_packet_handler_t packet_handler, uint16_t channel);
static uint16_t l2cap_next_local_cid(void);
static uint8_t l2cap_next_sig_id(void);
static l2cap_fixed_channel_t * l2cap_fixed_channel_for_channel_id(uint16_t local_cid);
#ifdef ENABLE_CLASSIC
static void l2cap_handle_remote_supported_features_received(l2cap_channel_t * channel);
@ -137,6 +139,10 @@ static btstack_linked_list_t l2cap_le_services;
// single list of channels for Classic Channels, LE Data Channels, Classic Connectionless, ATT, and SM
static btstack_linked_list_t l2cap_channels;
// next channel id for new connections
static uint16_t local_source_cid = 0x40;
// next signaling sequence number
static uint8_t sig_seq_nr = 0xff;
// used to cache l2cap rejects, echo, and informational requests
static l2cap_signaling_response_t signaling_responses[NR_PENDING_SIGNALING_RESPONSES];
@ -745,6 +751,19 @@ static void l2cap_ertm_handle_in_sequence_sdu(l2cap_channel_t * l2cap_channel, l
#endif
static uint16_t l2cap_next_local_cid(void){
return local_source_cid++;
}
static uint8_t l2cap_next_sig_id(void){
if (sig_seq_nr == 0xff) {
sig_seq_nr = 1;
} else {
sig_seq_nr++;
}
return sig_seq_nr;
}
void l2cap_init(void){
signaling_responses_pending = 0;

16
src/l2cap_signaling.c
View File

@ -79,22 +79,6 @@ NULL, // 0x11 non-supported AMP command
static const unsigned int num_l2cap_commands = sizeof(l2cap_signaling_commands_format) / sizeof(const char *);
uint8_t sig_seq_nr = 0xff;
uint16_t source_cid = 0x40;
uint8_t l2cap_next_sig_id(void){
if (sig_seq_nr == 0xff) {
sig_seq_nr = 1;
} else {
sig_seq_nr++;
}
return sig_seq_nr;
}
uint16_t l2cap_next_local_cid(void){
return source_cid++;
}
static uint16_t l2cap_create_signaling_internal(uint8_t * acl_buffer, hci_con_handle_t handle, uint16_t cid, L2CAP_SIGNALING_COMMANDS cmd, uint8_t identifier, va_list argptr){
const char *format = NULL;

2
src/l2cap_signaling.h
View File

@ -84,8 +84,6 @@ typedef enum {
uint16_t l2cap_create_signaling_classic(uint8_t * acl_buffer,hci_con_handle_t handle, L2CAP_SIGNALING_COMMANDS cmd, uint8_t identifier, va_list argptr);
uint16_t l2cap_create_signaling_le(uint8_t * acl_buffer, hci_con_handle_t handle, L2CAP_SIGNALING_COMMANDS cmd, uint8_t identifier, va_list argptr);
uint8_t l2cap_next_sig_id(void);
uint16_t l2cap_next_local_cid(void);
#if defined __cplusplus
}