1 files changed, 9 insertions, 23 deletions
diff --git a/src/tusb.c b/src/tusb.c
index e9db184f2..ad2dcbfd3 100644
--- a/src/tusb.c
+++ b/src/tusb.c
@@ -39,28 +39,28 @@
 #include "tusb_option.h"
 
 #if TUSB_OPT_HOST_ENABLED || TUSB_OPT_DEVICE_ENABLED
-
 #define _TINY_USB_SOURCE_FILE_
 
 #include "tusb.h"
-#include "device/usbd_pvt.h"
 
 static bool _initialized = false;
 
+// TODO clean up
+#if TUSB_OPT_DEVICE_ENABLED
+#include "device/usbd_pvt.h"
+#endif
 
-tusb_error_t tusb_init(void)
+bool tusb_init(void)
 {
   // skip if already initialized
-  if (_initialized) return TUSB_ERROR_NONE;
-
-  TU_VERIFY( tusb_hal_init(), TUSB_ERROR_FAILED ) ; // hardware init
+  if (_initialized) return true;
 
-#if MODE_HOST_SUPPORTED
-  TU_ASSERT_ERR( usbh_init() ); // host stack init
+#if TUSB_OPT_HOST_ENABLED
+  TU_VERIFY( usbh_init() ); // init host stack
 #endif
 
 #if TUSB_OPT_DEVICE_ENABLED
-  TU_ASSERT_ERR ( usbd_init() ); // device stack init
+  TU_VERIFY ( usbd_init() ); // init device stack
 #endif
 
   _initialized = true;
@@ -68,20 +68,6 @@ tusb_error_t tusb_init(void)
   return TUSB_ERROR_NONE;
 }
 
-#if CFG_TUSB_OS == OPT_OS_NONE
-void tusb_task(void)
-{
-  #if MODE_HOST_SUPPORTED
-  usbh_enumeration_task(NULL);
-  #endif
-
-  #if TUSB_OPT_DEVICE_ENABLED
-  usbd_task(NULL);
-  #endif
-}
-#endif
-
-
 /*------------------------------------------------------------------*/
 /* Debug
  *------------------------------------------------------------------*/