From 5ec56120e678672c9da1953ad1890ecfa7bdb773 Mon Sep 17 00:00:00 2001
From: hathach <thachha@live.com>
Date: Mon, 4 Feb 2013 12:29:50 +0700
Subject: rename usbd_host to usbh

---
 tests/test/host/test_hid_host_keyboard.c |   2 +-
 tests/test/host/test_usbd_host.c         |   2 +-
 tinyusb/class/hid_host.h                 |   2 +-
 tinyusb/host/hcd.h                       |   2 +-
 tinyusb/host/usbd_host.c                 | 144 -----------------------
 tinyusb/host/usbd_host.h                 | 194 -------------------------------
 tinyusb/host/usbh.c                      | 144 +++++++++++++++++++++++
 tinyusb/host/usbh.h                      | 194 +++++++++++++++++++++++++++++++
 tinyusb/tusb.h                           |   2 +-
 9 files changed, 343 insertions(+), 343 deletions(-)
 delete mode 100644 tinyusb/host/usbd_host.c
 delete mode 100644 tinyusb/host/usbd_host.h
 create mode 100644 tinyusb/host/usbh.c
 create mode 100644 tinyusb/host/usbh.h

diff --git a/tests/test/host/test_hid_host_keyboard.c b/tests/test/host/test_hid_host_keyboard.c
index 72d28527b..d0a93f691 100644
--- a/tests/test/host/test_hid_host_keyboard.c
+++ b/tests/test/host/test_hid_host_keyboard.c
@@ -39,7 +39,7 @@
 #include "errors.h"
 #include "hid_host.h"
 #include "mock_osal.h"
-#include "mock_usbd_host.h"
+#include "mock_usbh.h"
 
 extern class_hid_keyboard_info_t keyboard_info_pool[TUSB_CFG_HOST_DEVICE_MAX];
 
diff --git a/tests/test/host/test_usbd_host.c b/tests/test/host/test_usbd_host.c
index dd3ab0f94..9143ef3f1 100644
--- a/tests/test/host/test_usbd_host.c
+++ b/tests/test/host/test_usbd_host.c
@@ -37,7 +37,7 @@
 
 #include "unity.h"
 #include "errors.h"
-#include "usbd_host.h"
+#include "usbh.h"
 #include "mock_osal.h"
 #include "mock_hcd.h"
 
diff --git a/tinyusb/class/hid_host.h b/tinyusb/class/hid_host.h
index b41bafb15..4ef003868 100644
--- a/tinyusb/class/hid_host.h
+++ b/tinyusb/class/hid_host.h
@@ -55,7 +55,7 @@
  extern "C" {
 #endif
 
-#include "host/usbd_host.h"
+#include "host/usbh.h"
 #include "hid.h"
 
 //--------------------------------------------------------------------+
diff --git a/tinyusb/host/hcd.h b/tinyusb/host/hcd.h
index 476170b74..31c1feb4d 100644
--- a/tinyusb/host/hcd.h
+++ b/tinyusb/host/hcd.h
@@ -56,7 +56,7 @@
 #endif
 
 #include "common/common.h"
-//#include "usbd_host.h"
+//#include "usbh.h"
 
 typedef uint32_t pipe_handle_t;
 
diff --git a/tinyusb/host/usbd_host.c b/tinyusb/host/usbd_host.c
deleted file mode 100644
index 293d8dbbd..000000000
--- a/tinyusb/host/usbd_host.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * usbd_host.c
- *
- *  Created on: Jan 19, 2013
- *      Author: hathach
- */
-
-/*
- * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * This file is part of the tiny usb stack.
- */
-
-#include "tusb_option.h"
-
-#ifdef TUSB_CFG_HOST
-
-#define _TINY_USB_SOURCE_FILE_
-
-//--------------------------------------------------------------------+
-// INCLUDE
-//--------------------------------------------------------------------+
-#include "common/common.h"
-#include "usbd_host.h"
-#include "osal/osal.h"
-
-//--------------------------------------------------------------------+
-// MACRO CONSTANT TYPEDEF
-//--------------------------------------------------------------------+
-
-
-//--------------------------------------------------------------------+
-// INTERNAL OBJECT & FUNCTION DECLARATION
-//--------------------------------------------------------------------+
-
-STATIC_ usbh_device_info_t device_info_pool[TUSB_CFG_HOST_DEVICE_MAX];
-
-//--------------------------------------------------------------------+
-// PUBLIC API (Parameter Verification is required)
-//--------------------------------------------------------------------+
-tusbh_device_status_t tusbh_device_status_get (tusb_handle_device_t const device_hdl)
-{
-  ASSERT(device_hdl < TUSB_CFG_HOST_DEVICE_MAX, 0);
-  return device_info_pool[device_hdl].status;
-}
-
-//--------------------------------------------------------------------+
-// ENUMERATION TASK & ITS DATA
-//--------------------------------------------------------------------+
-OSAL_TASK_DEF(enum_task, usbh_enumeration_task, 128, OSAL_PRIO_HIGH);
-
-#define ENUM_QUEUE_DEPTH  5
-OSAL_DEF_QUEUE(enum_queue, ENUM_QUEUE_DEPTH, uin32_t);
-osal_queue_handle_t enum_queue_hdl;
-usbh_device_addr0_t device_addr0 TUSB_CFG_ATTR_USBRAM;
-
-void usbh_enumeration_task(void)
-{
-  tusb_error_t error;
-
-  OSAL_TASK_LOOP_BEGIN
-
-  osal_queue_receive(enum_queue_hdl, (uint32_t*)(&device_addr0.enum_entry), OSAL_TIMEOUT_NORMAL, &error);
-  TASK_ASSERT_STATUS(error);
-
-  if (device_addr0.enum_entry.hub_addr == 0) // direct connection
-  {
-    TASK_ASSERT(device_addr0.enum_entry.connect_status == hcd_port_connect_status(device_addr0.enum_entry.core_id)); // there chances the event is out-dated
-
-    tusb_std_request_t request_dev_desc =
-    {
-        .bmRequestType =
-        {
-            .direction = TUSB_DIR_DEV_TO_HOST,
-            .type      = TUSB_REQUEST_TYPE_STANDARD,
-            .recipient = TUSB_REQUEST_RECIPIENT_DEVICE
-        },
-
-        .bRequest = TUSB_REQUEST_GET_DESCRIPTOR,
-        .wValue   = (TUSB_DESC_DEVICE << 8),
-        .wLength  = 8
-    };
-    device_addr0.speed = hcd_port_speed(device_addr0.enum_entry.core_id);
-//    pipe_handle_t pipe_addr0 = hcd_pipe_addr0_open(&device_addr0);
-
-      //        hcd_pipe_control_xfer(pipe_addr0, &request_dev_desc)
-  }else // device connect via a hub
-  {
-    ASSERT_MESSAGE("%s", "Hub is not supported yet");
-  }
-
-  OSAL_TASK_LOOP_END
-}
-
-//--------------------------------------------------------------------+
-// REPORTER TASK & ITS DATA
-//--------------------------------------------------------------------+
-
-
-//--------------------------------------------------------------------+
-// CLASS-USBD API (don't require to verify parameters)
-//--------------------------------------------------------------------+
-tusb_error_t usbh_init(void)
-{
-  uint32_t i;
-
-  memset(device_info_pool, 0, sizeof(usbh_device_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
-
-  for(i=0; i<TUSB_CFG_HOST_CONTROLLER_NUM; i++)
-  {
-    ASSERT_STATUS( hcd_init(i) );
-  }
-
-  ASSERT_STATUS( osal_task_create(&enum_task) );
-  enum_queue_hdl = osal_queue_create(&enum_queue);
-  ASSERT_PTR(enum_queue_hdl, TUSB_ERROR_OSAL_QUEUE_FAILED);
-
-  return TUSB_ERROR_NONE;
-}
-#endif
diff --git a/tinyusb/host/usbd_host.h b/tinyusb/host/usbd_host.h
deleted file mode 100644
index 12e7df48d..000000000
--- a/tinyusb/host/usbd_host.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * usbd_host.h
- *
- *  Created on: Jan 19, 2013
- *      Author: hathach
- */
-
-/*
- * Software License Agreement (BSD License)
- * Copyright (c) 2013, hathach (tinyusb.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * This file is part of the tiny usb stack.
- */
-
-/** \file
- *  \brief TBD
- *
- *  \note TBD
- */
-
-/** \ingroup TBD
- *  \defgroup TBD
- *  \brief TBD
- *
- *  @{
- */
-
-#ifndef _TUSB_USBD_HOST_H_
-#define _TUSB_USBD_HOST_H_
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-//--------------------------------------------------------------------+
-// INCLUDE
-//--------------------------------------------------------------------+
-#include "common/common.h"
-#include "hcd.h"
-
-//--------------------------------------------------------------------+
-// MACRO CONSTANT TYPEDEF
-//--------------------------------------------------------------------+
-enum {
-  TUSB_FLAGS_CLASS_UNSPECIFIED          = BIT_(0)    , ///< 0
-  TUSB_FLAGS_CLASS_AUDIO                = BIT_(1)    , ///< 1
-  TUSB_FLAGS_CLASS_CDC                  = BIT_(2)    , ///< 2
-  TUSB_FLAGS_CLASS_HID_GENERIC          = BIT_(3)    , ///< 3
-  TUSB_FLAGS_CLASS_RESERVED_4           = BIT_(4)    , ///< 4
-  TUSB_FLAGS_CLASS_PHYSICAL             = BIT_(5)    , ///< 5
-  TUSB_FLAGS_CLASS_IMAGE                = BIT_(6)    , ///< 6
-  TUSB_FLAGS_CLASS_PRINTER              = BIT_(7)    ,  ///< 7
-  TUSB_FLAGS_CLASS_MSC                  = BIT_(8)    ,  ///< 8
-  TUSB_FLAGS_CLASS_HUB                  = BIT_(9)    ,  ///< 9
-  TUSB_FLAGS_CLASS_CDC_DATA             = BIT_(10)   ,  ///< 10
-  TUSB_FLAGS_CLASS_SMART_CARD           = BIT_(11)   ,  ///< 11
-  TUSB_FLAGS_CLASS_RESERVED_12          = BIT_(12)   , ///< 12
-  TUSB_FLAGS_CLASS_CONTENT_SECURITY     = BIT_(13)   ,  ///< 13
-  TUSB_FLAGS_CLASS_VIDEO                = BIT_(14)   ,  ///< 14
-  TUSB_FLAGS_CLASS_PERSONAL_HEALTHCARE  = BIT_(15)   ,  ///< 15
-  TUSB_FLAGS_CLASS_AUDIO_VIDEO          = BIT_(16)   ,  ///< 16
-  // reserved from 17 to 20
-  TUSB_FLAGS_CLASS_RESERVED_20          = BIT_(20)    , ///< 3
-
-  TUSB_FLAGS_CLASS_HID_KEYBOARD         = BIT_(21)    , ///< 3
-  TUSB_FLAGS_CLASS_HID_MOUSE            = BIT_(22)    , ///< 3
-
-  // reserved from 25 to 26
-  TUSB_FLAGS_CLASS_RESERVED_25          = BIT_(25)    , ///< 3
-  TUSB_FLAGS_CLASS_RESERVED_26          = BIT_(26)    , ///< 3
-
-  TUSB_FLAGS_CLASS_DIAGNOSTIC           = BIT_(27),
-  TUSB_FLAGS_CLASS_WIRELESS_CONTROLLER  = BIT_(28),
-  TUSB_FLAGS_CLASS_MISC                 = BIT_(29),
-  TUSB_FLAGS_CLASS_APPLICATION_SPECIFIC = BIT_(30),
-  TUSB_FLAGS_CLASS_VENDOR_SPECIFIC      = BIT_(31)
-};
-
-/// Device Status
-enum {
-  TUSB_DEVICE_STATUS_UNPLUG = 0,
-  TUSB_DEVICE_STATUS_READY = BIT_(0),
-
-  TUSB_DEVICE_STATUS_REMOVING = BIT_(2),
-  TUSB_DEVICE_STATUS_SAFE_REMOVE = BIT_(3),
-};
-
-typedef uint8_t  tusbh_device_status_t;
-typedef uint32_t tusbh_flag_class_t;
-
-typedef struct { // TODO internal structure, re-order members
-  uint8_t core_id;
-  tusb_speed_t speed;
-  uint8_t hub_addr;
-  uint8_t hub_port;
-
-  uint16_t vendor_id;
-  uint16_t product_id;
-  uint8_t configure_count;
-
-  tusbh_device_status_t status;
-  pipe_handle_t pipe_control;
-  tusb_std_request_t request_control;
-
-#if 0 // TODO allow configure for vendor/product
-  struct {
-    uint8_t interface_count;
-    uint8_t attributes;
-  } configuration;
-#endif
-
-} usbh_device_info_t;
-
-typedef enum {
-  PIPE_STATUS_AVAILABLE = 0,
-  PIPE_STATUS_BUSY,
-  PIPE_STATUS_COMPLETE
-} pipe_status_t;
-
-typedef uint32_t tusb_handle_device_t;
-
-typedef struct ATTR_ALIGNED(4){
-  uint8_t core_id;
-  uint8_t hub_addr;
-  uint8_t hub_port;
-  uint8_t connect_status;
-} usbh_enumerate_t;
-
-typedef struct {
-  usbh_enumerate_t enum_entry;
-  tusb_speed_t speed;
-  tusb_std_request_t request_packet; // needed to be on USB RAM
-} usbh_device_addr0_t;
-
-//--------------------------------------------------------------------+
-// INTERNAL OBJECT & FUNCTION DECLARATION
-//--------------------------------------------------------------------+
-
-//--------------------------------------------------------------------+
-// APPLICATION API
-//--------------------------------------------------------------------+
-void         tusbh_device_mounting_cb (tusb_error_t const error, tusb_handle_device_t const device_hdl);
-void         tusbh_device_mounted_cb (tusb_error_t const error, tusb_handle_device_t const device_hdl);
-tusb_error_t tusbh_configuration_set     (tusb_handle_device_t const device_hdl, uint8_t const configure_number) ATTR_WARN_UNUSED_RESULT;
-tusbh_device_status_t tusbh_device_status_get (tusb_handle_device_t const device_hdl) ATTR_WARN_UNUSED_RESULT;
-
-static inline void tusb_tick_tock(void) ATTR_ALWAYS_INLINE;
-static inline void tusb_tick_tock(void)
-{
-  osal_tick_tock();
-}
-
-
-//--------------------------------------------------------------------+
-// CLASS-USBD API
-//--------------------------------------------------------------------+
-#ifdef _TINY_USB_SOURCE_FILE_
-
-tusb_error_t usbh_init(void);
-pipe_status_t usbh_pipe_status_get(pipe_handle_t pipe_hdl) ATTR_WARN_UNUSED_RESULT;
-void usbh_enum_task(void);
-
-#endif
-
-#ifdef __cplusplus
- }
-#endif
-
-#endif /* _TUSB_USBD_HOST_H_ */
-
-/** @} */
diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
new file mode 100644
index 000000000..69d30467b
--- /dev/null
+++ b/tinyusb/host/usbh.c
@@ -0,0 +1,144 @@
+/*
+ * usbd_host.c
+ *
+ *  Created on: Jan 19, 2013
+ *      Author: hathach
+ */
+
+/*
+ * Software License Agreement (BSD License)
+ * Copyright (c) 2013, hathach (tinyusb.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the tiny usb stack.
+ */
+
+#include "tusb_option.h"
+
+#ifdef TUSB_CFG_HOST
+
+#define _TINY_USB_SOURCE_FILE_
+
+//--------------------------------------------------------------------+
+// INCLUDE
+//--------------------------------------------------------------------+
+#include "common/common.h"
+#include "usbh.h"
+#include "osal/osal.h"
+
+//--------------------------------------------------------------------+
+// MACRO CONSTANT TYPEDEF
+//--------------------------------------------------------------------+
+
+
+//--------------------------------------------------------------------+
+// INTERNAL OBJECT & FUNCTION DECLARATION
+//--------------------------------------------------------------------+
+
+STATIC_ usbh_device_info_t device_info_pool[TUSB_CFG_HOST_DEVICE_MAX];
+
+//--------------------------------------------------------------------+
+// PUBLIC API (Parameter Verification is required)
+//--------------------------------------------------------------------+
+tusbh_device_status_t tusbh_device_status_get (tusb_handle_device_t const device_hdl)
+{
+  ASSERT(device_hdl < TUSB_CFG_HOST_DEVICE_MAX, 0);
+  return device_info_pool[device_hdl].status;
+}
+
+//--------------------------------------------------------------------+
+// ENUMERATION TASK & ITS DATA
+//--------------------------------------------------------------------+
+OSAL_TASK_DEF(enum_task, usbh_enumeration_task, 128, OSAL_PRIO_HIGH);
+
+#define ENUM_QUEUE_DEPTH  5
+OSAL_DEF_QUEUE(enum_queue, ENUM_QUEUE_DEPTH, uin32_t);
+osal_queue_handle_t enum_queue_hdl;
+usbh_device_addr0_t device_addr0 TUSB_CFG_ATTR_USBRAM;
+
+void usbh_enumeration_task(void)
+{
+  tusb_error_t error;
+
+  OSAL_TASK_LOOP_BEGIN
+
+  osal_queue_receive(enum_queue_hdl, (uint32_t*)(&device_addr0.enum_entry), OSAL_TIMEOUT_NORMAL, &error);
+  TASK_ASSERT_STATUS(error);
+
+  if (device_addr0.enum_entry.hub_addr == 0) // direct connection
+  {
+    TASK_ASSERT(device_addr0.enum_entry.connect_status == hcd_port_connect_status(device_addr0.enum_entry.core_id)); // there chances the event is out-dated
+
+    tusb_std_request_t request_dev_desc =
+    {
+        .bmRequestType =
+        {
+            .direction = TUSB_DIR_DEV_TO_HOST,
+            .type      = TUSB_REQUEST_TYPE_STANDARD,
+            .recipient = TUSB_REQUEST_RECIPIENT_DEVICE
+        },
+
+        .bRequest = TUSB_REQUEST_GET_DESCRIPTOR,
+        .wValue   = (TUSB_DESC_DEVICE << 8),
+        .wLength  = 8
+    };
+    device_addr0.speed = hcd_port_speed(device_addr0.enum_entry.core_id);
+//    pipe_handle_t pipe_addr0 = hcd_pipe_addr0_open(&device_addr0);
+
+      //        hcd_pipe_control_xfer(pipe_addr0, &request_dev_desc)
+  }else // device connect via a hub
+  {
+    ASSERT_MESSAGE("%s", "Hub is not supported yet");
+  }
+
+  OSAL_TASK_LOOP_END
+}
+
+//--------------------------------------------------------------------+
+// REPORTER TASK & ITS DATA
+//--------------------------------------------------------------------+
+
+
+//--------------------------------------------------------------------+
+// CLASS-USBD API (don't require to verify parameters)
+//--------------------------------------------------------------------+
+tusb_error_t usbh_init(void)
+{
+  uint32_t i;
+
+  memset(device_info_pool, 0, sizeof(usbh_device_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
+
+  for(i=0; i<TUSB_CFG_HOST_CONTROLLER_NUM; i++)
+  {
+    ASSERT_STATUS( hcd_init(i) );
+  }
+
+  ASSERT_STATUS( osal_task_create(&enum_task) );
+  enum_queue_hdl = osal_queue_create(&enum_queue);
+  ASSERT_PTR(enum_queue_hdl, TUSB_ERROR_OSAL_QUEUE_FAILED);
+
+  return TUSB_ERROR_NONE;
+}
+#endif
diff --git a/tinyusb/host/usbh.h b/tinyusb/host/usbh.h
new file mode 100644
index 000000000..d0ad72c02
--- /dev/null
+++ b/tinyusb/host/usbh.h
@@ -0,0 +1,194 @@
+/*
+ * usbh.h
+ *
+ *  Created on: Jan 19, 2013
+ *      Author: hathach
+ */
+
+/*
+ * Software License Agreement (BSD License)
+ * Copyright (c) 2013, hathach (tinyusb.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the tiny usb stack.
+ */
+
+/** \file
+ *  \brief TBD
+ *
+ *  \note TBD
+ */
+
+/** \ingroup TBD
+ *  \defgroup TBD
+ *  \brief TBD
+ *
+ *  @{
+ */
+
+#ifndef _TUSB_USBD_HOST_H_
+#define _TUSB_USBD_HOST_H_
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+//--------------------------------------------------------------------+
+// INCLUDE
+//--------------------------------------------------------------------+
+#include "common/common.h"
+#include "hcd.h"
+
+//--------------------------------------------------------------------+
+// MACRO CONSTANT TYPEDEF
+//--------------------------------------------------------------------+
+enum {
+  TUSB_FLAGS_CLASS_UNSPECIFIED          = BIT_(0)    , ///< 0
+  TUSB_FLAGS_CLASS_AUDIO                = BIT_(1)    , ///< 1
+  TUSB_FLAGS_CLASS_CDC                  = BIT_(2)    , ///< 2
+  TUSB_FLAGS_CLASS_HID_GENERIC          = BIT_(3)    , ///< 3
+  TUSB_FLAGS_CLASS_RESERVED_4           = BIT_(4)    , ///< 4
+  TUSB_FLAGS_CLASS_PHYSICAL             = BIT_(5)    , ///< 5
+  TUSB_FLAGS_CLASS_IMAGE                = BIT_(6)    , ///< 6
+  TUSB_FLAGS_CLASS_PRINTER              = BIT_(7)    ,  ///< 7
+  TUSB_FLAGS_CLASS_MSC                  = BIT_(8)    ,  ///< 8
+  TUSB_FLAGS_CLASS_HUB                  = BIT_(9)    ,  ///< 9
+  TUSB_FLAGS_CLASS_CDC_DATA             = BIT_(10)   ,  ///< 10
+  TUSB_FLAGS_CLASS_SMART_CARD           = BIT_(11)   ,  ///< 11
+  TUSB_FLAGS_CLASS_RESERVED_12          = BIT_(12)   , ///< 12
+  TUSB_FLAGS_CLASS_CONTENT_SECURITY     = BIT_(13)   ,  ///< 13
+  TUSB_FLAGS_CLASS_VIDEO                = BIT_(14)   ,  ///< 14
+  TUSB_FLAGS_CLASS_PERSONAL_HEALTHCARE  = BIT_(15)   ,  ///< 15
+  TUSB_FLAGS_CLASS_AUDIO_VIDEO          = BIT_(16)   ,  ///< 16
+  // reserved from 17 to 20
+  TUSB_FLAGS_CLASS_RESERVED_20          = BIT_(20)    , ///< 3
+
+  TUSB_FLAGS_CLASS_HID_KEYBOARD         = BIT_(21)    , ///< 3
+  TUSB_FLAGS_CLASS_HID_MOUSE            = BIT_(22)    , ///< 3
+
+  // reserved from 25 to 26
+  TUSB_FLAGS_CLASS_RESERVED_25          = BIT_(25)    , ///< 3
+  TUSB_FLAGS_CLASS_RESERVED_26          = BIT_(26)    , ///< 3
+
+  TUSB_FLAGS_CLASS_DIAGNOSTIC           = BIT_(27),
+  TUSB_FLAGS_CLASS_WIRELESS_CONTROLLER  = BIT_(28),
+  TUSB_FLAGS_CLASS_MISC                 = BIT_(29),
+  TUSB_FLAGS_CLASS_APPLICATION_SPECIFIC = BIT_(30),
+  TUSB_FLAGS_CLASS_VENDOR_SPECIFIC      = BIT_(31)
+};
+
+/// Device Status
+enum {
+  TUSB_DEVICE_STATUS_UNPLUG = 0,
+  TUSB_DEVICE_STATUS_READY = BIT_(0),
+
+  TUSB_DEVICE_STATUS_REMOVING = BIT_(2),
+  TUSB_DEVICE_STATUS_SAFE_REMOVE = BIT_(3),
+};
+
+typedef uint8_t  tusbh_device_status_t;
+typedef uint32_t tusbh_flag_class_t;
+
+typedef struct { // TODO internal structure, re-order members
+  uint8_t core_id;
+  tusb_speed_t speed;
+  uint8_t hub_addr;
+  uint8_t hub_port;
+
+  uint16_t vendor_id;
+  uint16_t product_id;
+  uint8_t configure_count;
+
+  tusbh_device_status_t status;
+  pipe_handle_t pipe_control;
+  tusb_std_request_t request_control;
+
+#if 0 // TODO allow configure for vendor/product
+  struct {
+    uint8_t interface_count;
+    uint8_t attributes;
+  } configuration;
+#endif
+
+} usbh_device_info_t;
+
+typedef enum {
+  PIPE_STATUS_AVAILABLE = 0,
+  PIPE_STATUS_BUSY,
+  PIPE_STATUS_COMPLETE
+} pipe_status_t;
+
+typedef uint32_t tusb_handle_device_t;
+
+typedef struct ATTR_ALIGNED(4){
+  uint8_t core_id;
+  uint8_t hub_addr;
+  uint8_t hub_port;
+  uint8_t connect_status;
+} usbh_enumerate_t;
+
+typedef struct {
+  usbh_enumerate_t enum_entry;
+  tusb_speed_t speed;
+  tusb_std_request_t request_packet; // needed to be on USB RAM
+} usbh_device_addr0_t;
+
+//--------------------------------------------------------------------+
+// INTERNAL OBJECT & FUNCTION DECLARATION
+//--------------------------------------------------------------------+
+
+//--------------------------------------------------------------------+
+// APPLICATION API
+//--------------------------------------------------------------------+
+void         tusbh_device_mounting_cb (tusb_error_t const error, tusb_handle_device_t const device_hdl);
+void         tusbh_device_mounted_cb (tusb_error_t const error, tusb_handle_device_t const device_hdl);
+tusb_error_t tusbh_configuration_set     (tusb_handle_device_t const device_hdl, uint8_t const configure_number) ATTR_WARN_UNUSED_RESULT;
+tusbh_device_status_t tusbh_device_status_get (tusb_handle_device_t const device_hdl) ATTR_WARN_UNUSED_RESULT;
+
+static inline void tusb_tick_tock(void) ATTR_ALWAYS_INLINE;
+static inline void tusb_tick_tock(void)
+{
+  osal_tick_tock();
+}
+
+
+//--------------------------------------------------------------------+
+// CLASS-USBD API
+//--------------------------------------------------------------------+
+#ifdef _TINY_USB_SOURCE_FILE_
+
+tusb_error_t usbh_init(void);
+pipe_status_t usbh_pipe_status_get(pipe_handle_t pipe_hdl) ATTR_WARN_UNUSED_RESULT;
+void usbh_enum_task(void);
+
+#endif
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif /* _TUSB_USBD_HOST_H_ */
+
+/** @} */
diff --git a/tinyusb/tusb.h b/tinyusb/tusb.h
index 73a49b69d..a29b36d60 100644
--- a/tinyusb/tusb.h
+++ b/tinyusb/tusb.h
@@ -51,7 +51,7 @@
 #include "common/common.h"
 
 #ifdef TUSB_CFG_HOST
-  #include "host/usbd_host.h"
+  #include "host/usbh.h"
 
   #ifdef HOST_CLASS_HID
     #include "class/hid_host.h"
-- 
cgit v1.3.1