diff options
| author | hathach <[email protected]> | 2013-05-25 17:19:18 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-05-25 17:19:18 +0700 |
| commit | ed217948b8a25a7c4b7929775079ea8b9086305b (patch) | |
| tree | f615c3755c7e2c681f8f2669bb3c1458911626c6 /tinyusb/class | |
| parent | ae02263d817a7b2f37c7e9c5026fd067b9d75fcc (diff) | |
rename descriptor type, hid descriptor type
Diffstat (limited to 'tinyusb/class')
| -rw-r--r-- | tinyusb/class/hid.h | 6 | ||||
| -rw-r--r-- | tinyusb/class/hid_host.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tinyusb/class/hid.h b/tinyusb/class/hid.h index 2e876c8d8..5cf9a4907 100644 --- a/tinyusb/class/hid.h +++ b/tinyusb/class/hid.h @@ -64,9 +64,9 @@ //}; enum { - HID_DESC_HID = 0x21, - HID_DESC_REPORT = 0x22, - HID_DESC_PHYSICAL = 0x23 + HID_DESC_TYPE_HID = 0x21, + HID_DESC_TYPE_REPORT = 0x22, + HID_DESC_TYPE_PHYSICAL = 0x23 }; typedef ATTR_PREPACKED struct ATTR_PACKED { diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c index 296d26ee0..0cced3226 100644 --- a/tinyusb/class/hid_host.c +++ b/tinyusb/class/hid_host.c @@ -205,14 +205,14 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con //------------- HID descriptor -------------// p_desc += p_desc[DESCRIPTOR_OFFSET_LENGTH]; tusb_hid_descriptor_hid_t const *p_desc_hid = (tusb_hid_descriptor_hid_t const *) p_desc; - ASSERT_INT(HID_DESC_HID, p_desc_hid->bDescriptorType, TUSB_ERROR_INVALID_PARA); + ASSERT_INT(HID_DESC_TYPE_HID, p_desc_hid->bDescriptorType, TUSB_ERROR_INVALID_PARA); //------------- TODO skip Get Report Descriptor -------------// uint8_t *p_report_desc = NULL; // report descriptor has to be global & in USB RAM //------------- Endpoint Descriptor -------------// p_desc += p_desc[DESCRIPTOR_OFFSET_LENGTH]; - ASSERT_INT(TUSB_DESC_ENDPOINT, p_desc[DESCRIPTOR_OFFSET_TYPE], TUSB_ERROR_INVALID_PARA); + ASSERT_INT(TUSB_DESC_TYPE_ENDPOINT, p_desc[DESCRIPTOR_OFFSET_TYPE], TUSB_ERROR_INVALID_PARA); if (p_interface_desc->bInterfaceSubClass == HID_SUBCLASS_BOOT) { |