diff options
| author | hathach <[email protected]> | 2019-09-30 14:45:34 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2019-09-30 14:45:34 +0700 |
| commit | d27291f2889fc78f93963fcfd0e943462275f854 (patch) | |
| tree | 5381e1d32159c51a781fa4ad8c12a144d97fceef /examples/device/cdc_msc/src | |
| parent | 6183dbd0ceefdbff42d30e6691fa9948a695e9af (diff) | |
| parent | 64467010410a8f08f77061b3f389ff7d71ddca84 (diff) | |
Merge branch 'master' into develop
Diffstat (limited to 'examples/device/cdc_msc/src')
| -rw-r--r-- | examples/device/cdc_msc/src/tusb_config.h | 5 | ||||
| -rw-r--r-- | examples/device/cdc_msc/src/usb_descriptors.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/examples/device/cdc_msc/src/tusb_config.h b/examples/device/cdc_msc/src/tusb_config.h index ff7fafd8f..4455f665e 100644 --- a/examples/device/cdc_msc/src/tusb_config.h +++ b/examples/device/cdc_msc/src/tusb_config.h @@ -68,8 +68,9 @@ //-------------------------------------------------------------------- // DEVICE CONFIGURATION //-------------------------------------------------------------------- - -#define CFG_TUD_ENDOINT0_SIZE 64 +#ifndef CFG_TUD_ENDPOINT0_SIZE +#define CFG_TUD_ENDPOINT0_SIZE 64 +#endif //------------- CLASS -------------// #define CFG_TUD_CDC 1 diff --git a/examples/device/cdc_msc/src/usb_descriptors.c b/examples/device/cdc_msc/src/usb_descriptors.c index ac8214e37..11d07e9ba 100644 --- a/examples/device/cdc_msc/src/usb_descriptors.c +++ b/examples/device/cdc_msc/src/usb_descriptors.c @@ -50,7 +50,7 @@ tusb_desc_device_t const desc_device = .bDeviceSubClass = MISC_SUBCLASS_COMMON, .bDeviceProtocol = MISC_PROTOCOL_IAD, - .bMaxPacketSize0 = CFG_TUD_ENDOINT0_SIZE, + .bMaxPacketSize0 = CFG_TUD_ENDPOINT0_SIZE, .idVendor = 0xCafe, .idProduct = USB_PID, |