mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-27 21:40:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

enqueue hci_write_scan_enable command and process in hci_run

Browse Source
This commit is contained in:
matthias.ringwald 2011-08-20 17:02:52 +00:00
parent 5fc2292623
commit b031bebb4a
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/hci.c
View File

@ -633,6 +633,10 @@ void hci_init(hci_transport_t *transport, void *config, bt_control_t *control, r
hci_stack.connections = NULL;
hci_stack.discoverable = 0;
// no pending cmds
hci_stack.decline_reason = 0;
hci_stack.new_scan_enable_value = 0xff;
// higher level handler
hci_stack.packet_handler = dummy_handler;
@ -887,8 +891,11 @@ void hci_discoverable_control(uint8_t enable){
return;
}
hci_send_cmd(&hci_write_scan_enable, 2 | enable); // 1 = inq scan, 2 = page scan
// store request to send command but accept in higher layer view
hci_stack.new_scan_enable_value = 2 | enable; // 1 = inq scan, 2 = page scan
hci_stack.discoverable = enable;
hci_run();
}
void hci_run(){
@ -898,22 +905,29 @@ void hci_run(){
if (!hci_can_send_packet_now(HCI_COMMAND_DATA_PACKET)) return;
// global/non-connection oriented commands - decline incoming connections
// global/non-connection oriented commands
// decline incoming connections
if (hci_stack.decline_reason){
uint8_t reason = hci_stack.decline_reason;
hci_stack.decline_reason = 0;
hci_send_cmd(&hci_reject_connection_request, hci_stack.decline_addr, reason);
}
if (!hci_can_send_packet_now(HCI_COMMAND_DATA_PACKET)) return;
// send scan enable
if (hci_stack.new_scan_enable_value){
hci_send_cmd(&hci_write_scan_enable, hci_stack.new_scan_enable_value);
hci_stack.new_scan_enable_value = 0xff;
}
// send pending HCI commands
for (it = (linked_item_t *) hci_stack.connections; it ; it = it->next){
connection = (hci_connection_t *) it;
if (!hci_can_send_packet_now(HCI_COMMAND_DATA_PACKET)) return;
if (!hci_can_send_packet_now(HCI_COMMAND_DATA_PACKET)) {
// log_info("hci_run: cannot send command packet\n");
return;
}
connection = (hci_connection_t *) it;
if (connection->state == RECEIVED_CONNECTION_REQUEST){
log_info("sending hci_accept_connection_request\n");

6
src/hci.h
View File

@ -281,9 +281,11 @@ typedef struct {
uint8_t substate;
uint8_t cmds_ready;
/* */
uint8_t discoverable;
/* buffer for scan enable cmd - 0xff no change */
uint8_t new_scan_enable_value;
// buffer for single connection decline
uint8_t decline_reason;
bd_addr_t decline_addr;
@ -295,7 +297,7 @@ uint16_t hci_create_cmd(uint8_t *hci_cmd_buffer, hci_cmd_t *cmd, ...);
uint16_t hci_create_cmd_internal(uint8_t *hci_cmd_buffer, const hci_cmd_t *cmd, va_list argptr);
// set up HCI
void hci_init(const hci_transport_t *transport, void *config, const bt_control_t *control, const remote_device_db_t * remote_device_db);
void hci_init(hci_transport_t *transport, void *config, bt_control_t *control, remote_device_db_t * remote_device_db);
void hci_register_packet_handler(void (*handler)(uint8_t packet_type, uint8_t *packet, uint16_t size));
void hci_close(void);