kingkevin
/
passkey_fw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename board specific macro for example 

- BOARD_DEVICE/HOST_RHPORT_NUM to  BOARD_TUD/H_RHPORT
- BOARD_DEVICE/HOST_RHPORT_SPEED to  BOARD_TUD/H_MAX_SPEED
This commit is contained in:
hathach 2022-06-01 23:53:40 +07:00
parent d1d6bd2831
commit 99c1585ed2
29 changed files with 226 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
examples/device/cdc_dual_ports/src/tusb_config.h
View File

@ -40,21 +40,21 @@
#endif #endif
// RHPort number used for device can be defined by board.mk, default to port 0 // RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_DEVICE_RHPORT_NUM #ifndef BOARD_TUD_RHPORT
#define BOARD_DEVICE_RHPORT_NUM 0 #define BOARD_TUD_RHPORT 0
#endif #endif
// RHPort max operational speed can defined by board.mk // RHPort max operational speed can defined by board.mk
// Default to max (auto) speed for MCU with internal HighSpeed PHY // Default to max (auto) speed for MCU with internal HighSpeed PHY
#ifndef BOARD_DEVICE_RHPORT_SPEED #ifndef BOARD_TUD_MAX_SPEED
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_DEFAULT_SPEED #define BOARD_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED
#endif #endif
// Device mode with rhport and speed defined by board.mk // Device mode with rhport and speed defined by board.mk
#if BOARD_DEVICE_RHPORT_NUM == 0 #if BOARD_TUD_RHPORT == 0
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#elif BOARD_DEVICE_RHPORT_NUM == 1 #elif BOARD_TUD_RHPORT == 1
#define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#else #else
#error "Incorrect RHPort configuration" #error "Incorrect RHPort configuration"
#endif #endif

54
examples/device/cdc_msc/src/tusb_config.h
View File

@ -39,31 +39,45 @@
#error CFG_TUSB_MCU must be defined #error CFG_TUSB_MCU must be defined
#endif #endif
// RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_DEVICE_RHPORT_NUM
#define BOARD_DEVICE_RHPORT_NUM 0
#endif
// RHPort max operational speed can defined by board.mk
// Default to max (auto) speed for MCU with internal HighSpeed PHY
#ifndef BOARD_DEVICE_RHPORT_SPEED
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_DEFAULT_SPEED
#endif
// Device mode with rhport and speed defined by board.mk
#if BOARD_DEVICE_RHPORT_NUM == 0
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED)
#elif BOARD_DEVICE_RHPORT_NUM == 1
#define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED)
#else
#error "Incorrect RHPort configuration"
#endif
// This example doesn't use an RTOS // This example doesn't use an RTOS
#ifndef CFG_TUSB_OS #ifndef CFG_TUSB_OS
#define CFG_TUSB_OS OPT_OS_NONE #define CFG_TUSB_OS OPT_OS_NONE
#endif #endif
// Enable Device stack
#define CFG_TUD_ENABLED 1
// RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_TUD_RHPORT
#define BOARD_TUD_RHPORT 0
#endif
// RHPort max operational speed can defined by board.mk
// Default to max (auto) speed for MCU with internal HighSpeed PHY
#ifndef BOARD_TUD_MAX_SPEED
#define BOARD_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED
#endif
// Device mode with rhport and speed defined by board.mk
#if BOARD_TUD_RHPORT == 0
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#elif BOARD_TUD_RHPORT == 1
#define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#else
#error "Incorrect RHPort configuration"
#endif
// Device max speed, default is max speed that hardware controller could support without external PHY
// BOARD_TUD_MAX_SPEED can be used to change value (e.g for board features external PHY).
#ifdef BOARD_TUD_MAX_SPEED
#define CFG_TUD_MAX_SPEED BOARD_TUD_MAX_SPEED
#else
#define CFG_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED
#endif
// CFG_TUSB_DEBUG is defined by compiler in DEBUG build // CFG_TUSB_DEBUG is defined by compiler in DEBUG build
// #define CFG_TUSB_DEBUG 0 // #define CFG_TUSB_DEBUG 0

18
examples/device/cdc_msc_freertos/src/tusb_config.h
View File

@ -40,26 +40,26 @@
#endif #endif
// RHPort number used for device can be defined by board.mk, default to port 0 // RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_DEVICE_RHPORT_NUM #ifndef BOARD_TUD_RHPORT
#define BOARD_DEVICE_RHPORT_NUM 0 #define BOARD_TUD_RHPORT 0
#endif #endif
// RHPort max operational speed can defined by board.mk // RHPort max operational speed can defined by board.mk
// Default to Highspeed for MCU with internal HighSpeed PHY (can be port specific), otherwise FullSpeed // Default to Highspeed for MCU with internal HighSpeed PHY (can be port specific), otherwise FullSpeed
#ifndef BOARD_DEVICE_RHPORT_SPEED #ifndef BOARD_TUD_MAX_SPEED
#if (CFG_TUSB_MCU == OPT_MCU_LPC18XX || CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX || \ #if (CFG_TUSB_MCU == OPT_MCU_LPC18XX || CFG_TUSB_MCU == OPT_MCU_LPC43XX || CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX || \
CFG_TUSB_MCU == OPT_MCU_NUC505 || CFG_TUSB_MCU == OPT_MCU_CXD56) CFG_TUSB_MCU == OPT_MCU_NUC505 || CFG_TUSB_MCU == OPT_MCU_CXD56)
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_HIGH_SPEED #define BOARD_TUD_MAX_SPEED OPT_MODE_HIGH_SPEED
#else #else
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_FULL_SPEED #define BOARD_TUD_MAX_SPEED OPT_MODE_FULL_SPEED
#endif #endif
#endif #endif
// Device mode with rhport and speed defined by board.mk // Device mode with rhport and speed defined by board.mk
#if BOARD_DEVICE_RHPORT_NUM == 0 #if BOARD_TUD_RHPORT == 0
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#elif BOARD_DEVICE_RHPORT_NUM == 1 #elif BOARD_TUD_RHPORT == 1
#define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#else #else
#error "Incorrect RHPort configuration" #error "Incorrect RHPort configuration"
#endif #endif

16
examples/device/dfu/src/tusb_config.h
View File

@ -22,21 +22,21 @@
#endif #endif
// RHPort number used for device can be defined by board.mk, default to port 0 // RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_DEVICE_RHPORT_NUM #ifndef BOARD_TUD_RHPORT
#define BOARD_DEVICE_RHPORT_NUM 0 #define BOARD_TUD_RHPORT 0
#endif #endif
// RHPort max operational speed can defined by board.mk // RHPort max operational speed can defined by board.mk
// Default to max (auto) speed for MCU with internal HighSpeed PHY // Default to max (auto) speed for MCU with internal HighSpeed PHY
#ifndef BOARD_DEVICE_RHPORT_SPEED #ifndef BOARD_TUD_MAX_SPEED
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_DEFAULT_SPEED #define BOARD_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED
#endif #endif
// Device mode with rhport and speed defined by board.mk // Device mode with rhport and speed defined by board.mk
#if BOARD_DEVICE_RHPORT_NUM == 0 #if BOARD_TUD_RHPORT == 0
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#elif BOARD_DEVICE_RHPORT_NUM == 1 #elif BOARD_TUD_RHPORT == 1
#define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#else #else
#error "Incorrect RHPort configuration" #error "Incorrect RHPort configuration"
#endif #endif

16
examples/device/dfu_runtime/src/tusb_config.h
View File

@ -22,21 +22,21 @@
#endif #endif
// RHPort number used for device can be defined by board.mk, default to port 0 // RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_DEVICE_RHPORT_NUM #ifndef BOARD_TUD_RHPORT
#define BOARD_DEVICE_RHPORT_NUM 0 #define BOARD_TUD_RHPORT 0
#endif #endif
// RHPort max operational speed can defined by board.mk // RHPort max operational speed can defined by board.mk
// Default to max (auto) speed for MCU with internal HighSpeed PHY // Default to max (auto) speed for MCU with internal HighSpeed PHY
#ifndef BOARD_DEVICE_RHPORT_SPEED #ifndef BOARD_TUD_MAX_SPEED
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_DEFAULT_SPEED #define BOARD_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED
#endif #endif
// Device mode with rhport and speed defined by board.mk // Device mode with rhport and speed defined by board.mk
#if BOARD_DEVICE_RHPORT_NUM == 0 #if BOARD_TUD_RHPORT == 0
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#elif BOARD_DEVICE_RHPORT_NUM == 1 #elif BOARD_TUD_RHPORT == 1
#define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#else #else
#error "Incorrect RHPort configuration" #error "Incorrect RHPort configuration"
#endif #endif

16
examples/device/dynamic_configuration/src/tusb_config.h
View File

@ -40,21 +40,21 @@
#endif #endif
// RHPort number used for device can be defined by board.mk, default to port 0 // RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_DEVICE_RHPORT_NUM #ifndef BOARD_TUD_RHPORT
#define BOARD_DEVICE_RHPORT_NUM 0 #define BOARD_TUD_RHPORT 0
#endif #endif
// RHPort max operational speed can defined by board.mk // RHPort max operational speed can defined by board.mk
// Default to max (auto) speed for MCU with internal HighSpeed PHY // Default to max (auto) speed for MCU with internal HighSpeed PHY
#ifndef BOARD_DEVICE_RHPORT_SPEED #ifndef BOARD_TUD_MAX_SPEED
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_DEFAULT_SPEED #define BOARD_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED
#endif #endif
// Device mode with rhport and speed defined by board.mk // Device mode with rhport and speed defined by board.mk
#if BOARD_DEVICE_RHPORT_NUM == 0 #if BOARD_TUD_RHPORT == 0
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#elif BOARD_DEVICE_RHPORT_NUM == 1 #elif BOARD_TUD_RHPORT == 1
#define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#else #else
#error "Incorrect RHPort configuration" #error "Incorrect RHPort configuration"
#endif #endif

18
examples/device/hid_boot_interface/src/tusb_config.h
View File

@ -41,24 +41,24 @@
// Use raspberry pio-usb for device // Use raspberry pio-usb for device
// #define CFG_TUD_RPI_PIO_USB 1 // #define CFG_TUD_RPI_PIO_USB 1
// #define BOARD_DEVICE_RHPORT_NUM 1 // #define BOARD_TUD_RHPORT 1
// RHPort number used for device can be defined by board.mk, default to port 0 // RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_DEVICE_RHPORT_NUM #ifndef BOARD_TUD_RHPORT
#define BOARD_DEVICE_RHPORT_NUM 0 #define BOARD_TUD_RHPORT 0
#endif #endif
// RHPort max operational speed can defined by board.mk // RHPort max operational speed can defined by board.mk
// Default to max (auto) speed for MCU with internal HighSpeed PHY // Default to max (auto) speed for MCU with internal HighSpeed PHY
#ifndef BOARD_DEVICE_RHPORT_SPEED #ifndef BOARD_TUD_MAX_SPEED
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_DEFAULT_SPEED #define BOARD_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED
#endif #endif
// Device mode with rhport and speed defined by board.mk // Device mode with rhport and speed defined by board.mk
#if BOARD_DEVICE_RHPORT_NUM == 0 #if BOARD_TUD_RHPORT == 0
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#elif BOARD_DEVICE_RHPORT_NUM == 1 #elif BOARD_TUD_RHPORT == 1
#define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#else #else
#error "Incorrect RHPort configuration" #error "Incorrect RHPort configuration"
#endif #endif

16
examples/device/hid_composite/src/tusb_config.h
View File

@ -40,21 +40,21 @@
#endif #endif
// RHPort number used for device can be defined by board.mk, default to port 0 // RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_DEVICE_RHPORT_NUM #ifndef BOARD_TUD_RHPORT
#define BOARD_DEVICE_RHPORT_NUM 0 #define BOARD_TUD_RHPORT 0
#endif #endif
// RHPort max operational speed can defined by board.mk // RHPort max operational speed can defined by board.mk
// Default to max (auto) speed for MCU with internal HighSpeed PHY // Default to max (auto) speed for MCU with internal HighSpeed PHY
#ifndef BOARD_DEVICE_RHPORT_SPEED #ifndef BOARD_TUD_MAX_SPEED
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_DEFAULT_SPEED #define BOARD_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED
#endif #endif
// Device mode with rhport and speed defined by board.mk // Device mode with rhport and speed defined by board.mk
#if BOARD_DEVICE_RHPORT_NUM == 0 #if BOARD_TUD_RHPORT == 0
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#elif BOARD_DEVICE_RHPORT_NUM == 1 #elif BOARD_TUD_RHPORT == 1
#define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#else #else
#error "Incorrect RHPort configuration" #error "Incorrect RHPort configuration"
#endif #endif

16
examples/device/hid_composite_freertos/src/tusb_config.h
View File

@ -40,21 +40,21 @@
#endif #endif
// RHPort number used for device can be defined by board.mk, default to port 0 // RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_DEVICE_RHPORT_NUM #ifndef BOARD_TUD_RHPORT
#define BOARD_DEVICE_RHPORT_NUM 0 #define BOARD_TUD_RHPORT 0
#endif #endif
// RHPort max operational speed can defined by board.mk // RHPort max operational speed can defined by board.mk
// Default to max (auto) speed for MCU with internal HighSpeed PHY // Default to max (auto) speed for MCU with internal HighSpeed PHY
#ifndef BOARD_DEVICE_RHPORT_SPEED #ifndef BOARD_TUD_MAX_SPEED
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_DEFAULT_SPEED #define BOARD_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED
#endif #endif
// Device mode with rhport and speed defined by board.mk // Device mode with rhport and speed defined by board.mk
#if BOARD_DEVICE_RHPORT_NUM == 0 #if BOARD_TUD_RHPORT == 0
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#elif BOARD_DEVICE_RHPORT_NUM == 1 #elif BOARD_TUD_RHPORT == 1
#define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#else #else
#error "Incorrect RHPort configuration" #error "Incorrect RHPort configuration"
#endif #endif

16
examples/device/hid_generic_inout/src/tusb_config.h
View File

@ -40,21 +40,21 @@
#endif #endif
// RHPort number used for device can be defined by board.mk, default to port 0 // RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_DEVICE_RHPORT_NUM #ifndef BOARD_TUD_RHPORT
#define BOARD_DEVICE_RHPORT_NUM 0 #define BOARD_TUD_RHPORT 0
#endif #endif
// RHPort max operational speed can defined by board.mk // RHPort max operational speed can defined by board.mk
// Default to max (auto) speed for MCU with internal HighSpeed PHY // Default to max (auto) speed for MCU with internal HighSpeed PHY
#ifndef BOARD_DEVICE_RHPORT_SPEED #ifndef BOARD_TUD_MAX_SPEED
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_DEFAULT_SPEED #define BOARD_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED
#endif #endif
// Device mode with rhport and speed defined by board.mk // Device mode with rhport and speed defined by board.mk
#if BOARD_DEVICE_RHPORT_NUM == 0 #if BOARD_TUD_RHPORT == 0
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#elif BOARD_DEVICE_RHPORT_NUM == 1 #elif BOARD_TUD_RHPORT == 1
#define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#else #else
#error "Incorrect RHPort configuration" #error "Incorrect RHPort configuration"
#endif #endif

16
examples/device/hid_multiple_interface/src/tusb_config.h
View File

@ -40,21 +40,21 @@
#endif #endif
// RHPort number used for device can be defined by board.mk, default to port 0 // RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_DEVICE_RHPORT_NUM #ifndef BOARD_TUD_RHPORT
#define BOARD_DEVICE_RHPORT_NUM 0 #define BOARD_TUD_RHPORT 0
#endif #endif
// RHPort max operational speed can defined by board.mk // RHPort max operational speed can defined by board.mk
// Default to max (auto) speed for MCU with internal HighSpeed PHY // Default to max (auto) speed for MCU with internal HighSpeed PHY
#ifndef BOARD_DEVICE_RHPORT_SPEED #ifndef BOARD_TUD_MAX_SPEED
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_DEFAULT_SPEED #define BOARD_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED
#endif #endif
// Device mode with rhport and speed defined by board.mk // Device mode with rhport and speed defined by board.mk
#if BOARD_DEVICE_RHPORT_NUM == 0 #if BOARD_TUD_RHPORT == 0
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#elif BOARD_DEVICE_RHPORT_NUM == 1 #elif BOARD_TUD_RHPORT == 1
#define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#else #else
#error "Incorrect RHPort configuration" #error "Incorrect RHPort configuration"
#endif #endif

16
examples/device/midi_test/src/tusb_config.h
View File

@ -40,21 +40,21 @@
#endif #endif
// RHPort number used for device can be defined by board.mk, default to port 0 // RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_DEVICE_RHPORT_NUM #ifndef BOARD_TUD_RHPORT
#define BOARD_DEVICE_RHPORT_NUM 0 #define BOARD_TUD_RHPORT 0
#endif #endif
// RHPort max operational speed can defined by board.mk // RHPort max operational speed can defined by board.mk
// Default to max (auto) speed for MCU with internal HighSpeed PHY // Default to max (auto) speed for MCU with internal HighSpeed PHY
#ifndef BOARD_DEVICE_RHPORT_SPEED #ifndef BOARD_TUD_MAX_SPEED
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_DEFAULT_SPEED #define BOARD_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED
#endif #endif
// Device mode with rhport and speed defined by board.mk // Device mode with rhport and speed defined by board.mk
#if BOARD_DEVICE_RHPORT_NUM == 0 #if BOARD_TUD_RHPORT == 0
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#elif BOARD_DEVICE_RHPORT_NUM == 1 #elif BOARD_TUD_RHPORT == 1
#define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#else #else
#error "Incorrect RHPort configuration" #error "Incorrect RHPort configuration"
#endif #endif

16
examples/device/msc_dual_lun/src/tusb_config.h
View File

@ -40,21 +40,21 @@
#endif #endif
// RHPort number used for device can be defined by board.mk, default to port 0 // RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_DEVICE_RHPORT_NUM #ifndef BOARD_TUD_RHPORT
#define BOARD_DEVICE_RHPORT_NUM 0 #define BOARD_TUD_RHPORT 0
#endif #endif
// RHPort max operational speed can defined by board.mk // RHPort max operational speed can defined by board.mk
// Default to max (auto) speed for MCU with internal HighSpeed PHY // Default to max (auto) speed for MCU with internal HighSpeed PHY
#ifndef BOARD_DEVICE_RHPORT_SPEED #ifndef BOARD_TUD_MAX_SPEED
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_DEFAULT_SPEED #define BOARD_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED
#endif #endif
// Device mode with rhport and speed defined by board.mk // Device mode with rhport and speed defined by board.mk
#if BOARD_DEVICE_RHPORT_NUM == 0 #if BOARD_TUD_RHPORT == 0
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#elif BOARD_DEVICE_RHPORT_NUM == 1 #elif BOARD_TUD_RHPORT == 1
#define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#else #else
#error "Incorrect RHPort configuration" #error "Incorrect RHPort configuration"
#endif #endif

16
examples/device/net_lwip_webserver/src/tusb_config.h
View File

@ -40,21 +40,21 @@
#endif #endif
// RHPort number used for device can be defined by board.mk, default to port 0 // RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_DEVICE_RHPORT_NUM #ifndef BOARD_TUD_RHPORT
#define BOARD_DEVICE_RHPORT_NUM 0 #define BOARD_TUD_RHPORT 0
#endif #endif
// RHPort max operational speed can defined by board.mk // RHPort max operational speed can defined by board.mk
// Default to max (auto) speed for MCU with internal HighSpeed PHY // Default to max (auto) speed for MCU with internal HighSpeed PHY
#ifndef BOARD_DEVICE_RHPORT_SPEED #ifndef BOARD_TUD_MAX_SPEED
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_DEFAULT_SPEED #define BOARD_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED
#endif #endif
// Device mode with rhport and speed defined by board.mk // Device mode with rhport and speed defined by board.mk
#if BOARD_DEVICE_RHPORT_NUM == 0 #if BOARD_TUD_RHPORT == 0
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#elif BOARD_DEVICE_RHPORT_NUM == 1 #elif BOARD_TUD_RHPORT == 1
#define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#else #else
#error "Incorrect RHPort configuration" #error "Incorrect RHPort configuration"
#endif #endif

16
examples/device/usbtmc/src/tusb_config.h
View File

@ -22,21 +22,21 @@
#endif #endif
// RHPort number used for device can be defined by board.mk, default to port 0 // RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_DEVICE_RHPORT_NUM #ifndef BOARD_TUD_RHPORT
#define BOARD_DEVICE_RHPORT_NUM 0 #define BOARD_TUD_RHPORT 0
#endif #endif
// RHPort max operational speed can defined by board.mk // RHPort max operational speed can defined by board.mk
// Default to max (auto) speed for MCU with internal HighSpeed PHY // Default to max (auto) speed for MCU with internal HighSpeed PHY
#ifndef BOARD_DEVICE_RHPORT_SPEED #ifndef BOARD_TUD_MAX_SPEED
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_DEFAULT_SPEED #define BOARD_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED
#endif #endif
// Device mode with rhport and speed defined by board.mk // Device mode with rhport and speed defined by board.mk
#if BOARD_DEVICE_RHPORT_NUM == 0 #if BOARD_TUD_RHPORT == 0
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#elif BOARD_DEVICE_RHPORT_NUM == 1 #elif BOARD_TUD_RHPORT == 1
#define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#else #else
#error "Incorrect RHPort configuration" #error "Incorrect RHPort configuration"
#endif #endif

16
examples/device/video_capture/src/tusb_config.h
View File

@ -35,21 +35,21 @@
//-------------------------------------------------------------------- //--------------------------------------------------------------------
// RHPort number used for device can be defined by board.mk, default to port 0 // RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_DEVICE_RHPORT_NUM #ifndef BOARD_TUD_RHPORT
#define BOARD_DEVICE_RHPORT_NUM 0 #define BOARD_TUD_RHPORT 0
#endif #endif
// RHPort max operational speed can defined by board.mk // RHPort max operational speed can defined by board.mk
// Default to max (auto) speed for MCU with internal HighSpeed PHY // Default to max (auto) speed for MCU with internal HighSpeed PHY
#ifndef BOARD_DEVICE_RHPORT_SPEED #ifndef BOARD_TUD_MAX_SPEED
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_DEFAULT_SPEED #define BOARD_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED
#endif #endif
// Device mode with rhport and speed defined by board.mk // Device mode with rhport and speed defined by board.mk
#if BOARD_DEVICE_RHPORT_NUM == 0 #if BOARD_TUD_RHPORT == 0
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#elif BOARD_DEVICE_RHPORT_NUM == 1 #elif BOARD_TUD_RHPORT == 1
#define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#else #else
#error "Incorrect RHPort configuration" #error "Incorrect RHPort configuration"
#endif #endif

16
examples/device/webusb_serial/src/tusb_config.h
View File

@ -40,21 +40,21 @@
#endif #endif
// RHPort number used for device can be defined by board.mk, default to port 0 // RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_DEVICE_RHPORT_NUM #ifndef BOARD_TUD_RHPORT
#define BOARD_DEVICE_RHPORT_NUM 0 #define BOARD_TUD_RHPORT 0
#endif #endif
// RHPort max operational speed can defined by board.mk // RHPort max operational speed can defined by board.mk
// Default to max (auto) speed for MCU with internal HighSpeed PHY // Default to max (auto) speed for MCU with internal HighSpeed PHY
#ifndef BOARD_DEVICE_RHPORT_SPEED #ifndef BOARD_TUD_MAX_SPEED
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_DEFAULT_SPEED #define BOARD_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED
#endif #endif
// Device mode with rhport and speed defined by board.mk // Device mode with rhport and speed defined by board.mk
#if BOARD_DEVICE_RHPORT_NUM == 0 #if BOARD_TUD_RHPORT == 0
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#elif BOARD_DEVICE_RHPORT_NUM == 1 #elif BOARD_TUD_RHPORT == 1
#define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#else #else
#error "Incorrect RHPort configuration" #error "Incorrect RHPort configuration"
#endif #endif

36
examples/dual/host_hid_to_device_cdc/src/tusb_config.h
View File

@ -40,13 +40,13 @@
#endif #endif
// RHPort number used for device can be defined by board.mk, default to port 0 // RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_DEVICE_RHPORT_NUM #ifndef BOARD_TUD_RHPORT
#define BOARD_DEVICE_RHPORT_NUM 0 #define BOARD_TUD_RHPORT 0
#endif #endif
// RHPort number used for device can be defined by board.mk, default to port 1 // RHPort number used for device can be defined by board.mk, default to port 1
#ifndef BOARD_HOST_RHPORT_NUM #ifndef BOARD_TUH_RHPORT
#define BOARD_HOST_RHPORT_NUM 1 #define BOARD_TUH_RHPORT 1
#endif #endif
// Use raspberry pio-usb for host // Use raspberry pio-usb for host
@ -54,42 +54,42 @@
// RHPort max operational speed can defined by board.mk // RHPort max operational speed can defined by board.mk
// Default to Highspeed for MCU with internal HighSpeed PHY (can be port specific), otherwise FullSpeed // Default to Highspeed for MCU with internal HighSpeed PHY (can be port specific), otherwise FullSpeed
#ifndef BOARD_DEVICE_RHPORT_SPEED #ifndef BOARD_TUD_MAX_SPEED
#if TU_CHECK_MCU(OPT_MCU_LPC18XX, OPT_MCU_LPC43XX, OPT_MCU_MIMXRT10XX, OPT_MCU_NUC505) ||\ #if TU_CHECK_MCU(OPT_MCU_LPC18XX, OPT_MCU_LPC43XX, OPT_MCU_MIMXRT10XX, OPT_MCU_NUC505) ||\
TU_CHECK_MCU(OPT_MCU_CXD56, OPT_MCU_SAMX7X, OPT_MCU_BCM2711) ||\ TU_CHECK_MCU(OPT_MCU_CXD56, OPT_MCU_SAMX7X, OPT_MCU_BCM2711) ||\
TU_CHECK_MCU(OPT_MCU_FT90X, OPT_MCU_FT93X) TU_CHECK_MCU(OPT_MCU_FT90X, OPT_MCU_FT93X)
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_HIGH_SPEED #define BOARD_TUD_MAX_SPEED OPT_MODE_HIGH_SPEED
#else #else
#define BOARD_DEVICE_RHPORT_SPEED OPT_MODE_FULL_SPEED #define BOARD_TUD_MAX_SPEED OPT_MODE_FULL_SPEED
#endif #endif
#endif #endif
// RHPort max operational speed can defined by board.mk // RHPort max operational speed can defined by board.mk
// Default to Highspeed for MCU with internal HighSpeed PHY (can be port specific), otherwise FullSpeed // Default to Highspeed for MCU with internal HighSpeed PHY (can be port specific), otherwise FullSpeed
#ifndef BOARD_HOST_RHPORT_SPEED #ifndef BOARD_TUH_MAX_SPEED
#if TU_CHECK_MCU(OPT_MCU_LPC18XX, OPT_MCU_LPC43XX, OPT_MCU_MIMXRT10XX, OPT_MCU_NUC505) ||\ #if TU_CHECK_MCU(OPT_MCU_LPC18XX, OPT_MCU_LPC43XX, OPT_MCU_MIMXRT10XX, OPT_MCU_NUC505) ||\
TU_CHECK_MCU(OPT_MCU_CXD56, OPT_MCU_SAMX7X, OPT_MCU_BCM2711) ||\ TU_CHECK_MCU(OPT_MCU_CXD56, OPT_MCU_SAMX7X, OPT_MCU_BCM2711) ||\
TU_CHECK_MCU(OPT_MCU_FT90X, OPT_MCU_FT93X) TU_CHECK_MCU(OPT_MCU_FT90X, OPT_MCU_FT93X)
#define BOARD_HOST_RHPORT_SPEED OPT_MODE_HIGH_SPEED #define BOARD_TUH_MAX_SPEED OPT_MODE_HIGH_SPEED
#else #else
#define BOARD_HOST_RHPORT_SPEED OPT_MODE_FULL_SPEED #define BOARD_TUH_MAX_SPEED OPT_MODE_FULL_SPEED
#endif #endif
#endif #endif
// Device mode with rhport and speed defined by board.mk // Device mode with rhport and speed defined by board.mk
#if BOARD_DEVICE_RHPORT_NUM == 0 #if BOARD_TUD_RHPORT == 0
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#elif BOARD_DEVICE_RHPORT_NUM == 1 #elif BOARD_TUD_RHPORT == 1
#define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_DEVICE_RHPORT_SPEED) #define CFG_TUSB_RHPORT1_MODE (OPT_MODE_DEVICE | BOARD_TUD_MAX_SPEED)
#else #else
#error "Incorrect RHPort configuration" #error "Incorrect RHPort configuration"
#endif #endif
// Device mode with rhport and speed defined by board.mk // Device mode with rhport and speed defined by board.mk
#if BOARD_HOST_RHPORT_NUM == 0 #if BOARD_TUH_RHPORT == 0
#define CFG_TUSB_RHPORT0_MODE (OPT_MODE_HOST | BOARD_HOST_RHPORT_SPEED) #define CFG_TUSB_RHPORT0_MODE (OPT_MODE_HOST | BOARD_TUH_MAX_SPEED)
#elif BOARD_HOST_RHPORT_NUM == 1 #elif BOARD_TUH_RHPORT == 1
#define CFG_TUSB_RHPORT1_MODE (OPT_MODE_HOST | BOARD_HOST_RHPORT_SPEED) #define CFG_TUSB_RHPORT1_MODE (OPT_MODE_HOST | BOARD_TUH_MAX_SPEED)
#else #else
#error "Incorrect RHPort configuration" #error "Incorrect RHPort configuration"
#endif #endif

4
hw/bsp/imxrt/boards/mimxrt1060_evk/board.mk
View File

@ -7,8 +7,8 @@ JLINK_DEVICE = MIMXRT1062xxx6A
# For flash-pyocd target # For flash-pyocd target
PYOCD_TARGET = mimxrt1060 PYOCD_TARGET = mimxrt1060
BOARD_DEVICE_RHPORT_NUM = 1 BOARD_TUD_RHPORT = 1
BOARD_HOST_RHPORT_NUM = 0 BOARD_TUH_RHPORT = 0
# flash using pyocd # flash using pyocd
flash: flash-pyocd flash: flash-pyocd

4
hw/bsp/imxrt/boards/mimxrt1064_evk/board.mk
View File

@ -7,8 +7,8 @@ JLINK_DEVICE = MIMXRT1064xxx6A
# For flash-pyocd target # For flash-pyocd target
PYOCD_TARGET = mimxrt1064 PYOCD_TARGET = mimxrt1064
BOARD_DEVICE_RHPORT_NUM = 1 BOARD_TUD_RHPORT = 1
BOARD_HOST_RHPORT_NUM = 0 BOARD_TUH_RHPORT = 0
# flash using pyocd # flash using pyocd
flash: flash-pyocd flash: flash-pyocd

8
hw/bsp/imxrt/family.mk
View File

@ -15,11 +15,11 @@ CFLAGS += \
-DXIP_BOOT_HEADER_ENABLE=1 \ -DXIP_BOOT_HEADER_ENABLE=1 \
-DCFG_TUSB_MCU=OPT_MCU_MIMXRT10XX -DCFG_TUSB_MCU=OPT_MCU_MIMXRT10XX
ifdef BOARD_DEVICE_RHPORT_NUM ifdef BOARD_TUD_RHPORT
CFLAGS += -DBOARD_DEVICE_RHPORT_NUM=$(BOARD_DEVICE_RHPORT_NUM) CFLAGS += -DBOARD_TUD_RHPORT=$(BOARD_TUD_RHPORT)
endif endif
ifdef BOARD_HOST_RHPORT_NUM ifdef BOARD_TUH_RHPORT
CFLAGS += -DBOARD_HOST_RHPORT_NUM=$(BOARD_HOST_RHPORT_NUM) CFLAGS += -DBOARD_TUH_RHPORT=$(BOARD_TUH_RHPORT)
endif endif
# mcu driver cause following warnings # mcu driver cause following warnings

2
hw/bsp/lpc54/family.mk
View File

@ -15,7 +15,7 @@ CFLAGS += \
ifeq ($(PORT), 1) ifeq ($(PORT), 1)
$(info "PORT1 High Speed") $(info "PORT1 High Speed")
CFLAGS += -DBOARD_DEVICE_RHPORT_SPEED=OPT_MODE_HIGH_SPEED CFLAGS += -DBOARD_TUD_MAX_SPEED=OPT_MODE_HIGH_SPEED
# LPC55 Highspeed Port1 can only write to USB_SRAM region # LPC55 Highspeed Port1 can only write to USB_SRAM region
CFLAGS += -DCFG_TUSB_MEM_SECTION='__attribute__((section("m_usb_global")))' CFLAGS += -DCFG_TUSB_MEM_SECTION='__attribute__((section("m_usb_global")))'

4
hw/bsp/lpc55/family.mk
View File

@ -16,11 +16,11 @@ CFLAGS += \
-mfpu=fpv5-sp-d16 \ -mfpu=fpv5-sp-d16 \
-DCFG_TUSB_MCU=OPT_MCU_LPC55XX \ -DCFG_TUSB_MCU=OPT_MCU_LPC55XX \
-DCFG_TUSB_MEM_ALIGN='__attribute__((aligned(64)))' \ -DCFG_TUSB_MEM_ALIGN='__attribute__((aligned(64)))' \
-DBOARD_DEVICE_RHPORT_NUM=$(PORT) -DBOARD_TUD_RHPORT=$(PORT)
ifeq ($(PORT), 1) ifeq ($(PORT), 1)
$(info "PORT1 High Speed") $(info "PORT1 High Speed")
CFLAGS += -DBOARD_DEVICE_RHPORT_SPEED=OPT_MODE_HIGH_SPEED CFLAGS += -DBOARD_TUD_MAX_SPEED=OPT_MODE_HIGH_SPEED
# LPC55 Highspeed Port1 can only write to USB_SRAM region # LPC55 Highspeed Port1 can only write to USB_SRAM region
CFLAGS += -DCFG_TUSB_MEM_SECTION='__attribute__((section("m_usb_global")))' CFLAGS += -DCFG_TUSB_MEM_SECTION='__attribute__((section("m_usb_global")))'

4
hw/bsp/stm32f7/family.c
View File

@ -125,7 +125,7 @@ void board_init(void)
UartHandle.Init.OverSampling = UART_OVERSAMPLING_16; UartHandle.Init.OverSampling = UART_OVERSAMPLING_16;
HAL_UART_Init(&UartHandle); HAL_UART_Init(&UartHandle);
#if BOARD_DEVICE_RHPORT_NUM == 0 #if BOARD_TUD_RHPORT == 0
// OTG_FS // OTG_FS
/* Configure DM DP Pins */ /* Configure DM DP Pins */
@ -258,7 +258,7 @@ void board_init(void)
USB_OTG_HS->GUSBCFG &= ~USB_OTG_GUSBCFG_FHMOD; USB_OTG_HS->GUSBCFG &= ~USB_OTG_GUSBCFG_FHMOD;
USB_OTG_HS->GUSBCFG |= USB_OTG_GUSBCFG_FDMOD; USB_OTG_HS->GUSBCFG |= USB_OTG_GUSBCFG_FDMOD;
#endif // BOARD_DEVICE_RHPORT_NUM #endif // BOARD_TUD_RHPORT
} }

6
hw/bsp/stm32f7/family.mk
View File

@ -16,14 +16,14 @@ CFLAGS += \
-mfpu=fpv5-d16 \ -mfpu=fpv5-d16 \
-nostdlib -nostartfiles \ -nostdlib -nostartfiles \
-DCFG_TUSB_MCU=OPT_MCU_STM32F7 \ -DCFG_TUSB_MCU=OPT_MCU_STM32F7 \
-DBOARD_DEVICE_RHPORT_NUM=$(PORT) -DBOARD_TUD_RHPORT=$(PORT)
ifeq ($(PORT), 1) ifeq ($(PORT), 1)
ifeq ($(SPEED), high) ifeq ($(SPEED), high)
CFLAGS += -DBOARD_DEVICE_RHPORT_SPEED=OPT_MODE_HIGH_SPEED CFLAGS += -DBOARD_TUD_MAX_SPEED=OPT_MODE_HIGH_SPEED
$(info "Using OTG_HS in HighSpeed mode") $(info "Using OTG_HS in HighSpeed mode")
else else
CFLAGS += -DBOARD_DEVICE_RHPORT_SPEED=OPT_MODE_FULL_SPEED CFLAGS += -DBOARD_TUD_MAX_SPEED=OPT_MODE_FULL_SPEED
$(info "Using OTG_HS in FullSpeed mode") $(info "Using OTG_HS in FullSpeed mode")
endif endif
else else

4
hw/bsp/stm32h7/family.c
View File

@ -122,7 +122,7 @@ void board_init(void)
UartHandle.Init.OverSampling = UART_OVERSAMPLING_16; UartHandle.Init.OverSampling = UART_OVERSAMPLING_16;
HAL_UART_Init(&UartHandle); HAL_UART_Init(&UartHandle);
#if BOARD_DEVICE_RHPORT_NUM == 0 #if BOARD_TUD_RHPORT == 0
// Despite being call USB2_OTG // Despite being call USB2_OTG
// OTG_FS is marked as RHPort0 by TinyUSB to be consistent across stm32 port // OTG_FS is marked as RHPort0 by TinyUSB to be consistent across stm32 port
// PA9 VUSB, PA10 ID, PA11 DM, PA12 DP // PA9 VUSB, PA10 ID, PA11 DM, PA12 DP
@ -166,7 +166,7 @@ void board_init(void)
USB_OTG_FS->GOTGCTL |= USB_OTG_GOTGCTL_BVALOVAL; USB_OTG_FS->GOTGCTL |= USB_OTG_GOTGCTL_BVALOVAL;
#endif // vbus sense #endif // vbus sense
#elif BOARD_DEVICE_RHPORT_NUM == 1 #elif BOARD_TUD_RHPORT == 1
// Despite being call USB2_OTG // Despite being call USB2_OTG
// OTG_HS is marked as RHPort1 by TinyUSB to be consistent across stm32 port // OTG_HS is marked as RHPort1 by TinyUSB to be consistent across stm32 port

6
hw/bsp/stm32h7/family.mk
View File

@ -16,14 +16,14 @@ CFLAGS += \
-mfpu=fpv5-d16 \ -mfpu=fpv5-d16 \
-nostdlib -nostartfiles \ -nostdlib -nostartfiles \
-DCFG_TUSB_MCU=OPT_MCU_STM32H7 \ -DCFG_TUSB_MCU=OPT_MCU_STM32H7 \
-DBOARD_DEVICE_RHPORT_NUM=$(PORT) -DBOARD_TUD_RHPORT=$(PORT)
ifeq ($(PORT), 1) ifeq ($(PORT), 1)
ifeq ($(SPEED), high) ifeq ($(SPEED), high)
CFLAGS += -DBOARD_DEVICE_RHPORT_SPEED=OPT_MODE_HIGH_SPEED CFLAGS += -DBOARD_TUD_MAX_SPEED=OPT_MODE_HIGH_SPEED
$(info "Using OTG_HS in HighSpeed mode") $(info "Using OTG_HS in HighSpeed mode")
else else
CFLAGS += -DBOARD_DEVICE_RHPORT_SPEED=OPT_MODE_FULL_SPEED CFLAGS += -DBOARD_TUD_MAX_SPEED=OPT_MODE_FULL_SPEED
$(info "Using OTG_HS in FullSpeed mode") $(info "Using OTG_HS in FullSpeed mode")
endif endif
else else

42
src/portable/bridgetek/ft9xx/dcd_ft9xx.c
View File

@ -239,12 +239,12 @@ static void _dcd_ft90x_attach(void)
CRITICAL_SECTION_BEGIN CRITICAL_SECTION_BEGIN
// Turn off the device enable bit. // Turn off the device enable bit.
#if BOARD_DEVICE_RHPORT_SPEED == OPT_MODE_HIGH_SPEED #if BOARD_TUD_MAX_SPEED == OPT_MODE_HIGH_SPEED
USBD_REG(fctrl) = 0; USBD_REG(fctrl) = 0;
#else // BOARD_DEVICE_RHPORT_SPEED == OPT_MODE_FULL_SPEED #else // BOARD_TUD_MAX_SPEED == OPT_MODE_FULL_SPEED
//Set the full speed only bit if required. //Set the full speed only bit if required.
USBD_REG(fctrl) = MASK_USBD_FCTRL_MODE_FS_ONLY; USBD_REG(fctrl) = MASK_USBD_FCTRL_MODE_FS_ONLY;
#endif // BOARD_DEVICE_RHPORT_SPEED #endif // BOARD_TUD_MAX_SPEED
// Clear first reset and suspend interrupts. // Clear first reset and suspend interrupts.
do do
@ -291,7 +291,7 @@ static void _dcd_ft90x_detach(void)
delayms(1); delayms(1);
// Disable USB PHY // Disable USB PHY
dcd_disconnect(BOARD_DEVICE_RHPORT_NUM); dcd_disconnect(BOARD_TUD_RHPORT);
delayms(1); delayms(1);
// Disable Chip USB device clock/PM configuration. // Disable Chip USB device clock/PM configuration.
@ -323,7 +323,7 @@ static void _ft90x_usb_speed(void)
delayus(200); delayus(200);
} }
#if BOARD_DEVICE_RHPORT_SPEED == OPT_MODE_HIGH_SPEED #if BOARD_TUD_MAX_SPEED == OPT_MODE_HIGH_SPEED
/* Detect high or full speed */ /* Detect high or full speed */
fctrl_val = MASK_USBD_FCTRL_USB_DEV_EN; fctrl_val = MASK_USBD_FCTRL_USB_DEV_EN;
@ -347,11 +347,11 @@ static void _ft90x_usb_speed(void)
delayus(125 + 5); delayus(125 + 5);
_speed = (USBD_REG(cmif) & MASK_USBD_CMIF_SOFIRQ) ? _speed = (USBD_REG(cmif) & MASK_USBD_CMIF_SOFIRQ) ?
TUSB_SPEED_HIGH : TUSB_SPEED_FULL; TUSB_SPEED_HIGH : TUSB_SPEED_FULL;
dcd_event_bus_reset(BOARD_DEVICE_RHPORT_NUM, _speed, true); dcd_event_bus_reset(BOARD_TUD_RHPORT, _speed, true);
#endif /* !__FT930__ */ #endif /* !__FT930__ */
#else // BOARD_DEVICE_RHPORT_SPEED == OPT_MODE_FULL_SPEED #else // BOARD_TUD_MAX_SPEED == OPT_MODE_FULL_SPEED
/* User force set to full speed */ /* User force set to full speed */
_speed = TUSB_SPEED_FULL; _speed = TUSB_SPEED_FULL;
@ -364,10 +364,10 @@ static void _ft90x_usb_speed(void)
} }
#endif #endif
USBD_REG(fctrl) = fctrl_val; USBD_REG(fctrl) = fctrl_val;
dcd_event_bus_reset(BOARD_DEVICE_RHPORT_NUM, _speed, true); dcd_event_bus_reset(BOARD_TUD_RHPORT, _speed, true);
return; return;
#endif // BOARD_DEVICE_RHPORT_SPEED #endif // BOARD_TUD_MAX_SPEED
} }
// Send a buffer to the USB IN FIFO. // Send a buffer to the USB IN FIFO.
@ -899,7 +899,7 @@ void dcd_edpt_clear_stall(uint8_t rhport, uint8_t ep_addr)
void _ft90x_usbd_ISR(void) void _ft90x_usbd_ISR(void)
{ {
tud_int_handler(BOARD_DEVICE_RHPORT_NUM); // Resolves to dcd_int_handler(). tud_int_handler(BOARD_TUD_RHPORT); // Resolves to dcd_int_handler().
} }
void dcd_int_handler(uint8_t rhport) void dcd_int_handler(uint8_t rhport)
@ -937,19 +937,19 @@ void dcd_int_handler(uint8_t rhport)
{ {
// Reset endpoints to default state. // Reset endpoints to default state.
_ft90x_reset_edpts(); _ft90x_reset_edpts();
dcd_event_bus_reset(BOARD_DEVICE_RHPORT_NUM, _speed, true); dcd_event_bus_reset(BOARD_TUD_RHPORT, _speed, true);
} }
if (cmif & MASK_USBD_CMIF_SUSIRQ) //Handle Suspend interrupt if (cmif & MASK_USBD_CMIF_SUSIRQ) //Handle Suspend interrupt
{ {
dcd_event_bus_signal(BOARD_DEVICE_RHPORT_NUM, DCD_EVENT_SUSPEND, true); dcd_event_bus_signal(BOARD_TUD_RHPORT, DCD_EVENT_SUSPEND, true);
} }
if (cmif & MASK_USBD_CMIF_RESIRQ) //Handle Resume interrupt if (cmif & MASK_USBD_CMIF_RESIRQ) //Handle Resume interrupt
{ {
dcd_event_bus_signal(BOARD_DEVICE_RHPORT_NUM, DCD_EVENT_RESUME, true); dcd_event_bus_signal(BOARD_TUD_RHPORT, DCD_EVENT_RESUME, true);
} }
if (cmif & MASK_USBD_CMIF_SOFIRQ) //Handle SOF interrupt if (cmif & MASK_USBD_CMIF_SOFIRQ) //Handle SOF interrupt
{ {
dcd_event_bus_signal(BOARD_DEVICE_RHPORT_NUM, DCD_EVENT_SOF, true); dcd_event_bus_signal(BOARD_TUD_RHPORT, DCD_EVENT_SOF, true);
} }
} }
// Handle endpoint interrupts. // Handle endpoint interrupts.
@ -980,7 +980,7 @@ void dcd_int_handler(uint8_t rhport)
_ft90x_dusb_out(USBD_EP_0, (uint8_t *)_ft90x_setup_packet, sizeof(USB_device_request)); _ft90x_dusb_out(USBD_EP_0, (uint8_t *)_ft90x_setup_packet, sizeof(USB_device_request));
// Send the packet to tinyusb. // Send the packet to tinyusb.
dcd_event_setup_received(BOARD_DEVICE_RHPORT_NUM, _ft90x_setup_packet, true); dcd_event_setup_received(BOARD_TUD_RHPORT, _ft90x_setup_packet, true);
// Clear the interrupt that signals a SETUP packet is received. // Clear the interrupt that signals a SETUP packet is received.
USBD_EP_SR_REG(USBD_EP_0) = (MASK_USBD_EP0SR_SETUP); USBD_EP_SR_REG(USBD_EP_0) = (MASK_USBD_EP0SR_SETUP);
@ -1002,7 +1002,7 @@ void dcd_int_handler(uint8_t rhport)
xfer_bytes = _ft90x_edpt_xfer_out(USBD_EP_0, (uint8_t *)ep_xfer[USBD_EP_0].buff_ptr, xfer_bytes); xfer_bytes = _ft90x_edpt_xfer_out(USBD_EP_0, (uint8_t *)ep_xfer[USBD_EP_0].buff_ptr, xfer_bytes);
} }
// Now signal completion of data packet. // Now signal completion of data packet.
dcd_event_xfer_complete(BOARD_DEVICE_RHPORT_NUM, (ep_xfer[USBD_EP_0].dir ? TUSB_DIR_IN_MASK : 0), xfer_bytes, XFER_RESULT_SUCCESS, true); dcd_event_xfer_complete(BOARD_TUD_RHPORT, (ep_xfer[USBD_EP_0].dir ? TUSB_DIR_IN_MASK : 0), xfer_bytes, XFER_RESULT_SUCCESS, true);
// Allow new transfers on the control endpoint. // Allow new transfers on the control endpoint.
ep_xfer[USBD_EP_0].valid = 0; ep_xfer[USBD_EP_0].valid = 0;
@ -1059,7 +1059,7 @@ void dcd_int_handler(uint8_t rhport)
if (ep_xfer[ep_number].remain_size == 0) if (ep_xfer[ep_number].remain_size == 0)
{ {
// Signal tinyUSB. // Signal tinyUSB.
dcd_event_xfer_complete(BOARD_DEVICE_RHPORT_NUM, ep_number | ep_dirmask, ep_xfer[ep_number].total_size, XFER_RESULT_SUCCESS, true); dcd_event_xfer_complete(BOARD_TUD_RHPORT, ep_number | ep_dirmask, ep_xfer[ep_number].total_size, XFER_RESULT_SUCCESS, true);
// Allow new transfers on this endpoint. // Allow new transfers on this endpoint.
ep_xfer[ep_number].valid = 0; ep_xfer[ep_number].valid = 0;
@ -1084,21 +1084,21 @@ void ft90x_usbd_pm_ISR(void)
{ {
// Signal connection interrupt // Signal connection interrupt
SYS->PMCFG_H = MASK_SYS_PMCFG_PM_GPIO_IRQ_PEND; SYS->PMCFG_H = MASK_SYS_PMCFG_PM_GPIO_IRQ_PEND;
dcd_event_bus_signal(BOARD_DEVICE_RHPORT_NUM, DCD_EVENT_RESUME, true); dcd_event_bus_signal(BOARD_TUD_RHPORT, DCD_EVENT_RESUME, true);
} }
if (pmcfg & MASK_SYS_PMCFG_DEV_DIS_DEV) if (pmcfg & MASK_SYS_PMCFG_DEV_DIS_DEV)
{ {
// Signal disconnection interrupt // Signal disconnection interrupt
SYS->PMCFG_H = MASK_SYS_PMCFG_PM_GPIO_IRQ_PEND; SYS->PMCFG_H = MASK_SYS_PMCFG_PM_GPIO_IRQ_PEND;
dcd_event_bus_signal(BOARD_DEVICE_RHPORT_NUM, DCD_EVENT_UNPLUGGED, true); dcd_event_bus_signal(BOARD_TUD_RHPORT, DCD_EVENT_UNPLUGGED, true);
} }
if (pmcfg & MASK_SYS_PMCFG_HOST_RST_DEV) if (pmcfg & MASK_SYS_PMCFG_HOST_RST_DEV)
{ {
// Signal Host Reset interrupt // Signal Host Reset interrupt
SYS->PMCFG_H = MASK_SYS_PMCFG_PM_GPIO_IRQ_PEND; SYS->PMCFG_H = MASK_SYS_PMCFG_PM_GPIO_IRQ_PEND;
dcd_event_bus_signal(BOARD_DEVICE_RHPORT_NUM, DCD_EVENT_BUS_RESET, true); dcd_event_bus_signal(BOARD_TUD_RHPORT, DCD_EVENT_BUS_RESET, true);
} }
if (pmcfg & MASK_SYS_PMCFG_HOST_RESUME_DEV) if (pmcfg & MASK_SYS_PMCFG_HOST_RESUME_DEV)
@ -1109,7 +1109,7 @@ void ft90x_usbd_pm_ISR(void)
{ {
// If we are driving K-state on Device USB port; // If we are driving K-state on Device USB port;
// We must maintain the 1ms requirement before resuming the phy // We must maintain the 1ms requirement before resuming the phy
dcd_event_bus_signal(BOARD_DEVICE_RHPORT_NUM, DCD_EVENT_RESUME, true); dcd_event_bus_signal(BOARD_TUD_RHPORT, DCD_EVENT_RESUME, true);
} }
} }
} }

2
src/tusb_option.h
View File

@ -221,7 +221,9 @@ typedef int make_iso_compilers_happy ;
#define TUD_OPT_RHPORT -1 #define TUD_OPT_RHPORT -1
#endif #endif
#ifndef CFG_TUD_ENABLED
#define CFG_TUD_ENABLED (TUD_RHPORT_MODE & OPT_MODE_DEVICE) #define CFG_TUD_ENABLED (TUD_RHPORT_MODE & OPT_MODE_DEVICE)
#endif
#if CFG_TUD_ENABLED #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))) #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)))