From 8cb7818bcc048a69b9e2b0a4607c8f75bc35c359 Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 23 May 2013 13:22:46 +0700 Subject: - move CMSIS & driver lib for lpc13u to codebase bsp/lpc13xx - change descriptor.c/h able to build device example --- tests/test/support/descriptor_test.c | 48 +++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 23 deletions(-) (limited to 'tests') diff --git a/tests/test/support/descriptor_test.c b/tests/test/support/descriptor_test.c index 02d2ba527..59f07fce5 100644 --- a/tests/test/support/descriptor_test.c +++ b/tests/test/support/descriptor_test.c @@ -39,29 +39,6 @@ #include "tusb_option.h" #include "descriptor_test.h" -TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4) -tusb_descriptor_device_t const desc_device = -{ - .bLength = sizeof(tusb_descriptor_device_t), - .bDescriptorType = TUSB_DESC_DEVICE, - .bcdUSB = 0x0200, - .bDeviceClass = 0x00, - .bDeviceSubClass = 0x00, - .bDeviceProtocol = 0x00, - - .bMaxPacketSize0 = 64, - - .idVendor = 0x1FC9, - .idProduct = 0x4000, - .bcdDevice = 0x0100, - - .iManufacturer = 0x01, - .iProduct = 0x02, - .iSerialNumber = 0x03, - - .bNumConfigurations = 0x02 -} ; - TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4) const uint8_t keyboard_report_descriptor[] = { HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP ), @@ -140,6 +117,31 @@ const uint8_t mouse_report_descriptor[] = { HID_COLLECTION_END }; + +TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4) +tusb_descriptor_device_t const desc_device = +{ + .bLength = sizeof(tusb_descriptor_device_t), + .bDescriptorType = TUSB_DESC_DEVICE, + .bcdUSB = 0x0200, + .bDeviceClass = 0x00, + .bDeviceSubClass = 0x00, + .bDeviceProtocol = 0x00, + + .bMaxPacketSize0 = 64, + + .idVendor = 0x1FC9, + .idProduct = 0x4000, + .bcdDevice = 0x0100, + + .iManufacturer = 0x01, + .iProduct = 0x02, + .iSerialNumber = 0x03, + + .bNumConfigurations = 0x02 +} ; + + TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4) const app_configuration_desc_t desc_configuration = { -- cgit v1.3.1