diff options
| author | hathach <[email protected]> | 2019-09-09 00:53:05 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-09-09 00:53:05 +0700 |
| commit | 4fe34c8f9b61ad85ce3bcd54466b03666c4578b8 (patch) | |
| tree | c9d3008e9e728ca0f6589cb6f6c77083f0e78976 /examples/device | |
| parent | 6b7fe012f6c9e740160c183077f5780b58024268 (diff) | |
| parent | f8081536310e5ac7a1e8c8ba9295890429a2cb6f (diff) | |
Merge pull request #120 from hathach/develop
Ported STM32F412 Discovery board, close #102
Diffstat (limited to 'examples/device')
| -rw-r--r-- | examples/device/cdc_msc_hid/src/msc_disk.c | 3 | ||||
| -rw-r--r-- | examples/device/cdc_msc_hid/src/tusb_config.h | 9 | ||||
| -rw-r--r-- | examples/device/cdc_msc_hid_freertos/src/msc_disk.c | 3 | ||||
| -rw-r--r-- | examples/device/msc_dual_lun/src/msc_disk_dual.c | 3 |
4 files changed, 11 insertions, 7 deletions
diff --git a/examples/device/cdc_msc_hid/src/msc_disk.c b/examples/device/cdc_msc_hid/src/msc_disk.c index 406baf719..bc61f5d67 100644 --- a/examples/device/cdc_msc_hid/src/msc_disk.c +++ b/examples/device/cdc_msc_hid/src/msc_disk.c @@ -30,7 +30,8 @@ // Some MCU doesn't have enough 8KB SRAM to store the whole disk // We will use Flash as read-only disk -#if CFG_TUSB_MCU == OPT_MCU_LPC13XX +// - LPC1347, LPC11uxx +#if (CFG_TUSB_MCU == OPT_MCU_LPC13XX) || (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) #define DISK_READONLY #endif diff --git a/examples/device/cdc_msc_hid/src/tusb_config.h b/examples/device/cdc_msc_hid/src/tusb_config.h index 544216da9..6eb6c10f1 100644 --- a/examples/device/cdc_msc_hid/src/tusb_config.h +++ b/examples/device/cdc_msc_hid/src/tusb_config.h @@ -75,12 +75,13 @@ #define CFG_TUD_CDC 1 #define CFG_TUD_MSC 1 -#if CFG_TUSB_MCU == OPT_MCU_STM32F4 -// STM32F4 does not have enough endpoints (4, including hardcoded control +// Some STM32 MCUs does not have enough endpoints (4, including control // endpoint) to enable CDC, MSC, and HID simultaneously, so disable HID as a compromise. -#define CFG_TUD_HID 0 +#if CFG_TUSB_MCU == OPT_MCU_STM32F4 + #include "stm32f4xx.h" + #define CFG_TUD_HID ((USB_OTG_FS_MAX_IN_ENDPOINTS > 4) ? 1 : 0) #else -#define CFG_TUD_HID 1 + #define CFG_TUD_HID 1 #endif #define CFG_TUD_MIDI 0 diff --git a/examples/device/cdc_msc_hid_freertos/src/msc_disk.c b/examples/device/cdc_msc_hid_freertos/src/msc_disk.c index 6962e09e1..184602cdd 100644 --- a/examples/device/cdc_msc_hid_freertos/src/msc_disk.c +++ b/examples/device/cdc_msc_hid_freertos/src/msc_disk.c @@ -30,7 +30,8 @@ // Some MCU doesn't have enough 8KB SRAM to store the whole disk // We will use Flash as read-only disk -#if CFG_TUSB_MCU == OPT_MCU_LPC13XX +// - LPC1347, LPC11uxx +#if (CFG_TUSB_MCU == OPT_MCU_LPC13XX) || (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) #define DISK_READONLY #endif diff --git a/examples/device/msc_dual_lun/src/msc_disk_dual.c b/examples/device/msc_dual_lun/src/msc_disk_dual.c index d44d18285..4baf13fc5 100644 --- a/examples/device/msc_dual_lun/src/msc_disk_dual.c +++ b/examples/device/msc_dual_lun/src/msc_disk_dual.c @@ -30,7 +30,8 @@ // Some MCU doesn't have enough 8KB SRAM to store the whole disk // We will use Flash as read-only disk -#if CFG_TUSB_MCU == OPT_MCU_LPC13XX +// - LPC1347, LPC11uxx +#if (CFG_TUSB_MCU == OPT_MCU_LPC13XX) || (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) #define DISK_READONLY #endif |