Merge pull request #18 from hathach/devlocal

Devlocal

2 files changed, 18 insertions, 15 deletions

diff --git a/src/device/dcd.h b/src/device/dcd.h
index db84df839..6b1356cbf 100644
--- a/src/device/dcd.h
+++ b/src/device/dcd.h
@@ -90,14 +90,14 @@ typedef struct ATTR_ALIGNED(4)
 TU_VERIFY_STATIC(sizeof(dcd_event_t) <= 12, "size is not correct");

 

 /*------------------------------------------------------------------*/

-/* Device API (Weak is optional)

+/* Device API

  *------------------------------------------------------------------*/

-bool dcd_init             (uint8_t rhport);

-void dcd_set_address      (uint8_t rhport, uint8_t dev_addr);

-void dcd_set_config       (uint8_t rhport, uint8_t config_num);

+bool dcd_init       (uint8_t rhport);

+void dcd_int_enable (uint8_t rhport);

+void dcd_int_disable(uint8_t rhport);

 

-void dcd_connect          (uint8_t rhport) ATTR_WEAK;

-void dcd_disconnect       (uint8_t rhport) ATTR_WEAK;

+void dcd_set_address(uint8_t rhport, uint8_t dev_addr);

+void dcd_set_config (uint8_t rhport, uint8_t config_num);

 

 /*------------------------------------------------------------------*/

 /* Event Function

diff --git a/src/device/usbd.c b/src/device/usbd.c
index 81fcfe959..ddb63cebb 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -190,23 +190,26 @@ bool tud_mounted(void)
 //--------------------------------------------------------------------+

 tusb_error_t usbd_init (void)

 {

+  // Init device queue & task

+  _usbd_q = osal_queue_create(&_usbd_qdef);

+  TU_VERIFY(_usbd_q, TUSB_ERROR_OSAL_QUEUE_FAILED);

+

+  osal_task_create(&_usbd_task_def);

+

+  // Init class drivers

+  for (uint8_t i = 0; i < USBD_CLASS_DRIVER_COUNT; i++) usbd_class_drivers[i].init();

+

+  // Init device controller driver

   #if (CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE)

   dcd_init(0);

+  dcd_int_enable(0);

   #endif

 

   #if (CFG_TUSB_RHPORT1_MODE & OPT_MODE_DEVICE)

   dcd_init(1);

+  dcd_int_enable(1);

   #endif

 

-  //------------- Task init -------------//

-  _usbd_q = osal_queue_create(&_usbd_qdef);

-  TU_VERIFY(_usbd_q, TUSB_ERROR_OSAL_QUEUE_FAILED);

-

-  osal_task_create(&_usbd_task_def);

-

-  //------------- class init -------------//

-  for (uint8_t i = 0; i < USBD_CLASS_DRIVER_COUNT; i++) usbd_class_drivers[i].init();

-

   return TUSB_ERROR_NONE;

 }