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

send DM if requested in send_dm_for_dlci in multiplexer_t

Browse Source
This commit is contained in:
matthias.ringwald 2011-07-07 23:06:51 +00:00
parent 70d1daaf4f
commit 1ac74e31e6
1 changed files with 14 additions and 4 deletions

18
src/rfcomm.c

@ -220,6 +220,9 @@ typedef struct {
uint16_t max_frame_size; uint16_t max_frame_size;
// send DM for DLCI != 0
uint8_t send_dm_for_dlci;
} rfcomm_multiplexer_t; } rfcomm_multiplexer_t;
// info regarding an actual coneection // info regarding an actual coneection
@ -357,6 +360,8 @@ static void rfcomm_multiplexer_initialize(rfcomm_multiplexer_t *multiplexer){
bzero(multiplexer, sizeof(rfcomm_multiplexer_t)); bzero(multiplexer, sizeof(rfcomm_multiplexer_t));
multiplexer->state = RFCOMM_MULTIPLEXER_CLOSED; multiplexer->state = RFCOMM_MULTIPLEXER_CLOSED;
multiplexer->l2cap_credits = 0; multiplexer->l2cap_credits = 0;
multiplexer->send_dm_for_dlci = 0;
// - Max RFCOMM header has 6 bytes (P/F bit is set, payload length >= 128) // - Max RFCOMM header has 6 bytes (P/F bit is set, payload length >= 128)
// - therefore, we set RFCOMM max frame size <= Local L2CAP MTU - 6 // - therefore, we set RFCOMM max frame size <= Local L2CAP MTU - 6
multiplexer->max_frame_size = RFCOMM_MAX_PAYLOAD - 6; // max multiplexer->max_frame_size = RFCOMM_MAX_PAYLOAD - 6; // max
@ -933,6 +938,13 @@ static int rfcomm_multiplexer_l2cap_packet_handler(uint16_t channel, uint8_t *pa
} }
static void rfcomm_multiplexer_state_machine(rfcomm_multiplexer_t * multiplexer, RFCOMM_MULTIPLEXER_EVENT event){ static void rfcomm_multiplexer_state_machine(rfcomm_multiplexer_t * multiplexer, RFCOMM_MULTIPLEXER_EVENT event){
// process stored DM responses
if (multiplexer->send_dm_for_dlci){
rfcomm_send_dm_pf(multiplexer, multiplexer->send_dm_for_dlci);
multiplexer->send_dm_for_dlci = 0;
}
switch (multiplexer->state) { switch (multiplexer->state) {
case RFCOMM_MULTIPLEXER_SEND_SABM_0: case RFCOMM_MULTIPLEXER_SEND_SABM_0:
switch (event) { switch (event) {
@ -1134,8 +1146,7 @@ static void rfcomm_channel_state_machine_2(rfcomm_multiplexer_t * multiplexer, u
log_dbg("rfcomm_channel_state_machine_2 service dlci #%u = 0x%08x\n", dlci, (int) service); log_dbg("rfcomm_channel_state_machine_2 service dlci #%u = 0x%08x\n", dlci, (int) service);
if (!service) { if (!service) {
// discard request by sending disconnected mode // discard request by sending disconnected mode
// TODO: store "send DM for #x" in multiplexer struct multiplexer->send_dm_for_dlci = dlci;
rfcomm_send_dm_pf(multiplexer, dlci);
return; return;
} }
@ -1154,8 +1165,7 @@ static void rfcomm_channel_state_machine_2(rfcomm_multiplexer_t * multiplexer, u
if (!channel) { if (!channel) {
// discard request by sending disconnected mode // discard request by sending disconnected mode
// TODO: store "send DM for #x" in multiplexer struct multiplexer->send_dm_for_dlci = dlci;
rfcomm_send_dm_pf(multiplexer, dlci);
return; return;
} }
channel->connection = service->connection; channel->connection = service->connection;