jesus/tinyusb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app descriptor rename

Browse Source
This commit is contained in:
hathach
2014-03-18 16:58:24 +07:00
parent e73667c078
commit 34756f3862
6 changed files with 30 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
demos/device/src/tusb_config.h
+3 -3
View File
@@ -59,9 +59,9 @@
#define TUSB_CFG_DEVICE_FULLSPEED 1 // TODO refractor, remove
//------------- CLASS -------------//
#define TUSB_CFG_DEVICE_HID_KEYBOARD 0
#define TUSB_CFG_DEVICE_HID_MOUSE 0
#define TUSB_CFG_DEVICE_HID_GENERIC 0
#define TUSB_CFG_DEVICE_HID_KEYBOARD 1
#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
demos/device/src/tusb_descriptors.c
+7 -7
View File
@@ -40,7 +40,7 @@
#if TUSB_CFG_DEVICE_HID_KEYBOARD
ATTR_USB_MIN_ALIGNMENT TUSB_CFG_ATTR_USBRAM
uint8_t app_tusb_keyboard_desc_report[] = {
uint8_t tusbd_hid_keyboard_descriptor_report[] = {
HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ),
HID_USAGE ( HID_USAGE_DESKTOP_KEYBOARD ),
HID_COLLECTION ( HID_COLLECTION_APPLICATION ),
@@ -84,7 +84,7 @@ uint8_t app_tusb_keyboard_desc_report[] = {
#if TUSB_CFG_DEVICE_HID_MOUSE
ATTR_USB_MIN_ALIGNMENT TUSB_CFG_ATTR_USBRAM
uint8_t app_tusb_mouse_desc_report[] = {
uint8_t tusbd_hid_mouse_descriptor_report[] = {
HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ),
HID_USAGE ( HID_USAGE_DESKTOP_MOUSE ),
HID_COLLECTION ( HID_COLLECTION_APPLICATION ),
@@ -129,7 +129,7 @@ uint8_t app_tusb_mouse_desc_report[] = {
#endif
ATTR_USB_MIN_ALIGNMENT TUSB_CFG_ATTR_USBRAM
tusb_descriptor_device_t app_tusb_desc_device =
tusb_descriptor_device_t tusbd_descriptor_device =
{
.bLength = sizeof(tusb_descriptor_device_t),
.bDescriptorType = TUSB_DESC_TYPE_DEVICE,
@@ -160,7 +160,7 @@ tusb_descriptor_device_t app_tusb_desc_device =
};
ATTR_USB_MIN_ALIGNMENT TUSB_CFG_ATTR_USBRAM
app_descriptor_configuration_t app_tusb_desc_configuration =
app_descriptor_configuration_t tusbd_descriptor_configuration =
{
.configuration =
{
@@ -304,7 +304,7 @@ app_descriptor_configuration_t app_tusb_desc_configuration =
.bCountryCode = HID_Local_NotSupported,
.bNumDescriptors = 1,
.bReportType = HID_DESC_TYPE_REPORT,
.wReportLength = sizeof(app_tusb_keyboard_desc_report)
.wReportLength = sizeof(tusbd_hid_keyboard_descriptor_report)
},
.keyboard_endpoint =
@@ -341,7 +341,7 @@ app_descriptor_configuration_t app_tusb_desc_configuration =
.bCountryCode = HID_Local_NotSupported,
.bNumDescriptors = 1,
.bReportType = HID_DESC_TYPE_REPORT,
.wReportLength = sizeof(app_tusb_mouse_desc_report)
.wReportLength = sizeof(tusbd_hid_mouse_descriptor_report)
},
.mouse_endpoint =
@@ -426,7 +426,7 @@ uint16_t desc_str_serial[] =
'1', '2', '3', '4' // len = 4
};
uint8_t* const tusbd_string_desc_table [TUSB_CFG_DEVICE_STRING_DESCRIPTOR_COUNT] =
uint8_t* const tusbd_descriptor_string_table [TUSB_CFG_DEVICE_STRING_DESCRIPTOR_COUNT] =
{
(uint8_t*) desc_str_language,
(uint8_t*) desc_str_manufacturer,
demos/device/src/tusb_descriptors.h
+6 -9
View File
@@ -176,18 +176,15 @@ typedef ATTR_PACKED_STRUCT(struct)
} app_descriptor_configuration_t;
//--------------------------------------------------------------------+
// STRINGS DESCRIPTOR
//--------------------------------------------------------------------+
extern uint8_t * const tusbd_string_desc_table[TUSB_CFG_DEVICE_STRING_DESCRIPTOR_COUNT];
//--------------------------------------------------------------------+
// Export descriptors
//--------------------------------------------------------------------+
extern tusb_descriptor_device_t app_tusb_desc_device;
extern app_descriptor_configuration_t app_tusb_desc_configuration;
extern tusb_descriptor_device_t tusbd_descriptor_device;
extern app_descriptor_configuration_t tusbd_descriptor_configuration;
extern uint8_t app_tusb_keyboard_desc_report[];
extern uint8_t app_tusb_mouse_desc_report[];
extern uint8_t * const tusbd_descriptor_string_table[TUSB_CFG_DEVICE_STRING_DESCRIPTOR_COUNT];
extern uint8_t tusbd_hid_keyboard_descriptor_report[];
extern uint8_t tusbd_hid_mouse_descriptor_report[];
#endif