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

Merge branch 'develop' of https://github.com/bluekitchen/btstack into develop

Browse Source
This commit is contained in:
Milanka Ringwald 2016-04-01 11:57:14 +02:00
commit b4469d4b59
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/classic/bnep.c
View File

@ -370,7 +370,26 @@ int bnep_can_send_packet_now(uint16_t bnep_cid)
return 0; return 0;
} }
return l2cap_can_send_packet_now(channel->l2cap_cid); int can_send = l2cap_can_send_packet_now(channel->l2cap_cid);
if (!can_send){
channel->waiting_for_can_send_now = 1;
}
return can_send;
}
void bnep_request_can_send_now_event(uint16_t bnep_cid)
{
bnep_channel_t *channel = bnep_channel_for_l2cap_cid(bnep_cid);
if (!channel){
log_error("bnep_request_can_send_now_event cid 0x%02x doesn't exist!", bnep_cid);
return;
}
channel->waiting_for_can_send_now = 1;
l2cap_request_can_send_now_event(bnep_cid);
} }
@ -1477,9 +1496,11 @@ static void bnep_channel_state_machine(bnep_channel_t* channel, bnep_channel_eve
return; return;
} }
/* If the event was not yet handled, notify the application layer */ /* If the event was not yet handled, notify the application layer */
bnep_emit_ready_to_send(channel); if (channel->waiting_for_can_send_now){
channel->waiting_for_can_send_now = 0;
bnep_emit_ready_to_send(channel);
}
} }
} }

11
src/classic/bnep.h
View File

@ -139,6 +139,9 @@ typedef struct {
int retry_count; // number of retries for CONTROL SETUP MSG int retry_count; // number of retries for CONTROL SETUP MSG
// l2cap packet handler // l2cap packet handler
btstack_packet_handler_t packet_handler; btstack_packet_handler_t packet_handler;
uint8_t waiting_for_can_send_now;
} bnep_channel_t; } bnep_channel_t;
/* Internal BNEP service descriptor */ /* Internal BNEP service descriptor */
@ -166,6 +169,14 @@ void bnep_init(void);
*/ */
int bnep_can_send_packet_now(uint16_t bnep_cid); int bnep_can_send_packet_now(uint16_t bnep_cid);
/**
* @brief Request emission of BNEP_CAN_SEND_NOW as soon as possible
* @note BNEP_CAN_SEND_NOW might be emitted during call to this function
* so packet handler should be ready to handle it
* @param bnep_cid
*/
void bnep_request_can_send_now_event(uint16_t bnep_cid);
/** /**
* @brief Send a data packet. * @brief Send a data packet.
*/ */