diff options
| author | hathach <[email protected]> | 2013-01-26 01:37:15 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-01-26 01:37:15 +0700 |
| commit | 7edda37518f0b193009c832b4092c357d0d01e96 (patch) | |
| tree | c6952e1f97b6c89e37968364c5c0a2a88958b3bf /demos/device | |
| parent | fdc9a82e8c3dcce08613f0c0e1a773f0c39381e0 (diff) | |
add more test code for keyboard hid application API
refractor, restructure, rename several thing regarding host, keyboard etc ...
Diffstat (limited to 'demos/device')
| -rw-r--r-- | demos/device/keyboard/descriptors.c | 10 | ||||
| -rw-r--r-- | demos/device/keyboard/tusb_config.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/demos/device/keyboard/descriptors.c b/demos/device/keyboard/descriptors.c index 8491087e4..bec4858ab 100644 --- a/demos/device/keyboard/descriptors.c +++ b/demos/device/keyboard/descriptors.c @@ -38,7 +38,7 @@ #include "descriptors.h" #ifdef TUSB_CFG_DEVICE_HID_KEYBOARD -TUSB_ATTR_RAM_SECTION ATTR_ALIGNED(4) const uint8_t HID_KeyboardReportDescriptor[] = { +TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4) const uint8_t HID_KeyboardReportDescriptor[] = { HID_UsagePage ( HID_USAGE_PAGE_GENERIC ), HID_Usage ( HID_USAGE_GENERIC_KEYBOARD ), HID_Collection ( HID_Application ), @@ -81,7 +81,7 @@ TUSB_ATTR_RAM_SECTION ATTR_ALIGNED(4) const uint8_t HID_KeyboardReportDescriptor #endif #ifdef TUSB_CFG_DEVICE_HID_MOUSE -TUSB_ATTR_RAM_SECTION ATTR_ALIGNED(4) const uint8_t HID_MouseReportDescriptor[] = { +TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4) const uint8_t HID_MouseReportDescriptor[] = { HID_UsagePage ( HID_USAGE_PAGE_GENERIC ), HID_Usage ( HID_USAGE_GENERIC_MOUSE ), HID_Collection ( HID_Application ), @@ -119,7 +119,7 @@ TUSB_ATTR_RAM_SECTION ATTR_ALIGNED(4) const uint8_t HID_MouseReportDescriptor[] #endif /* USB Standard Device Descriptor */ -TUSB_ATTR_RAM_SECTION ATTR_ALIGNED(4) const USB_DEVICE_DESCRIPTOR USB_DeviceDescriptor = +TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4) const USB_DEVICE_DESCRIPTOR USB_DeviceDescriptor = { .bLength = sizeof(USB_DEVICE_DESCRIPTOR), .bDescriptorType = USB_DEVICE_DESCRIPTOR_TYPE, @@ -153,7 +153,7 @@ TUSB_ATTR_RAM_SECTION ATTR_ALIGNED(4) const USB_DEVICE_DESCRIPTOR USB_DeviceDesc .bNumConfigurations = 0x01 }; -TUSB_ATTR_RAM_SECTION ATTR_ALIGNED(4) const USB_FS_CONFIGURATION_DESCRIPTOR USB_FsConfigDescriptor = +TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4) const USB_FS_CONFIGURATION_DESCRIPTOR USB_FsConfigDescriptor = { .Config = { @@ -358,7 +358,7 @@ TUSB_ATTR_RAM_SECTION ATTR_ALIGNED(4) const USB_FS_CONFIGURATION_DESCRIPTOR USB_ .ConfigDescTermination = 0, }; -TUSB_ATTR_RAM_SECTION ATTR_ALIGNED(4) const USB_STR_DESCRIPTOR USB_StringDescriptor = +TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4) const USB_STR_DESCRIPTOR USB_StringDescriptor = { .LangID = { .bLength = 0x04, .bDescriptorType = USB_STRING_DESCRIPTOR_TYPE }, .strLangID= {0x0409}, // US English diff --git a/demos/device/keyboard/tusb_config.h b/demos/device/keyboard/tusb_config.h index a28701896..1d90033b3 100644 --- a/demos/device/keyboard/tusb_config.h +++ b/demos/device/keyboard/tusb_config.h @@ -79,7 +79,7 @@ #define TUSB_RAM_SECTION ".data.$RAM3" #endif - #define TUSB_ATTR_RAM_SECTION __attribute__ ((section(TUSB_RAM_SECTION))) + #define TUSB_CFG_ATTR_USBRAM __attribute__ ((section(TUSB_RAM_SECTION))) #endif |