rename romdriver handle

forming API for USBD-CLASS driver (abstract away from rom driver)
separate buffer of hid class from buffer of core driver

5 files changed, 27 insertions, 26 deletions

diff --git a/tinyusb/device/dcd.c b/tinyusb/device/dcd.c
index 638ecdfe9..4406b911c 100644
--- a/tinyusb/device/dcd.c
+++ b/tinyusb/device/dcd.c
@@ -43,7 +43,7 @@
 
 #define USB_ROM_SIZE (1024*2) // TODO dcd abstract later
 uint8_t usb_RomDriver_buffer[USB_ROM_SIZE] ATTR_ALIGNED(2048) TUSB_CFG_ATTR_USBRAM;
-USBD_HANDLE_T g_hUsb;
+USBD_HANDLE_T romdriver_hdl;
 static volatile bool isConfigured = false;
 
 /**************************************************************************/
@@ -109,25 +109,25 @@ tusb_error_t dcd_init(uint8_t coreid)
   };
 
   /* USB hardware core initialization */
-  ASSERT(LPC_OK == ROM_API->hw->Init(&g_hUsb, &DeviceDes, &usb_param), TUSB_ERROR_FAILED);
+  ASSERT(LPC_OK == ROM_API->hw->Init(&romdriver_hdl, &DeviceDes, &usb_param), TUSB_ERROR_FAILED);
 
   membase += (memsize - usb_param.mem_size);
   memsize = usb_param.mem_size;
 
   /* Initialise the class driver(s) */
   #ifdef TUSB_CFG_DEVICE_CDC
-  ASSERT_STATUS( tusb_cdc_init(g_hUsb, &USB_FsConfigDescriptor.CDC_CCI_Interface,
+  ASSERT_STATUS( tusb_cdc_init(romdriver_hdl, &USB_FsConfigDescriptor.CDC_CCI_Interface,
             &USB_FsConfigDescriptor.CDC_DCI_Interface, &membase, &memsize) );
   #endif
 
   #ifdef TUSB_CFG_DEVICE_HID_KEYBOARD
-  ASSERT_STATUS( tusb_hid_init(g_hUsb , &USB_FsConfigDescriptor.HID_KeyboardInterface ,
+  ASSERT_STATUS( tusb_hid_init(romdriver_hdl , &USB_FsConfigDescriptor.HID_KeyboardInterface ,
             HID_KeyboardReportDescriptor, USB_FsConfigDescriptor.HID_KeyboardHID.DescriptorList[0].wDescriptorLength,
             &membase , &memsize) );
   #endif
 
   #ifdef TUSB_CFG_DEVICE_HID_MOUSE
-  ASSERT_STATUS( tusb_hid_init(g_hUsb , &USB_FsConfigDescriptor.HID_MouseInterface    ,
+  ASSERT_STATUS( tusb_hid_init(romdriver_hdl , &USB_FsConfigDescriptor.HID_MouseInterface    ,
             HID_MouseReportDescriptor, USB_FsConfigDescriptor.HID_MouseHID.DescriptorList[0].wDescriptorLength,
             &membase , &memsize) );
   #endif
@@ -135,7 +135,7 @@ tusb_error_t dcd_init(uint8_t coreid)
   hal_interrupt_enable(); /* Enable the USB interrupt */
 
   /* Perform USB soft connect */
-  ROM_API->hw->Connect(g_hUsb, 1);
+  ROM_API->hw->Connect(romdriver_hdl, 1);
 #endif
 
   return TUSB_ERROR_NONE;
diff --git a/tinyusb/device/dcd_nxp_romdriver.c b/tinyusb/device/dcd_nxp_romdriver.c
index e787aca5a..5c0e4d847 100644
--- a/tinyusb/device/dcd_nxp_romdriver.c
+++ b/tinyusb/device/dcd_nxp_romdriver.c
@@ -47,15 +47,12 @@
 //--------------------------------------------------------------------+
 #include "dcd.h"
 #include "dcd_nxp_romdriver.h"
-#include "romdriver/mw_usbd_rom_api.h"
-
 #include "tusb_descriptors.h"
 
-
 #define USB_ROM_SIZE (1024*2) // TODO dcd abstract later
 uint8_t usb_RomDriver_buffer[USB_ROM_SIZE] ATTR_ALIGNED(2048) TUSB_CFG_ATTR_USBRAM;
 
-USBD_HANDLE_T g_hUsb;
+USBD_HANDLE_T romdriver_hdl;
 
 typedef struct {
   volatile uint8_t state;
@@ -147,29 +144,18 @@ tusb_error_t dcd_init(void)
   };
 
   /* USB hardware core initialization */
-  ASSERT_INT(LPC_OK, ROM_API->hw->Init(&g_hUsb, &desc_core, &usb_param), TUSB_ERROR_FAILED);
+  ASSERT_INT(LPC_OK, ROM_API->hw->Init(&romdriver_hdl, &desc_core, &usb_param), TUSB_ERROR_FAILED);
 
   // TODO need to confirm the mem_size is reduced by the number of byte used
   membase += (memsize - usb_param.mem_size);
   memsize = usb_param.mem_size;
 
-
-  #if TUSB_CFG_DEVICE_HID_KEYBOARD
-  ASSERT_STATUS( hidd_init(g_hUsb , &app_tusb_desc_configuration.keyboard_interface,
-            app_tusb_keyboard_desc_report, app_tusb_desc_configuration.keyboard_hid.wReportLength,
-            &membase , &memsize) );
-  #endif
-
   #if TUSB_CFG_DEVICE_HID_MOUSE
-  ASSERT_STATUS( tusb_hid_init(g_hUsb , &USB_FsConfigDescriptor.HID_MouseInterface    ,
+  ASSERT_STATUS( tusb_hid_init(romdriver_hdl , &USB_FsConfigDescriptor.HID_MouseInterface    ,
             HID_MouseReportDescriptor, USB_FsConfigDescriptor.HID_MouseHID.DescriptorList[0].wDescriptorLength,
             &membase , &memsize) );
   #endif
 
-  hal_interrupt_enable(0);
-  ROM_API->hw->Connect(g_hUsb, 1);
-  ROM_API->hw->ForceFullSpeed(g_hUsb, 1);
-
   return TUSB_ERROR_NONE;
 }
 
@@ -187,12 +173,12 @@ tusb_error_t dcd_controller_reset(uint8_t coreid)
 
 void dcd_controller_connect(uint8_t coreid)
 {
-//  ROM_API->hw->Connect(g_hUsb, 1);
+  ROM_API->hw->Connect(romdriver_hdl, 1);
 }
 
 void dcd_isr(uint8_t coreid)
 {
-  ROM_API->hw->ISR(g_hUsb);
+  ROM_API->hw->ISR(romdriver_hdl);
 }
 
 #endif
diff --git a/tinyusb/device/dcd_nxp_romdriver.h b/tinyusb/device/dcd_nxp_romdriver.h
index 840ff0f6f..fb3540d49 100644
--- a/tinyusb/device/dcd_nxp_romdriver.h
+++ b/tinyusb/device/dcd_nxp_romdriver.h
@@ -47,6 +47,7 @@
 #define _TUSB_DCD_NXP_ROMDRIVER_H_
 
 #include "common/common.h"
+#include "romdriver/mw_usbd_rom_api.h"
 
 #ifdef __cplusplus
  extern "C" {
@@ -62,6 +63,8 @@
   #error forgot something, thach ?
 #endif
 
+extern USBD_HANDLE_T romdriver_hdl;
+
 #ifdef __cplusplus
  }
 #endif
diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c
index 5fb5d0202..594112c88 100644
--- a/tinyusb/device/usbd.c
+++ b/tinyusb/device/usbd.c
@@ -80,6 +80,16 @@ tusb_error_t usbd_init (void)
 
   ASSERT_STATUS ( dcd_init() );
 
+  #if TUSB_CFG_DEVICE_HID_KEYBOARD
+  ASSERT_STATUS( hidd_init(&app_tusb_desc_configuration.keyboard_interface) );
+  #endif
+
+  #ifndef _TEST_
+  hal_interrupt_enable(0); // TODO USB1
+  #endif
+
+  dcd_controller_connect(0);  // TODO USB1
+
   return TUSB_ERROR_NONE;
 }
 
diff --git a/tinyusb/device/usbd.h b/tinyusb/device/usbd.h
index 5ed8ebd93..364dba8af 100644
--- a/tinyusb/device/usbd.h
+++ b/tinyusb/device/usbd.h
@@ -49,8 +49,10 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
+#include "common/common.h"
 #include "osal/osal.h" // TODO refractor move to common.h ?
-#include "dcd.h"
+#include "dcd.h" // TODO hide from application include
+//#include "tusb_descriptors.h"
 
 #ifdef __cplusplus
  extern "C" {