diff options
| author | sakumisu <[email protected]> | 2026-03-05 21:55:38 +0800 |
|---|---|---|
| committer | sakumisu <[email protected]> | 2026-03-05 21:55:38 +0800 |
| commit | 9e06532ea3b1cee0af1d62129ff3f7f8b1d858a4 (patch) | |
| tree | ca2029bbd3104e648322847e971036c9d4877ee1 | |
| parent | a8a98f769fc698f1c43a37697111413b89516397 (diff) | |
update(class/hid/usbh_hid): replace report type macro
Signed-off-by: sakumisu <[email protected]>
| -rw-r--r-- | class/hid/usbh_hid.c | 14 | ||||
| -rw-r--r-- | class/hid/usbh_hid.h | 4 |
2 files changed, 7 insertions, 11 deletions
diff --git a/class/hid/usbh_hid.c b/class/hid/usbh_hid.c index 47220306..92db7332 100644 --- a/class/hid/usbh_hid.c +++ b/class/hid/usbh_hid.c @@ -337,15 +337,15 @@ int usbh_hid_parse_report_descriptor(const uint8_t *report_data, uint32_t report current_item->report_flags = itemval; if (itemtag == HID_MAINITEM_TAG_INPUT) { - current_item->report_type = USBH_HID_REPORTITEM_TYPE_INPUT; + current_item->report_type = HID_REPORT_INPUT; } else if (itemtag == HID_MAINITEM_TAG_OUTPUT) { - current_item->report_type = USBH_HID_REPORTITEM_TYPE_OUTPUT; + current_item->report_type = HID_REPORT_OUTPUT; } else { - current_item->report_type = USBH_HID_REPORTITEM_TYPE_FEATURE; + current_item->report_type = HID_REPORT_FEATURE; } - current_item->report_bit_offset = total_report_size[current_item->report_type]; - total_report_size[current_item->report_type] += current_item_attr.report_size * current_item_attr.report_count; + current_item->report_bit_offset = total_report_size[current_item->report_type - 1]; + total_report_size[current_item->report_type - 1] += current_item_attr.report_size * current_item_attr.report_count; memcpy(¤t_item->attribute, ¤t_item_attr, sizeof(struct usbh_hid_report_item_attribute)); report_info->report_item_count++; @@ -437,8 +437,8 @@ err: static void usbh_hid_item_info_print(struct usbh_hid_report_item *item) { - USB_LOG_RAW("Item Type: %s\r\n", (unsigned int)item->report_type == USBH_HID_REPORTITEM_TYPE_INPUT ? "Input" : - (unsigned int)item->report_type == USBH_HID_REPORTITEM_TYPE_OUTPUT ? "Output" : + USB_LOG_RAW("Item Type: %s\r\n", (unsigned int)item->report_type == HID_REPORT_INPUT ? "Input" : + (unsigned int)item->report_type == HID_REPORT_OUTPUT ? "Output" : "Feature"); USB_LOG_RAW("Usage Page: 0x%04x\r\n", (unsigned int)item->attribute.usage_page); USB_LOG_RAW("Report ID: 0x%04x\r\n", (unsigned int)item->attribute.report_id); diff --git a/class/hid/usbh_hid.h b/class/hid/usbh_hid.h index 1c63a0d2..d58c8e1d 100644 --- a/class/hid/usbh_hid.h +++ b/class/hid/usbh_hid.h @@ -12,10 +12,6 @@ #define CONFIG_USB_HID_MAX_REPORT_ITEMS 16 #endif -#define USBH_HID_REPORTITEM_TYPE_INPUT 0 -#define USBH_HID_REPORTITEM_TYPE_OUTPUT 1 -#define USBH_HID_REPORTITEM_TYPE_FEATURE 2 - struct usbh_hid_report_item_attribute { uint16_t usage_page; uint16_t usage_min; |