fix ci

5 files changed, 29 insertions, 12 deletions

diff --git a/src/device/dcd.h b/src/device/dcd.h
index 11f8ca5d3..8bfad9b72 100644
--- a/src/device/dcd.h
+++ b/src/device/dcd.h
@@ -30,13 +30,24 @@
 #include "common/tusb_common.h"
 #include "osal/osal.h"
 #include "common/tusb_fifo.h"
-
 #include "dcd_attr.h"
 
 #ifdef __cplusplus
  extern "C" {
 #endif
 
+//--------------------------------------------------------------------+
+// Configuration
+//--------------------------------------------------------------------+
+
+#ifndef CFG_TUD_ENDPPOINT_MAX
+  #define CFG_TUD_ENDPPOINT_MAX   DCD_ATTR_ENDPOINT_MAX
+#endif
+
+//--------------------------------------------------------------------+
+// MACRO CONSTANT TYPEDEF PROTYPES
+//--------------------------------------------------------------------+
+
 typedef enum
 {
   DCD_EVENT_INVALID = 0,
diff --git a/src/device/dcd_attr.h b/src/device/dcd_attr.h
index 5deba27b5..2fd235a96 100644
--- a/src/device/dcd_attr.h
+++ b/src/device/dcd_attr.h
@@ -33,6 +33,7 @@
 // - ENDPOINT_MAX: max (logical) number of endpoint
 // - ENDPOINT_EXCLUSIVE_NUMBER: endpoint number with different direction IN and OUT aren't allowed,
 //                              e.g EP1 OUT & EP1 IN cannot exist together
+// - PORT_HIGHSPEED: mask to indicate which port support highspeed mode, bit0 for port0 and so on.
 
 //------------- NXP -------------//
 #if   TU_CHECK_MCU(LPC11UXX) || TU_CHECK_MCU(LPC13XX) || TU_CHECK_MCU(LPC15XX)
@@ -48,7 +49,11 @@
 #elif TU_CHECK_MCU(LPC51UXX)
    #define DCD_ATTR_ENDPOINT_MAX   5
 
-#elif TU_CHECK_MCU(LPC54XXX) || TU_CHECK_MCU(LPC55XX)
+#elif TU_CHECK_MCU(LPC54XXX)
+  // TODO USB0 has 5, USB1 has 6
+  #define DCD_ATTR_ENDPOINT_MAX   6
+
+#elif TU_CHECK_MCU(LPC55XX)
   // TODO USB0 has 5, USB1 has 6
   #define DCD_ATTR_ENDPOINT_MAX   6
 
@@ -143,4 +148,9 @@
   #define DCD_ATTR_ENDPOINT_MAX   8
 #endif
 
+// Default to fullspeed if not defined
+//#ifndef PORT_HIGHSPEED
+//  #define DCD_ATTR_PORT_HIGHSPEED 0x00
+//#endif
+
 #endif
diff --git a/src/device/usbd.c b/src/device/usbd.c
index 7de3c4377..b724c73e8 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -37,18 +37,10 @@
 // USBD Configuration
 //--------------------------------------------------------------------+
 
-#ifndef CFG_TUD_ENDPOINT0_SIZE
-  #define CFG_TUD_ENDPOINT0_SIZE  64
-#endif
-
 #ifndef CFG_TUD_TASK_QUEUE_SZ
   #define CFG_TUD_TASK_QUEUE_SZ   16
 #endif
 
-#ifndef CFG_TUD_ENDPPOINT_MAX
-  #define CFG_TUD_ENDPPOINT_MAX   DCD_ATTR_ENDPOINT_MAX
-#endif
-
 //--------------------------------------------------------------------+
 // Device Data
 //--------------------------------------------------------------------+
diff --git a/src/device/usbd.h b/src/device/usbd.h
index e6a4d550b..9500ad70c 100644
--- a/src/device/usbd.h
+++ b/src/device/usbd.h
@@ -27,12 +27,12 @@
 #ifndef _TUSB_USBD_H_
 #define _TUSB_USBD_H_
 
+#include "common/tusb_common.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "common/tusb_common.h"
-
 //--------------------------------------------------------------------+
 // Application API
 //--------------------------------------------------------------------+
diff --git a/src/tusb_option.h b/src/tusb_option.h
index e24e5947c..dfac46374 100644
--- a/src/tusb_option.h
+++ b/src/tusb_option.h
@@ -210,6 +210,10 @@
 // DEVICE OPTIONS
 //--------------------------------------------------------------------
 
+#ifndef CFG_TUD_ENDPOINT0_SIZE
+  #define CFG_TUD_ENDPOINT0_SIZE  64
+#endif
+
 #ifndef CFG_TUD_CDC
   #define CFG_TUD_CDC             0
 #endif