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

hid_device: split hid_device_get_instance_for_cid into hid_device_get_instance_for_hid_cid and hid_device_get_instance_for_l2cap_cid

Browse Source
This commit is contained in:
Matthias Ringwald 2019-03-07 11:27:36 +01:00
parent 72e3f392d3
commit 4176cbc02e
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/classic/hid_device.c
View File

@ -124,9 +124,15 @@ static uint16_t hid_device_get_next_cid(void){
} }
// TODO: store hid device connection into list // TODO: store hid device connection into list
static hid_device_t * hid_device_get_instance_for_cid(uint16_t cid){ static hid_device_t * hid_device_get_instance_for_l2cap_cid(uint16_t cid){
// printf("control_cid 0x%02x, interrupt_cid 0x%02x, query_cid 0x%02x \n", _hid_device.control_cid, _hid_device.interrupt_cid, cid); if (_hid_device.control_cid == cid || _hid_device.interrupt_cid == cid){
if (_hid_device.cid == cid || _hid_device.control_cid == cid || _hid_device.interrupt_cid == cid){ return &_hid_device;
}
return NULL;
}
static hid_device_t * hid_device_get_instance_for_hid_cid(uint16_t hid_cid){
if (_hid_device.cid == hid_cid){
return &_hid_device; return &_hid_device;
} }
return NULL; return NULL;
@ -441,7 +447,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t * pack
switch (packet_type){ switch (packet_type){
case L2CAP_DATA_PACKET: case L2CAP_DATA_PACKET:
device = hid_device_get_instance_for_cid(channel); device = hid_device_get_instance_for_l2cap_cid(channel);
if (!device) { if (!device) {
log_error("no device with cid 0x%02x", channel); log_error("no device with cid 0x%02x", channel);
return; return;
@ -701,7 +707,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t * pack
} }
break; break;
case L2CAP_EVENT_CHANNEL_CLOSED: case L2CAP_EVENT_CHANNEL_CLOSED:
device = hid_device_get_instance_for_cid(l2cap_event_channel_closed_get_local_cid(packet)); device = hid_device_get_instance_for_l2cap_cid(l2cap_event_channel_closed_get_local_cid(packet));
if (!device) return; if (!device) return;
// connected_before = device->connected; // connected_before = device->connected;
@ -725,7 +731,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t * pack
case L2CAP_EVENT_CAN_SEND_NOW: case L2CAP_EVENT_CAN_SEND_NOW:
local_cid = l2cap_event_can_send_now_get_local_cid(packet); local_cid = l2cap_event_can_send_now_get_local_cid(packet);
device = hid_device_get_instance_for_cid(local_cid); device = hid_device_get_instance_for_l2cap_cid(local_cid);
if (!device) return; if (!device) return;
switch (device->state){ switch (device->state){
@ -877,7 +883,7 @@ void hid_device_register_report_data_callback(void (*callback)(uint16_t cid, hid
* @param hid_cid * @param hid_cid
*/ */
void hid_device_request_can_send_now_event(uint16_t hid_cid){ void hid_device_request_can_send_now_event(uint16_t hid_cid){
hid_device_t * hid_device = hid_device_get_instance_for_cid(hid_cid); hid_device_t * hid_device = hid_device_get_instance_for_hid_cid(hid_cid);
if (!hid_device || !hid_device->control_cid){ if (!hid_device || !hid_device->control_cid){
hid_device->state = HID_DEVICE_IDLE; hid_device->state = HID_DEVICE_IDLE;
return; return;
@ -890,7 +896,7 @@ void hid_device_request_can_send_now_event(uint16_t hid_cid){
* @param hid_cid * @param hid_cid
*/ */
void hid_device_send_interrupt_message(uint16_t hid_cid, const uint8_t * message, uint16_t message_len){ void hid_device_send_interrupt_message(uint16_t hid_cid, const uint8_t * message, uint16_t message_len){
hid_device_t * hid_device = hid_device_get_instance_for_cid(hid_cid); hid_device_t * hid_device = hid_device_get_instance_for_hid_cid(hid_cid);
if (!hid_device || !hid_device->interrupt_cid) return; if (!hid_device || !hid_device->interrupt_cid) return;
l2cap_send(hid_device->interrupt_cid, (uint8_t*) message, message_len); l2cap_send(hid_device->interrupt_cid, (uint8_t*) message, message_len);
} }
@ -900,7 +906,7 @@ void hid_device_send_interrupt_message(uint16_t hid_cid, const uint8_t * message
* @param hid_cid * @param hid_cid
*/ */
void hid_device_send_control_message(uint16_t hid_cid, const uint8_t * message, uint16_t message_len){ void hid_device_send_control_message(uint16_t hid_cid, const uint8_t * message, uint16_t message_len){
hid_device_t * hid_device = hid_device_get_instance_for_cid(hid_cid); hid_device_t * hid_device = hid_device_get_instance_for_hid_cid(hid_cid);
if (!hid_device || !hid_device->control_cid) return; if (!hid_device || !hid_device->control_cid) return;
l2cap_send(hid_device->control_cid, (uint8_t*) message, message_len); l2cap_send(hid_device->control_cid, (uint8_t*) message, message_len);
} }
@ -919,7 +925,7 @@ uint8_t hid_device_connect(bd_addr_t addr, uint16_t * hid_cid){
} }
// assign hic_cid // assign hic_cid
*hid_cid = hid_device_get_next_cid(); *hid_cid = hid_device_get_next_cid();
// store address // store address
memcpy(hid_device->bd_addr, addr, 6); memcpy(hid_device->bd_addr, addr, 6);
@ -943,7 +949,7 @@ uint8_t hid_device_connect(bd_addr_t addr, uint16_t * hid_cid){
* @result status * @result status
*/ */
void hid_device_disconnect_interrupt_channel(uint16_t hid_cid){ void hid_device_disconnect_interrupt_channel(uint16_t hid_cid){
hid_device_t * hid_device = hid_device_get_instance_for_cid(hid_cid); hid_device_t * hid_device = hid_device_get_instance_for_hid_cid(hid_cid);
if (!hid_device){ if (!hid_device){
log_error("hid_device_disconnect_interrupt_channel: could not find hid device instace"); log_error("hid_device_disconnect_interrupt_channel: could not find hid device instace");
return; return;
@ -955,7 +961,7 @@ void hid_device_disconnect_interrupt_channel(uint16_t hid_cid){
} }
void hid_device_disconnect_control_channel(uint16_t hid_cid){ void hid_device_disconnect_control_channel(uint16_t hid_cid){
hid_device_t * hid_device = hid_device_get_instance_for_cid(hid_cid); hid_device_t * hid_device = hid_device_get_instance_for_hid_cid(hid_cid);
if (!hid_device){ if (!hid_device){
log_error("hid_device_disconnect_control_channel: could not find hid device instace"); log_error("hid_device_disconnect_control_channel: could not find hid device instace");
return; return;
@ -967,7 +973,7 @@ void hid_device_disconnect_control_channel(uint16_t hid_cid){
} }
void hid_device_disconnect(uint16_t hid_cid){ void hid_device_disconnect(uint16_t hid_cid){
hid_device_t * hid_device = hid_device_get_instance_for_cid(hid_cid); hid_device_t * hid_device = hid_device_get_instance_for_hid_cid(hid_cid);
if (!hid_device){ if (!hid_device){
log_error("hid_device_disconnect: could not find hid device instace"); log_error("hid_device_disconnect: could not find hid device instace");
return; return;
@ -982,7 +988,7 @@ void hid_device_disconnect(uint16_t hid_cid){
} }
int hid_device_in_boot_protocol_mode(uint16_t hid_cid){ int hid_device_in_boot_protocol_mode(uint16_t hid_cid){
hid_device_t * hid_device = hid_device_get_instance_for_cid(hid_cid); hid_device_t * hid_device = hid_device_get_instance_for_hid_cid(hid_cid);
if (!hid_device){ if (!hid_device){
log_error("hid_device_in_boot_protocol_mode: could not find hid device instace"); log_error("hid_device_in_boot_protocol_mode: could not find hid device instace");
return 0; return 0;