diff options
| author | hathach <[email protected]> | 2014-03-23 00:00:23 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2014-03-23 00:00:23 +0700 |
| commit | 3a8dce013d0cf153f4c81f8ba891b5abc1b276fd (patch) | |
| tree | ed7414d9b5da402143820b0072b7fa6faa2a5fda /demos/device/src/tusb_descriptors.c | |
| parent | 1cdca167cd41f51ca587a265b41f79446d828e48 (diff) | |
remove IAD_DESC_REQUIRED
add compiler guard for exceeding number of endpoints for lpc11/13u
Diffstat (limited to 'demos/device/src/tusb_descriptors.c')
| -rw-r--r-- | demos/device/src/tusb_descriptors.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/demos/device/src/tusb_descriptors.c b/demos/device/src/tusb_descriptors.c index 5e8c0ad07..33fc895b4 100644 --- a/demos/device/src/tusb_descriptors.c +++ b/demos/device/src/tusb_descriptors.c @@ -143,8 +143,8 @@ tusb_descriptor_device_t desc_device = .bLength = sizeof(tusb_descriptor_device_t),
.bDescriptorType = TUSB_DESC_TYPE_DEVICE,
.bcdUSB = 0x0200,
- #if IAD_DESC_REQUIRED
- // Multiple Interfaces Using Interface Association Descriptor (IAD)
+ #if TUSB_CFG_DEVICE_CDC
+ // Use Interface Association Descriptor (IAD) for CDC
// As required by USB Specs IAD's subclass must be common class (2) and protocol must be IAD (1)
.bDeviceClass = TUSB_CLASS_MISC,
.bDeviceSubClass = MISC_SUBCLASS_COMMON,
@@ -188,7 +188,7 @@ app_descriptor_configuration_t desc_configuration = .bMaxPower = TUSB_DESC_CONFIG_POWER_MA(100)
},
- #if IAD_DESC_REQUIRED
+ #if TUSB_CFG_DEVICE_CDC
// IAD points to CDC Interfaces
.cdc_iad =
{
@@ -203,9 +203,7 @@ app_descriptor_configuration_t desc_configuration = .bFunctionProtocol = CDC_COMM_PROTOCOL_ATCOMMAND,
.iFunction = 0
},
- #endif
- #if TUSB_CFG_DEVICE_CDC
//------------- CDC Communication Interface -------------//
.cdc_comm_interface =
{
|