clean up

4 files changed, 10 insertions, 15 deletions

diff --git a/src/device/usbd.h b/src/device/usbd.h
index 5338be157..bbdd1be99 100644
--- a/src/device/usbd.h
+++ b/src/device/usbd.h
@@ -41,8 +41,6 @@
 //--------------------------------------------------------------------+
 
 // Init device stack
-// Note: when using with RTOS, this should be called after scheduler/kernel is started.
-// Otherwise it could cause kernel issue since USB IRQ handler does use RTOS queue API.
 bool tud_init (void);
 
 // Task function should be called in main/rtos loop
diff --git a/src/host/usbh.c b/src/host/usbh.c
index 58550c93b..b6df6bad8 100644
--- a/src/host/usbh.c
+++ b/src/host/usbh.c
@@ -116,7 +116,7 @@ enum { USBH_CLASS_DRIVER_COUNT = TU_ARRAY_SIZE(usbh_class_drivers) };
 CFG_TUSB_MEM_SECTION usbh_device_t _usbh_devices[CFG_TUSB_HOST_DEVICE_MAX+1];
 
 // Event queue
-// role device/host is used by OS NONE for mutex (disable usb isr) only
+// role device/host is used by OS NONE for mutex (disable usb isr)
 OSAL_QUEUE_DEF(OPT_MODE_HOST, _usbh_qdef, CFG_TUH_TASK_QUEUE_SZ, hcd_event_t);
 static osal_queue_t _usbh_q;
 
@@ -137,7 +137,6 @@ tusb_device_state_t tuh_device_get_state (uint8_t const dev_addr)
   return (tusb_device_state_t) _usbh_devices[dev_addr].state;
 }
 
-
 static inline void osal_task_delay(uint32_t msec)
 {
   (void) msec;
@@ -149,7 +148,7 @@ static inline void osal_task_delay(uint32_t msec)
 //--------------------------------------------------------------------+
 // CLASS-USBD API (don't require to verify parameters)
 //--------------------------------------------------------------------+
-bool usbh_init(void)
+bool tuh_init(void)
 {
   tu_memclr(_usbh_devices, sizeof(usbh_device_t)*(CFG_TUSB_HOST_DEVICE_MAX+1));
 
@@ -385,13 +384,10 @@ bool enum_task(hcd_event_t* event)
 #endif
   };
 
-  // for OSAL_NONE local variable won't retain value after blocking service sem_wait/queue_recv
-  static uint8_t configure_selected = 1; // TODO move
-
   usbh_device_t* dev0 = &_usbh_devices[0];
   tusb_control_request_t request;
 
-  dev0->rhport  = event->rhport; // TODO refractor integrate to device_pool
+  dev0->rhport   = event->rhport; // TODO refractor integrate to device_pool
   dev0->hub_addr = event->attach.hub_addr;
   dev0->hub_port = event->attach.hub_port;
   dev0->state    = TUSB_DEVICE_STATE_UNPLUG;
@@ -552,7 +548,7 @@ bool enum_task(hcd_event_t* event)
   new_dev->product_id      = ((tusb_desc_device_t*) _usbh_ctrl_buf)->idProduct;
   new_dev->configure_count = ((tusb_desc_device_t*) _usbh_ctrl_buf)->bNumConfigurations;
 
-  configure_selected = get_configure_number_for_device((tusb_desc_device_t*) _usbh_ctrl_buf);
+  uint8_t const configure_selected = get_configure_number_for_device((tusb_desc_device_t*) _usbh_ctrl_buf);
   TU_ASSERT(configure_selected <= new_dev->configure_count); // TODO notify application when invalid configuration
 
   //------------- Get 9 bytes of configuration descriptor -------------//
diff --git a/src/host/usbh.h b/src/host/usbh.h
index 27193d378..1930dc20b 100644
--- a/src/host/usbh.h
+++ b/src/host/usbh.h
@@ -70,6 +70,11 @@ typedef struct {
 //--------------------------------------------------------------------+
 // APPLICATION API
 //--------------------------------------------------------------------+
+
+// Init host stack
+bool tuh_init(void);
+
+// Task function should be called in main/rtos loop
 void tuh_task(void);
 
 // Interrupt handler, name alias to HCD
@@ -97,11 +102,7 @@ TU_ATTR_WEAK void tuh_umount_cb(uint8_t dev_addr);
 // CLASS-USBH & INTERNAL API
 //--------------------------------------------------------------------+
 
-// Note: when using with RTOS, this should be called after scheduler/kernel is started.
-// Otherwise it could cause kernel issue since USB IRQ handler does use RTOS queue API.
-bool usbh_init(void);
 bool usbh_control_xfer (uint8_t dev_addr, tusb_control_request_t* request, uint8_t* data);
-
 bool usbh_edpt_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_endpoint_t const * ep_desc);
 
 #ifdef __cplusplus
diff --git a/src/tusb.c b/src/tusb.c
index 1bc134dba..ae1bc47e3 100644
--- a/src/tusb.c
+++ b/src/tusb.c
@@ -43,7 +43,7 @@ bool tusb_init(void)
   if (_initialized) return true;
 
 #if TUSB_OPT_HOST_ENABLED
-  TU_ASSERT( usbh_init() ); // init host stack
+  TU_ASSERT( tuh_init() ); // init host stack
 #endif
 
 #if TUSB_OPT_DEVICE_ENABLED