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

btstack_hid_parser: use descriptor iterator for report parsing

Browse Source
This commit is contained in:
Matthias Ringwald 2024-08-12 22:21:41 +02:00
parent 88088c37ee
commit c45181fe4f
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/btstack_hid_parser.c
View File

@ -330,18 +330,8 @@ static void hid_process_item(btstack_hid_parser_t * parser, hid_descriptor_item_
}
static void btstack_hid_parser_find_next_usage(btstack_hid_parser_t * parser){
while (true){
if (parser->descriptor_pos >= parser->descriptor_len){
// end of descriptor
parser->state = BTSTACK_HID_PARSER_COMPLETE;
return;
}
bool ok = btstack_hid_parse_descriptor_item(&parser->descriptor_item, &parser->descriptor[parser->descriptor_pos], parser->descriptor_len - parser->descriptor_pos);
if (ok == false){
// abort parsing
parser->state = BTSTACK_HID_PARSER_COMPLETE;
return;
}
while (btstack_hid_descriptor_iterator_has_more(&parser->descriptor_iterator)){
parser->descriptor_item = * btstack_hid_descriptor_iterator_get_item(&parser->descriptor_iterator);
hid_process_item(parser, &parser->descriptor_item);
if (parser->required_usages){
hid_find_next_usage(parser);
@ -356,12 +346,13 @@ static void btstack_hid_parser_find_next_usage(btstack_hid_parser_t * parser){
} else {
if ((TagType) (&parser->descriptor_item)->item_type == Main) {
// reset usage
parser->usage_pos = parser->descriptor_pos;
parser->usage_pos = parser->descriptor_iterator.descriptor_pos;
parser->usage_page = parser->global_usage_page;
}
parser->descriptor_pos += parser->descriptor_item.item_size;
}
}
// end of descriptor
parser->state = BTSTACK_HID_PARSER_COMPLETE;
}
// PUBLIC API
@ -377,6 +368,8 @@ void btstack_hid_parser_init(btstack_hid_parser_t * parser, const uint8_t * hid_
parser->report_len = hid_report_len;
parser->state = BTSTACK_HID_PARSER_SCAN_FOR_REPORT_ITEM;
btstack_hid_descriptor_iterator_init(&parser->descriptor_iterator, hid_descriptor, hid_descriptor_len);
btstack_hid_parser_find_next_usage(parser);
}
@ -434,7 +427,6 @@ void btstack_hid_parser_get_field(btstack_hid_parser_t * parser, uint16_t * usag
return;
}
if (parser->required_usages == 0u){
parser->descriptor_pos += parser->descriptor_item.item_size;
parser->state = BTSTACK_HID_PARSER_SCAN_FOR_REPORT_ITEM;
btstack_hid_parser_find_next_usage(parser);
} else {

2
src/btstack_hid_parser.h
View File

@ -126,6 +126,7 @@ typedef struct {
// Descriptor
const uint8_t * descriptor;
uint16_t descriptor_len;
btstack_hid_descriptor_iterator_t descriptor_iterator;
// Report
hid_report_type_t report_type;
@ -137,7 +138,6 @@ typedef struct {
hid_descriptor_item_t descriptor_item;
uint16_t descriptor_pos;
uint16_t report_pos_in_bit;
// usage pos and usage_page after last main item, used to find next usage