clean up tusb_descriptors

5 files changed, 17 insertions, 30 deletions

diff --git a/demos/device/device_os_none/tusb_config.h b/demos/device/device_os_none/tusb_config.h
index 6e1cb5f5d..95211e4a7 100644
--- a/demos/device/device_os_none/tusb_config.h
+++ b/demos/device/device_os_none/tusb_config.h
@@ -36,12 +36,6 @@
 */

 /**************************************************************************/

 

-/** \file

- *  \brief TBD

- *

- *  \note TBD

- */

-

 /** \ingroup TBD

  *  \defgroup TBD

  *  \brief TBD

@@ -60,7 +54,7 @@
 // CONTROLLER CONFIGURATION

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

 #define TUSB_CFG_CONTROLLER_0_MODE  (TUSB_MODE_DEVICE)

-#define TUSB_CFG_CONTROLLER_1_MODE  (TUSB_MODE_DEVICE)

+#define TUSB_CFG_CONTROLLER_1_MODE  (TUSB_MODE_NONE) // TODO not yet tested

 

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

 // HOST CONFIGURATION

diff --git a/demos/device/device_os_none/tusb_descriptors.c b/demos/device/device_os_none/tusb_descriptors.c
index 7b1796cdc..ca293eedb 100644
--- a/demos/device/device_os_none/tusb_descriptors.c
+++ b/demos/device/device_os_none/tusb_descriptors.c
@@ -39,7 +39,7 @@
 #include "tusb_descriptors.h"
 
 #if TUSB_CFG_DEVICE_HID_KEYBOARD
-TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4)
+TUSB_CFG_ATTR_USBRAM
 uint8_t app_tusb_keyboard_desc_report[] = {
   HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP     ),
   HID_USAGE      ( HID_USAGE_DESKTOP_KEYBOARD ),
@@ -83,7 +83,7 @@ uint8_t app_tusb_keyboard_desc_report[] = {
 #endif
 
 #if TUSB_CFG_DEVICE_HID_MOUSE
-TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4)
+TUSB_CFG_ATTR_USBRAM
 uint8_t app_tusb_mouse_desc_report[] = {
   HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP     ),
   HID_USAGE      ( HID_USAGE_DESKTOP_MOUSE    ),
@@ -128,7 +128,7 @@ uint8_t app_tusb_mouse_desc_report[] = {
 };
 #endif
 
-TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4)
+TUSB_CFG_ATTR_USBRAM
 tusb_descriptor_device_t app_tusb_desc_device =
 {
     .bLength            = sizeof(tusb_descriptor_device_t),
@@ -151,8 +151,7 @@ tusb_descriptor_device_t app_tusb_desc_device =
     .bNumConfigurations = 0x01 // TODO multiple configurations
 };
 
-
-TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4)
+TUSB_CFG_ATTR_USBRAM
 app_descriptor_configuration_t app_tusb_desc_configuration =
 {
     .configuration =
@@ -387,7 +386,7 @@ app_descriptor_configuration_t app_tusb_desc_configuration =
     #endif
 };
 
-TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4)
+TUSB_CFG_ATTR_USBRAM
 app_descriptor_string_t app_tusb_desc_strings =
 {
     //------------- index 0 -------------//
diff --git a/demos/device/device_os_none/tusb_descriptors.h b/demos/device/device_os_none/tusb_descriptors.h
index 2795d17be..0025b3b60 100644
--- a/demos/device/device_os_none/tusb_descriptors.h
+++ b/demos/device/device_os_none/tusb_descriptors.h
@@ -41,20 +41,14 @@
 
 #include "tusb.h"
 
-#define INTERFACES_OF_CDC           (TUSB_CFG_DEVICE_CDC ? 2 : 0)
-#define INTERFACES_OF_HID_KEYBOARD  (TUSB_CFG_DEVICE_HID_KEYBOARD ? 1 : 0)
-#define INTERFACES_OF_HID_MOUSE     (TUSB_CFG_DEVICE_HID_MOUSE ? 1 : 0)
-#define INTERFACES_OF_HID_GENERIC   (TUSB_CFG_DEVICE_HID_GENERIC ? 1 : 0)
-#define INTERFACES_OF_MASS_STORAGE  (TUSB_CFG_DEVICE_MSC ? 1 : 0)
-
 #define INTERFACE_INDEX_CDC           0
-#define INTERFACE_INDEX_HID_KEYBOARD (INTERFACE_INDEX_CDC          + INTERFACES_OF_CDC          )
-#define INTERFACE_INDEX_HID_MOUSE    (INTERFACE_INDEX_HID_KEYBOARD + INTERFACES_OF_HID_KEYBOARD )
-#define INTERFACE_INDEX_HID_GENERIC  (INTERFACE_INDEX_HID_MOUSE    + INTERFACES_OF_HID_MOUSE    )
-#define INTERFACE_INDEX_MASS_STORAGE (INTERFACE_INDEX_HID_GENERIC  + INTERFACES_OF_HID_GENERIC  )
+#define INTERFACE_INDEX_HID_KEYBOARD (INTERFACE_INDEX_CDC          + 2*TUSB_CFG_DEVICE_CDC        )
+#define INTERFACE_INDEX_HID_MOUSE    (INTERFACE_INDEX_HID_KEYBOARD + TUSB_CFG_DEVICE_HID_KEYBOARD )
+#define INTERFACE_INDEX_HID_GENERIC  (INTERFACE_INDEX_HID_MOUSE    + TUSB_CFG_DEVICE_HID_MOUSE    )
+#define INTERFACE_INDEX_MASS_STORAGE (INTERFACE_INDEX_HID_GENERIC  + TUSB_CFG_DEVICE_HID_GENERIC  )
 
-#define TOTAL_INTEFACES              (INTERFACES_OF_CDC + INTERFACES_OF_HID_KEYBOARD + INTERFACES_OF_HID_MOUSE + \
-                                      INTERFACES_OF_HID_GENERIC + INTERFACES_OF_MASS_STORAGE)
+#define TOTAL_INTEFACES              (2*TUSB_CFG_DEVICE_CDC + TUSB_CFG_DEVICE_HID_KEYBOARD + TUSB_CFG_DEVICE_HID_MOUSE + \
+                                      TUSB_CFG_DEVICE_HID_GENERIC + TUSB_CFG_DEVICE_MSC)
 
 // USB Interface Assosication Descriptor
 #define  USB_DEVICE_CLASS_IAD        USB_DEVICE_CLASS_MISCELLANEOUS
@@ -69,10 +63,10 @@
 // first plug.
 #ifndef TUSB_CFG_PRODUCT_ID
 // Bitmap: MassStorage | Generic | Mouse | Key | CDC
-#define PRODUCTID_BITMAP(interface, n)  ( (INTERFACES_OF_##interface ? 1 : 0) << (n) )
+#define PRODUCTID_BITMAP(interface, n)  ( (TUSB_CFG_DEVICE_##interface) << (n) )
 #define TUSB_CFG_PRODUCT_ID             (0x2000 | ( PRODUCTID_BITMAP(CDC, 0) | PRODUCTID_BITMAP(HID_KEYBOARD, 1) | \
                                          PRODUCTID_BITMAP(HID_MOUSE, 2) | PRODUCTID_BITMAP(HID_GENERIC, 3) | \
-                                         PRODUCTID_BITMAP(MASS_STORAGE, 4) ) )
+                                         PRODUCTID_BITMAP(MSC, 4) ) )
 #endif
 
 //--------------------------------------------------------------------+
diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c
index bcdadd72b..81a0bc2ed 100644
--- a/tinyusb/device/usbd.c
+++ b/tinyusb/device/usbd.c
@@ -253,7 +253,7 @@ void usbd_setup_received_isr(uint8_t coreid, tusb_control_request_t * p_request)
   if(TUSB_ERROR_NONE != error)
   { // Response with Protocol Stall if request is not supported
     dcd_pipe_control_stall(coreid);
-    ASSERT(error == TUSB_ERROR_NONE, VOID_RETURN);
+//    ASSERT(error == TUSB_ERROR_NONE, VOID_RETURN);
   }
 }
 
diff --git a/tinyusb/hal/hal_lpc43xx.c b/tinyusb/hal/hal_lpc43xx.c
index b59b433b3..f9e0921b6 100644
--- a/tinyusb/hal/hal_lpc43xx.c
+++ b/tinyusb/hal/hal_lpc43xx.c
@@ -78,7 +78,6 @@ tusb_error_t hal_init(void)
   ASSERT_INT( CGU_ERROR_SUCCESS, CGU_SetPLL0(), TUSB_ERROR_FAILED); /* the usb core require output clock = 480MHz */

   CGU_EntityConnect(CGU_CLKSRC_XTAL_OSC, CGU_CLKSRC_PLL0);

   CGU_EnableEntity(CGU_CLKSRC_PLL0, ENABLE);   /* Enable PLL after all setting is done */

-  LPC_CREG->CREG0 &= ~(1<<5); /* Turn on the phy */

 

   // reset controller & set role

   ASSERT_STATUS( hal_controller_reset(0) );

@@ -104,7 +103,6 @@ tusb_error_t hal_init(void)
 

   /* connect CLK_USB1 to 60 MHz clock */

   CGU_EntityConnect(CGU_CLKSRC_PLL1, CGU_BASE_USB1); /* FIXME Run base BASE_USB1_CLK clock from PLL1 (assume PLL1 is 60 MHz, no division required) */

-  //LPC_CREG->CREG0 &= ~(1<<5); /* Turn on the phy */

   LPC_SCU->SFSUSB = (TUSB_CFG_CONTROLLER_1_MODE & TUSB_MODE_HOST) ? 0x16 : 0x12; // enable USB1 with on-chip FS PHY

 

   ASSERT_STATUS( hal_controller_reset(1) );

@@ -120,6 +118,8 @@ tusb_error_t hal_init(void)
   hal_interrupt_enable(1);

 #endif

 

+  LPC_CREG->CREG0 &= ~(1<<5); /* Turn on the phy */

+

   return TUSB_ERROR_NONE;

 }