Merge branch 'master' into usbtmc

6 files changed, 113 insertions, 29 deletions

diff --git a/src/common/tusb_compiler.h b/src/common/tusb_compiler.h
index 09768ef88..58732b871 100644
--- a/src/common/tusb_compiler.h
+++ b/src/common/tusb_compiler.h
@@ -53,6 +53,9 @@
 // for declaration of reserved field, make use of _TU_COUNTER_

 #define TU_RESERVED           TU_XSTRCAT(reserved, _TU_COUNTER_)

 

+#define TU_LITTLE_ENDIAN (0x12u)

+#define TU_BIG_ENDIAN (0x21u)

+

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

 // Compiler porting with Attribute and Endian

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

@@ -67,20 +70,68 @@
 

   // Endian conversion use well-known host to network (big endian) naming

   #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__

-    #define tu_htonl(u32)  __builtin_bswap32(u32)

-    #define tu_ntohl(u32)  __builtin_bswap32(u32)

-

-    #define tu_htons(u16)  __builtin_bswap16(u16)

-    #define tu_ntohs(u16)  __builtin_bswap16(u16)

+    #define TU_BYTE_ORDER TU_LITTLE_ENDIAN

   #else

-    #define tu_htonl(u32)  (u32)

-    #define tu_ntohl(u32)  (u32)

+    #define TU_BYTE_ORDER TU_BIG_ENDIAN

+  #endif

+

+#define TU_BSWAP16(u16) (__builtin_bswap16(u16))

+#define TU_BSWAP32(u32) (__builtin_bswap32(u32))

 

-    #define tu_htons(u16)  (u16)

-    #define tu_ntohs(u16)  (u16)

+#elif defined(__TI_COMPILER_VERSION__)

+  #define TU_ATTR_ALIGNED(Bytes)        __attribute__ ((aligned(Bytes)))

+  #define TU_ATTR_SECTION(sec_name)     __attribute__ ((section(#sec_name)))

+  #define TU_ATTR_PACKED                __attribute__ ((packed))

+  #define TU_ATTR_PREPACKED

+  #define TU_ATTR_WEAK                  __attribute__ ((weak))

+  #define TU_ATTR_DEPRECATED(mess)      __attribute__ ((deprecated(mess))) // warn if function with this attribute is used

+  #define TU_ATTR_UNUSED                __attribute__ ((unused))           // Function/Variable is meant to be possibly unused

+

+  // __BYTE_ORDER is defined in the TI ARM compiler, but not MSP430 (which is little endian)

+  #if ((__BYTE_ORDER__) == (__ORDER_LITTLE_ENDIAN__)) || defined(__MSP430__)

+    #define TU_BYTE_ORDER TU_LITTLE_ENDIAN

+  #else

+    #define TU_BYTE_ORDER TU_BIG_ENDIAN

   #endif

+

+  #define TU_BSWAP16(u16) (__builtin_bswap16(u16))

+  #define TU_BSWAP32(u32) (__builtin_bswap32(u32))

+

+#else

+  #error "Compiler attribute porting is required"

+#endif

+

+#if (TU_BYTE_ORDER == TU_LITTLE_ENDIAN)

+

+  #define tu_htons(u16)  (TU_BSWAP16(u16))

+  #define tu_ntohs(u16)  (TU_BSWAP16(u16))

+

+  #define tu_htonl(u32)  (TU_BSWAP32(u32))

+  #define tu_ntohl(u32)  (TU_BSWAP32(u32))

+

+  #define tu_htole16(u16) (u16)

+  #define tu_le16toh(u16) (u16)

+

+  #define tu_htole32(u32) (u32)

+  #define tu_le32toh(u32) (u32)

+

+#elif (TU_BYTE_ORDER == TU_BIG_ENDIAN)

+

+  #define tu_htons(u16)  (u16)

+  #define tu_ntohs(u16)  (u16)

+

+  #define tu_htonl(u32)  (u32)

+  #define tu_ntohl(u32)  (u32)

+

+

+  #define tu_htole16(u16) (tu_bswap16(u16))

+  #define tu_le16toh(u16) (tu_bswap16(u16))

+

+  #define tu_htole32(u32) (tu_bswap32(u32))

+  #define tu_le32toh(u32) (tu_bswap32(u32))

+

 #else

-  #error "Compiler attribute porting are required"

+  #error Byte order is undefined

 #endif

 

 #endif /* _TUSB_COMPILER_H_ */

diff --git a/src/common/tusb_types.h b/src/common/tusb_types.h
index a50e89934..ad42baad7 100644
--- a/src/common/tusb_types.h
+++ b/src/common/tusb_types.h
@@ -125,7 +125,8 @@ typedef enum
 {

   TUSB_REQ_TYPE_STANDARD = 0,

   TUSB_REQ_TYPE_CLASS,

-  TUSB_REQ_TYPE_VENDOR

+  TUSB_REQ_TYPE_VENDOR,

+  TUSB_REQ_TYPE_INVALID

 } tusb_request_type_t;

 

 typedef enum

diff --git a/src/common/tusb_verify.h b/src/common/tusb_verify.h
index 2727ce043..fae0c88ae 100644
--- a/src/common/tusb_verify.h
+++ b/src/common/tusb_verify.h
@@ -36,10 +36,34 @@
  * as C++ for the sake of code simplicity. Beware of a headache macro
  * manipulation that you are told to stay away.
  *
- * e.g
  *
- * - TU_VERIFY( cond ) will return false if cond is false
- * - TU_VERIFY( cond, err) will return err instead if cond is false
+ * This contains macros for both VERIFY and ASSERT:
+ * 
+ *   VERIFY: Used when there is an error condition which is not the
+ *           fault of the MCU. For example, bounds checking on data
+ *           sent to the micro over USB should use this function.
+ *           Another example is checking for buffer overflows, where
+ *           returning from the active function causes a NAK.
+ * 
+ *   ASSERT: Used for error conditions that are caused by MCU firmware
+ *           bugs. This is used to discover bugs in the code more
+ *           quickly. One example would be adding assertions in library
+ *           function calls to confirm a function's (untainted)
+ *           parameters are valid.
+ *
+ * 
+ * The difference in behaviour is that ASSERT triggers a breakpoint while
+ * verify does not.
+ *
+ *   #define TU_VERIFY(cond)                  if(cond) return false;
+ *   #define TU_VERIFY(cond,ret)              if(cond) return ret;
+ *   
+ *   #define TU_VERIFY_HDLR(cond,handler)     if(cond) {handler; return false;}
+ *   #define TU_VERIFY_HDLR(cond,ret,handler) if(cond) {handler; return ret;}
+ *
+ *   #define TU_ASSERT(cond)                  if(cond) {_MESS_FAILED(); TU_BREAKPOINT(), return false;}
+ *   #define TU_ASSERT(cond,ret)              if(cond) {_MESS_FAILED(); TU_BREAKPOINT(), return ret;}
+ *  
  *------------------------------------------------------------------*/
 
 #ifdef __cplusplus
diff --git a/src/device/usbd.c b/src/device/usbd.c
index 572708f7d..2f8967fae 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -62,7 +62,7 @@ typedef struct {
 static usbd_device_t _usbd_dev = { 0 };

 

 // Invalid driver ID in itf2drv[] ep2drv[][] mapping

-enum { DRVID_INVALID = 0xff };

+enum { DRVID_INVALID = 0xFFu };

 

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

 // Class Driver

@@ -365,6 +365,8 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
 {

   usbd_control_set_complete_callback(NULL);

 

+  TU_ASSERT(p_request->bmRequestType_bit.type < TUSB_REQ_TYPE_INVALID);

+

   // Vendor request

   if ( p_request->bmRequestType_bit.type == TUSB_REQ_TYPE_VENDOR )

   {

@@ -486,7 +488,8 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
             // GET HID REPORT DESCRIPTOR falls into this case

             // stall control endpoint if driver return false

             usbd_control_set_complete_callback(usbd_class_drivers[drvid].control_complete);

-            TU_ASSERT(usbd_class_drivers[drvid].control_request(rhport, p_request));

+            TU_ASSERT(usbd_class_drivers[drvid].control_request != NULL &&

+                      usbd_class_drivers[drvid].control_request(rhport, p_request));

           break;

         }

       }else

@@ -494,7 +497,8 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
         // forward to class driver: "non-STD request to Interface"

         // stall control endpoint if driver return false

         usbd_control_set_complete_callback(usbd_class_drivers[drvid].control_complete);

-        TU_ASSERT(usbd_class_drivers[drvid].control_request(rhport, p_request));

+        TU_ASSERT(usbd_class_drivers[drvid].control_request != NULL &&

+                  usbd_class_drivers[drvid].control_request(rhport, p_request));

       }

     }

     break;

@@ -515,7 +519,7 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
       // We will forward all request targeted endpoint to its class driver

       // - For non-standard request: driver can ACK or Stall the request by return true/false

       // - For standard request: usbd decide the ACK stage regardless of driver return value

-      bool ret;

+      bool ret = false;

 

       if ( TUSB_REQ_TYPE_STANDARD != p_request->bmRequestType_bit.type )

       {

@@ -523,8 +527,11 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
         usbd_control_set_complete_callback(usbd_class_drivers[drv_id].control_complete);

       }

 

-      // Invoke class driver first

-      ret = usbd_class_drivers[drv_id].control_request(rhport, p_request);

+      // Invoke class driver first if available

+      if ( usbd_class_drivers[drv_id].control_request )

+      {

+        ret = usbd_class_drivers[drv_id].control_request(rhport, p_request);

+      }

 

       // Then handle if it is standard request

       if ( TUSB_REQ_TYPE_STANDARD == p_request->bmRequestType_bit.type )

diff --git a/src/portable/nxp/lpc17_40/dcd_lpc17_40.c b/src/portable/nxp/lpc17_40/dcd_lpc17_40.c
index 2b49f52e9..d5f90d2a7 100644
--- a/src/portable/nxp/lpc17_40/dcd_lpc17_40.c
+++ b/src/portable/nxp/lpc17_40/dcd_lpc17_40.c
@@ -293,7 +293,7 @@ bool dcd_edpt_open(uint8_t rhport, tusb_desc_endpoint_t const * p_endpoint_desc)
       break;
 
     case TUSB_XFER_ISOCHRONOUS:
-      TU_ASSERT((epnum % 3) == 3 && (epnum != 15));
+      TU_ASSERT((epnum % 3) == 0 && (epnum != 0) && (epnum != 15));
       break;
 
     default:
diff --git a/src/portable/st/synopsys/dcd_synopsys.c b/src/portable/st/synopsys/dcd_synopsys.c
index b0e7e04bd..f15b92edc 100644
--- a/src/portable/st/synopsys/dcd_synopsys.c
+++ b/src/portable/st/synopsys/dcd_synopsys.c
@@ -268,21 +268,22 @@ bool dcd_edpt_open (uint8_t rhport, tusb_desc_endpoint_t const * desc_edpt)
 
   uint8_t const epnum = tu_edpt_number(desc_edpt->bEndpointAddress);
   uint8_t const dir   = tu_edpt_dir(desc_edpt->bEndpointAddress);
-
-  // Unsupported endpoint numbers/size.
-  if((desc_edpt->wMaxPacketSize.size > 64) || (epnum > EP_MAX)) {
-    return false;
-  }
-
+  
+  TU_ASSERT(desc_edpt->wMaxPacketSize.size <= 64);
+  TU_ASSERT(epnum < EP_MAX);
+  
   xfer_ctl_t * xfer = XFER_CTL_BASE(epnum, dir);
   xfer->max_size = desc_edpt->wMaxPacketSize.size;
 
-  if(dir == TUSB_DIR_OUT) {
+  if(dir == TUSB_DIR_OUT)
+  {
     out_ep[epnum].DOEPCTL |= (1 << USB_OTG_DOEPCTL_USBAEP_Pos) | \
       desc_edpt->bmAttributes.xfer << USB_OTG_DOEPCTL_EPTYP_Pos | \
       desc_edpt->wMaxPacketSize.size << USB_OTG_DOEPCTL_MPSIZ_Pos;
     dev->DAINTMSK |= (1 << (USB_OTG_DAINTMSK_OEPM_Pos + epnum));
-  } else {
+  }
+  else
+  {
     // "USB Data FIFOs" section in reference manual
     // Peripheral FIFO architecture
     //