Merge branch 'master' of https://github.com/hathach/tinyusb into stm32f4

1 files changed, 36 insertions, 31 deletions

diff --git a/src/tusb_option.h b/src/tusb_option.h
index b00a3b1bc..eb208aea2 100644
--- a/src/tusb_option.h
+++ b/src/tusb_option.h
@@ -48,13 +48,14 @@
 /** \defgroup group_mcu Supported MCU

  * \ref CFG_TUSB_MCU must be defined to one of these

  *  @{ */

-#define OPT_MCU_LPC11UXX       1 ///< NXP LPC11Uxx series

-#define OPT_MCU_LPC13XX        2 ///< NXP LPC13xx (not supported yet)

-#define OPT_MCU_LPC13UXX       3 ///< NXP LPC13xx 12 bit ADC series

-#define OPT_MCU_LPC175X_6X     4 ///< NXP LPC175x, LPC176x series

-#define OPT_MCU_LPC177X_8X     5 ///< NXP LPC177x, LPC178x series (not supported yet)

-#define OPT_MCU_LPC18XX        6 ///< NXP LPC18xx series (not supported yet)

-#define OPT_MCU_LPC43XX        7 ///< NXP LPC43xx series

+#define OPT_MCU_LPC11UXX       1 ///< NXP LPC11Uxx

+

+#define OPT_MCU_LPC13XX        3 ///< NXP LPC13xx

+#define OPT_MCU_LPC175X_6X     4 ///< NXP LPC175x, LPC176x

+#define OPT_MCU_LPC177X_8X     5 ///< NXP LPC177x, LPC178x

+#define OPT_MCU_LPC18XX        6 ///< NXP LPC18xx

+#define OPT_MCU_LPC40XX        7 ///< NXP LPC40xx

+#define OPT_MCU_LPC43XX        8 ///< NXP LPC43xx

 

 #define OPT_MCU_NRF5X        100 ///< Nordic nRF5x series

 

@@ -86,13 +87,16 @@
 

 //--------------------------------------------------------------------

 // CONTROLLER

+// Only 1 roothub port can be configured to be device and/or host.

+// tinyusb does not support dual devices or dual host configuration

 //--------------------------------------------------------------------

 /** \defgroup group_mode Controller Mode Selection

  * \brief CFG_TUSB_CONTROLLER_N_MODE must be defined with these

  *  @{ */

-#define OPT_MODE_HOST    0x02 ///< Host Mode

-#define OPT_MODE_DEVICE  0x01 ///< Device Mode

-#define OPT_MODE_NONE    0x00 ///< Disabled

+#define OPT_MODE_NONE         0x00 ///< Disabled

+#define OPT_MODE_DEVICE       0x01 ///< Device Mode

+#define OPT_MODE_HOST         0x02 ///< Host Mode

+#define OPT_MODE_HIGH_SPEED   0x10 ///< High speed

 /** @} */

 

 #ifndef CFG_TUSB_RHPORT0_MODE

@@ -103,22 +107,27 @@
   #define CFG_TUSB_RHPORT1_MODE OPT_MODE_NONE

 #endif

 

-#define CONTROLLER_HOST_NUMBER (\

-    ((CFG_TUSB_RHPORT0_MODE & OPT_MODE_HOST) ? 1 : 0) + \

-    ((CFG_TUSB_RHPORT1_MODE & OPT_MODE_HOST) ? 1 : 0))

-

-#define MODE_HOST_SUPPORTED     (CONTROLLER_HOST_NUMBER > 0)

+#if ((CFG_TUSB_RHPORT0_MODE & OPT_MODE_HOST) && (CFG_TUSB_RHPORT1_MODE & OPT_MODE_HOST)) || \

+    ((CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE) && (CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE))

+  #error "tinyusb does not support same modes on more than 1 roothub port"

+#endif

 

+// Which roothub port is configured as host

 #define TUH_OPT_RHPORT          ( (CFG_TUSB_RHPORT0_MODE & OPT_MODE_HOST) ? 0 : ((CFG_TUSB_RHPORT1_MODE & OPT_MODE_HOST) ? 1 : -1) )

 #define TUSB_OPT_HOST_ENABLED   ( TUH_OPT_RHPORT >= 0 )

 

+// Which roothub port is configured as device

 #define TUD_OPT_RHPORT          ( (CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE) ? 0 : ((CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE) ? 1 : -1) )

-#define TUSB_OPT_DEVICE_ENABLED ( TUD_OPT_RHPORT >= 0 )

 

-#if ((CFG_TUSB_RHPORT0_MODE & OPT_MODE_HOST) && (CFG_TUSB_RHPORT1_MODE & OPT_MODE_HOST)) || ((CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE) && (CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE))

-  #error "tinyusb does not support same modes on more than 1 roothub port"

+#if TUD_OPT_RHPORT == 0

+#define TUD_OPT_HIGH_SPEED      ( CFG_TUSB_RHPORT0_MODE & OPT_MODE_HIGH_SPEED )

+#else

+#define TUD_OPT_HIGH_SPEED      ( CFG_TUSB_RHPORT1_MODE & OPT_MODE_HIGH_SPEED )

 #endif

 

+#define TUSB_OPT_DEVICE_ENABLED ( TUD_OPT_RHPORT >= 0 )

+

+

 //--------------------------------------------------------------------+

 // COMMON OPTIONS

 //--------------------------------------------------------------------+

@@ -139,6 +148,10 @@
 #define CFG_TUSB_MEM_SECTION

 #endif

 

+#ifndef CFG_TUSB_MEM_ALIGN

+#define CFG_TUSB_MEM_ALIGN          ATTR_ALIGNED(4)

+#endif

+

 #ifndef CFG_TUSB_OS

 #define CFG_TUSB_OS OPT_OS_NONE

 #endif

@@ -189,41 +202,33 @@
 //--------------------------------------------------------------------

 // HOST OPTIONS

 //--------------------------------------------------------------------

-#if MODE_HOST_SUPPORTED

+#if TUSB_OPT_HOST_ENABLED

   #ifndef CFG_TUSB_HOST_DEVICE_MAX

     #define CFG_TUSB_HOST_DEVICE_MAX 1

     #warning CFG_TUSB_HOST_DEVICE_MAX is not defined, default value is 1

   #endif

 

   //------------- HUB CLASS -------------//

-  #if CFG_TUSB_HOST_HUB && (CFG_TUSB_HOST_DEVICE_MAX == 1)

+  #if CFG_TUH_HUB && (CFG_TUSB_HOST_DEVICE_MAX == 1)

     #error there is no benefit enable hub with max device is 1. Please disable hub or increase CFG_TUSB_HOST_DEVICE_MAX

   #endif

 

   //------------- HID CLASS -------------//

-  #define HOST_CLASS_HID   ( CFG_TUSB_HOST_HID_KEYBOARD + CFG_TUSB_HOST_HID_MOUSE + CFG_TUSB_HOST_HID_GENERIC )

-//  #if HOST_CLASS_HID

-//    #define HOST_HCD_XFER_INTERRUPT

-//  #endif

+  #define HOST_CLASS_HID   ( CFG_TUH_HID_KEYBOARD + CFG_TUH_HID_MOUSE + CFG_TUSB_HOST_HID_GENERIC )

 

   #ifndef CFG_TUSB_HOST_ENUM_BUFFER_SIZE

     #define CFG_TUSB_HOST_ENUM_BUFFER_SIZE 256

   #endif

 

   //------------- CLASS -------------//

-#endif // MODE_HOST_SUPPORTED

+#endif // TUSB_OPT_HOST_ENABLED

 

 

 //------------------------------------------------------------------

 // Configuration Validation

 //------------------------------------------------------------------

-

-#if (CFG_TUSB_OS != OPT_OS_NONE) && !defined (CFG_TUD_TASK_PRIO)

-  #error CFG_TUD_TASK_PRIO need to be defined (hint: use the highest if possible)

-#endif

-

 #if CFG_TUD_ENDOINT0_SIZE > 64

-  #error Control Endpoint Max Package Size cannot larger than 64

+  #error Control Endpoint Max Packet Size cannot be larger than 64

 #endif

 

 #endif /* _TUSB_OPTION_H_ */