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

btstack_hid_parser: add HID_REPORT_ID_UNDEFINED

Browse Source
This commit is contained in:
Matthias Ringwald 2024-08-13 15:42:07 +02:00
parent 8f9863439f
commit 279225e6c7
4 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/btstack_hid.h
View File

@ -53,6 +53,9 @@ extern "C" {
#define HID_BOOT_MODE_KEYBOARD_ID 1
#define HID_BOOT_MODE_MOUSE_ID 2
// used to indicate that no 8-bit Report ID has been set / is used
#define HID_REPORT_ID_UNDEFINED 0xffff
typedef enum {
HID_MESSAGE_TYPE_HANDSHAKE = 0,
HID_MESSAGE_TYPE_HID_CONTROL,

28
src/btstack_hid_parser.c
View File

@ -365,11 +365,11 @@ bool btstack_hid_descriptor_iterator_valid(btstack_hid_descriptor_iterator_t * i
}
int btstack_hid_get_report_size_for_id(int report_id, hid_report_type_t report_type, uint16_t hid_descriptor_len, const uint8_t * hid_descriptor) {
int btstack_hid_get_report_size_for_id(uint16_t report_id, hid_report_type_t report_type, uint16_t hid_descriptor_len, const uint8_t * hid_descriptor) {
int total_report_size = 0;
int report_size = 0;
int report_count = 0;
int current_report_id = 0;
int current_report_id = HID_REPORT_ID_UNDEFINED;
btstack_hid_descriptor_iterator_t iterator;
btstack_hid_descriptor_iterator_init(&iterator, hid_descriptor, hid_descriptor_len);
@ -426,10 +426,11 @@ int btstack_hid_get_report_size_for_id(int report_id, hid_report_type_t report_t
}
}
hid_report_id_status_t btstack_hid_id_valid(int report_id, uint16_t hid_descriptor_len, const uint8_t * hid_descriptor){
int current_report_id = -1;
hid_report_id_status_t btstack_hid_report_id_valid(uint16_t report_id, const uint8_t * hid_descriptor, uint16_t hid_descriptor_len){
uint16_t current_report_id = HID_REPORT_ID_UNDEFINED;
btstack_hid_descriptor_iterator_t iterator;
btstack_hid_descriptor_iterator_init(&iterator, hid_descriptor, hid_descriptor_len);
bool report_id_found = false;
while (btstack_hid_descriptor_iterator_has_more(&iterator)) {
const hid_descriptor_item_t *const item = btstack_hid_descriptor_iterator_get_item(&iterator);
switch (item->item_type){
@ -437,8 +438,9 @@ hid_report_id_status_t btstack_hid_id_valid(int report_id, uint16_t hid_descript
switch ((GlobalItemTag)item->item_tag){
case ReportID:
current_report_id = item->item_value;
if (current_report_id != report_id) break;
return HID_REPORT_ID_VALID;
if (current_report_id == report_id) {
report_id_found = true;
}
default:
break;
}
@ -449,11 +451,13 @@ hid_report_id_status_t btstack_hid_id_valid(int report_id, uint16_t hid_descript
}
if (btstack_hid_descriptor_iterator_valid(&iterator)) {
if (current_report_id != -1) {
return HID_REPORT_ID_INVALID;
} else {
return HID_REPORT_ID_UNDECLARED;
if (report_id_found){
return HID_REPORT_ID_VALID;
}
if ((report_id == HID_REPORT_ID_UNDEFINED) && (current_report_id == HID_REPORT_ID_UNDEFINED)) {
return HID_REPORT_ID_VALID;
}
return HID_REPORT_ID_UNDECLARED;
} else {
return HID_REPORT_ID_INVALID;
}
@ -558,7 +562,7 @@ void btstack_hid_usage_iterator_init(btstack_hid_parser_t * parser, const uint8_
parser->descriptor_len = hid_descriptor_len;
parser->report_type = hid_report_type;
parser->state = BTSTACK_HID_PARSER_SCAN_FOR_REPORT_ITEM;
parser->global_report_id = 0xffff;
parser->global_report_id = HID_REPORT_ID_UNDEFINED;
btstack_hid_descriptor_iterator_init(&parser->descriptor_iterator, hid_descriptor, hid_descriptor_len);
btstack_hid_usage_iterator_find_next_usage(parser);
@ -634,7 +638,7 @@ bool btstack_hid_parser_has_more(btstack_hid_parser_t * parser){
while ((parser->have_report_usage_ready == false) && btstack_hid_usage_iterator_has_more(parser)){
btstack_hid_usage_iterator_get_item(parser, &parser->descriptor__usage_item);
// ignore usages for other report ids
if (parser->descriptor__usage_item.report_id != 0xffff){
if (parser->descriptor__usage_item.report_id != HID_REPORT_ID_UNDEFINED){
if (parser->descriptor__usage_item.report_id != parser->report[0]){
continue;
}

8
src/btstack_hid_parser.h
View File

@ -276,22 +276,22 @@ bool btstack_hid_parse_descriptor_item(hid_descriptor_item_t * item, const uint8
/**
* @brief Parses descriptor and returns report size for given report ID and report type
* @param report_id
* @param report_id or HID_REPORT_ID_UNDEFINED
* @param report_type
* @param hid_descriptor_len
* @param hid_descriptor
* @return report size in bytes or 0 on parsing error
*/
int btstack_hid_get_report_size_for_id(int report_id, hid_report_type_t report_type, uint16_t hid_descriptor_len, const uint8_t * hid_descriptor);
int btstack_hid_get_report_size_for_id(uint16_t report_id, hid_report_type_t report_type, uint16_t hid_descriptor_len, const uint8_t * hid_descriptor);
/**
* @brief Parses descriptor and returns status for given report ID
* @param report_id
* @param hid_descriptor_len
* @param hid_descriptor
* @param hid_descriptor_len
* @return status for report id
*/
hid_report_id_status_t btstack_hid_id_valid(int report_id, uint16_t hid_descriptor_len, const uint8_t * hid_descriptor);
hid_report_id_status_t btstack_hid_report_id_valid(uint16_t report_id, const uint8_t * hid_descriptor, uint16_t hid_descriptor_len);
/**
* @brief Parses descriptor and returns true if report ID found

18
test/hid_parser/hid_parser_test.cpp
View File

@ -570,9 +570,9 @@ TEST(HID, GetReportSize){
hid_descriptor = hid_descriptor_keyboard_boot_mode;
hid_descriptor_len = sizeof(hid_descriptor_keyboard_boot_mode);
report_size = btstack_hid_get_report_size_for_id(0, HID_REPORT_TYPE_OUTPUT, hid_descriptor_len, hid_descriptor);
report_size = btstack_hid_get_report_size_for_id(HID_REPORT_ID_UNDEFINED, HID_REPORT_TYPE_OUTPUT, hid_descriptor_len, hid_descriptor);
CHECK_EQUAL(1, report_size);
report_size = btstack_hid_get_report_size_for_id(0, HID_REPORT_TYPE_INPUT, hid_descriptor_len, hid_descriptor);
report_size = btstack_hid_get_report_size_for_id(HID_REPORT_ID_UNDEFINED, HID_REPORT_TYPE_INPUT, hid_descriptor_len, hid_descriptor);
CHECK_EQUAL(8, report_size);
}
@ -600,7 +600,19 @@ TEST(HID, UsageIteratorCombo1){
}
}
#include "btstack_debug.h"
TEST(HID, ValidateReportIdBootKeyboard){
const uint8_t * hid_descriptor = hid_descriptor_keyboard_boot_mode;
uint16_t hid_descriptor_len = sizeof(hid_descriptor_keyboard_boot_mode);
CHECK_EQUAL(HID_REPORT_ID_VALID, btstack_hid_report_id_valid(HID_REPORT_ID_UNDEFINED, hid_descriptor, hid_descriptor_len));
CHECK_EQUAL(HID_REPORT_ID_UNDECLARED, btstack_hid_report_id_valid(1, hid_descriptor, hid_descriptor_len));
}
TEST(HID, ValidateReportIdMouseWithReportId){
const uint8_t * hid_descriptor = mouse_descriptor_with_report_id;
uint16_t hid_descriptor_len = sizeof(mouse_descriptor_with_report_id);
CHECK_EQUAL(HID_REPORT_ID_UNDECLARED, btstack_hid_report_id_valid(HID_REPORT_ID_UNDEFINED, hid_descriptor, hid_descriptor_len));
CHECK_EQUAL(HID_REPORT_ID_VALID, btstack_hid_report_id_valid(1, hid_descriptor, hid_descriptor_len));
}
int main (int argc, const char * argv[]){
#if 1