andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

finish descriptor refractor for hid keyboard & mouse

Browse Source
This commit is contained in:
hathach
2014-03-18 18:38:15 +07:00
parent eab4f9642c
commit cf82b13a0e
5 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demos/device/src/tusb_config.h
View File

@@ -63,7 +63,7 @@
#define TUSB_CFG_DEVICE_HID_MOUSE 1
#define TUSB_CFG_DEVICE_HID_GENERIC 0 // not supported yet
#define TUSB_CFG_DEVICE_MSC 1
#define TUSB_CFG_DEVICE_CDC 0
#define TUSB_CFG_DEVICE_CDC 1
//--------------------------------------------------------------------+
// COMMON CONFIGURATION

12
demos/device/src/tusb_descriptors.c
View File

@@ -43,7 +43,7 @@
//--------------------------------------------------------------------+
#if TUSB_CFG_DEVICE_HID_KEYBOARD
ATTR_USB_MIN_ALIGNMENT TUSB_CFG_ATTR_USBRAM
uint8_t tusbd_hid_keyboard_descriptor_report[] = {
uint8_t desc_keyboard_report[] = {
HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ),
HID_USAGE ( HID_USAGE_DESKTOP_KEYBOARD ),
HID_COLLECTION ( HID_COLLECTION_APPLICATION ),
@@ -90,7 +90,7 @@ uint8_t tusbd_hid_keyboard_descriptor_report[] = {
//--------------------------------------------------------------------+
#if TUSB_CFG_DEVICE_HID_MOUSE
ATTR_USB_MIN_ALIGNMENT TUSB_CFG_ATTR_USBRAM
uint8_t tusbd_hid_mouse_descriptor_report[] = {
uint8_t desc_mouse_report[] = {
HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ),
HID_USAGE ( HID_USAGE_DESKTOP_MOUSE ),
HID_COLLECTION ( HID_COLLECTION_APPLICATION ),
@@ -316,7 +316,7 @@ app_descriptor_configuration_t desc_configuration =
.bCountryCode = HID_Local_NotSupported,
.bNumDescriptors = 1,
.bReportType = HID_DESC_TYPE_REPORT,
.wReportLength = sizeof(tusbd_hid_keyboard_descriptor_report)
.wReportLength = sizeof(desc_keyboard_report)
},
.keyboard_endpoint =
@@ -353,7 +353,7 @@ app_descriptor_configuration_t desc_configuration =
.bCountryCode = HID_Local_NotSupported,
.bNumDescriptors = 1,
.bReportType = HID_DESC_TYPE_REPORT,
.wReportLength = sizeof(tusbd_hid_mouse_descriptor_report)
.wReportLength = sizeof(desc_mouse_report)
},
.mouse_endpoint =
@@ -454,10 +454,10 @@ tusbd_descriptor_pointer_t tusbd_descriptor_pointers =
},
#if TUSB_CFG_DEVICE_HID_KEYBOARD
.p_hid_keyboard_report = tusbd_hid_keyboard_descriptor_report,
.p_hid_keyboard_report = desc_keyboard_report,
#endif
#if TUSB_CFG_DEVICE_HID_KEYBOARD
.p_hid_mouse_report = tusbd_hid_mouse_descriptor_report,
.p_hid_mouse_report = desc_mouse_report,
#endif
};

6
demos/device/src/tusb_descriptors.h
View File

@@ -176,10 +176,4 @@ typedef ATTR_PACKED_STRUCT(struct)
} app_descriptor_configuration_t;
//--------------------------------------------------------------------+
// Export descriptors
//--------------------------------------------------------------------+
extern uint8_t tusbd_hid_keyboard_descriptor_report[];
extern uint8_t tusbd_hid_mouse_descriptor_report[];
#endif