diff options
| author | hathach <[email protected]> | 2013-06-12 14:06:41 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-06-12 14:06:41 +0700 |
| commit | ee57a6f13fcd8b75611713e3bec5a07202cc8f5a (patch) | |
| tree | 2ed75bea1ff315ac82aa15446d82d84f0a298d90 /tinyusb | |
| parent | 17a27f7398c2807796432bbca5e90d97f09ae051 (diff) | |
clean up
Diffstat (limited to 'tinyusb')
| -rw-r--r-- | tinyusb/class/hid_device.c | 3 | ||||
| -rw-r--r-- | tinyusb/device/usbd.c | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/tinyusb/class/hid_device.c b/tinyusb/class/hid_device.c index 94ec6df68..994218638 100644 --- a/tinyusb/class/hid_device.c +++ b/tinyusb/class/hid_device.c @@ -50,7 +50,7 @@ #if defined(CAP_DEVICE_ROMDRIVER) && TUSB_CFG_DEVICE_USE_ROM_DRIVER #include "device/dcd_nxp_romdriver.h" // TODO remove rom driver dependency -#endif + //--------------------------------------------------------------------+ // MACRO CONSTANT TYPEDEF @@ -325,5 +325,6 @@ ErrorCode_t HID_EpOut_Hdlr (USBD_HANDLE_T hUsb, void* data, uint32_t event) } return LPC_OK; } +#endif #endif diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c index 426ae19aa..0845bf681 100644 --- a/tinyusb/device/usbd.c +++ b/tinyusb/device/usbd.c @@ -95,10 +95,10 @@ void std_get_descriptor(uint8_t coreid) case TUSB_DESC_TYPE_CONFIGURATION: { uint16_t const requested_length = min16_of(usbd_devices[coreid].setup_packet.wLength, sizeof(app_tusb_desc_configuration)-1); - for(uint16_t i=0; i<requested_length; i += 64) - { - dcd_pipe_control_write(coreid, ((uint8_t*)&app_tusb_desc_configuration) + i, min16_of(64, requested_length - i)); - } + ASSERT(requested_length <= TUSB_CFG_DEVICE_CONTROL_PACKET_SIZE, (void)0 ); // multiple packets requires a task a-like + + dcd_pipe_control_write(coreid, ((uint8_t*)&app_tusb_desc_configuration), + requested_length); } break; @@ -157,7 +157,7 @@ tusb_error_t usbd_init (void) ASSERT_STATUS ( dcd_init() ); uint16_t length = 0; - #if TUSB_CFG_DEVICE_HID_KEYBOARD && 0 + #if TUSB_CFG_DEVICE_HID_KEYBOARD ASSERT_STATUS( hidd_init(&app_tusb_desc_configuration.keyboard_interface, &length) ); #endif |