diff options
| author | hathach <[email protected]> | 2022-03-20 00:51:00 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2022-03-20 00:51:00 +0700 |
| commit | 45052c625e962fa908c3234c228fca43181436d6 (patch) | |
| tree | ebc895fc17fe056108af39e90e8b87ed6b09d895 /src/tusb_option.h | |
| parent | c0195fc6270394a489faf29fe8fc42dff48bcff1 (diff) | |
| parent | ae531a79f654d566790a4daae350730cdc0a01e9 (diff) | |
Merge branch 'master' into pio-host
Diffstat (limited to 'src/tusb_option.h')
| -rw-r--r-- | src/tusb_option.h | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/src/tusb_option.h b/src/tusb_option.h index 44cdaa3a6..61cc283c4 100644 --- a/src/tusb_option.h +++ b/src/tusb_option.h @@ -80,6 +80,7 @@ #define OPT_MCU_STM32L4 309 ///< ST L4 #define OPT_MCU_STM32G0 310 ///< ST G0 #define OPT_MCU_STM32G4 311 ///< ST G4 +#define OPT_MCU_STM32WB 312 ///< ST WB // Sony #define OPT_MCU_CXD56 400 ///< SONY CXD56 @@ -207,18 +208,23 @@ //------------- Roothub as Device -------------// #if (CFG_TUSB_RHPORT0_MODE) & OPT_MODE_DEVICE - #define TUD_RHPORT_MODE (CFG_TUSB_RHPORT0_MODE) - #define TUD_OPT_RHPORT 0 + #define TUD_RHPORT_MODE (CFG_TUSB_RHPORT0_MODE) + #define TUD_OPT_RHPORT 0 #elif (CFG_TUSB_RHPORT1_MODE) & OPT_MODE_DEVICE - #define TUD_RHPORT_MODE (CFG_TUSB_RHPORT1_MODE) - #define TUD_OPT_RHPORT 1 + #define TUD_RHPORT_MODE (CFG_TUSB_RHPORT1_MODE) + #define TUD_OPT_RHPORT 1 #else - #define TUD_RHPORT_MODE OPT_MODE_NONE - #define TUD_OPT_RHPORT -1 + #define TUD_RHPORT_MODE OPT_MODE_NONE + #define TUD_OPT_RHPORT -1 #endif -#define CFG_TUD_ENABLED ( TUD_RHPORT_MODE & OPT_MODE_DEVICE ) -#define TUD_OPT_HIGH_SPEED ( (TUD_RHPORT_MODE & OPT_MODE_SPEED_MASK) ? (TUD_RHPORT_MODE & OPT_MODE_HIGH_SPEED) : (TUP_RHPORT_HIGHSPEED & (1 << TUD_OPT_RHPORT)) ) +#define CFG_TUD_ENABLED (TUD_RHPORT_MODE & OPT_MODE_DEVICE) + +#if CFG_TUD_ENABLED + #define TUD_OPT_HIGH_SPEED ((TUD_RHPORT_MODE & OPT_MODE_SPEED_MASK) ? (TUD_RHPORT_MODE & OPT_MODE_HIGH_SPEED) : (TUP_RHPORT_HIGHSPEED & (1 << TUD_OPT_RHPORT))) +#else + #define TUD_OPT_HIGH_SPEED 0 +#endif //------------- Roothub as Host -------------// @@ -383,11 +389,16 @@ #define CFG_TUH_VENDOR 0 #endif +#ifndef CFG_TUH_API_EDPT_XFER +#define CFG_TUH_API_EDPT_XFER 0 +#endif + // Enable PIO-USB software host controller #ifndef CFG_TUH_RPI_PIO_USB #define CFG_TUH_RPI_PIO_USB 0 #endif + //------------------------------------------------------------------ // Configuration Validation //------------------------------------------------------------------ |