refine ASSERT_DEFINE to allow special error_handler for os task

add device_addr0 for enumeration task
start to add osal port for freeRTOS

3 files changed, 41 insertions, 27 deletions

diff --git a/tinyusb/host/hcd.h b/tinyusb/host/hcd.h
index d62c9290c..476170b74 100644
--- a/tinyusb/host/hcd.h
+++ b/tinyusb/host/hcd.h
@@ -56,6 +56,7 @@
 #endif
 
 #include "common/common.h"
+//#include "usbd_host.h"
 
 typedef uint32_t pipe_handle_t;
 
@@ -65,11 +66,12 @@ tusb_error_t hcd_init(uint8_t hostid) ATTR_WARN_UNUSED_RESULT;
 //--------------------------------------------------------------------+
 // PIPE API
 //--------------------------------------------------------------------+
+//pipe_handle_t hcd_pipe_addr0_open(usbh_device_addr0_t const * dev_addr0);
 pipe_handle_t hcd_pipe_addr0_open(uint8_t core_id, tusb_speed_t speed, uint8_t hub_addr, uint8_t hub_port);
 
 pipe_handle_t hcd_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size);
-tusb_error_t  hcd_pipe_control_xfer(pipe_handle_t pipe_hdl, const tusb_std_request_t * const p_request, uint8_t data[]);
-pipe_handle_t hcd_pipe_open(uint8_t dev_addr, tusb_descriptor_endpoint_t* endpoint_desc);
+tusb_error_t  hcd_pipe_control_xfer(pipe_handle_t pipe_hdl, tusb_std_request_t const * p_request, uint8_t data[]);
+pipe_handle_t hcd_pipe_open(uint8_t dev_addr, tusb_descriptor_endpoint_t const * endpoint_desc);
 
 #if 0
 //tusb_error_t hcd_pipe_open(
diff --git a/tinyusb/host/usbd_host.c b/tinyusb/host/usbd_host.c
index b8445d2b8..293d8dbbd 100644
--- a/tinyusb/host/usbd_host.c
+++ b/tinyusb/host/usbd_host.c
@@ -56,11 +56,6 @@
 //--------------------------------------------------------------------+
 // INTERNAL OBJECT & FUNCTION DECLARATION
 //--------------------------------------------------------------------+
-struct {
-  tusb_speed_t speed;
-  uint8_t hub_addr;
-  uint8_t hub_port;
-} usbh_device_addr0[TUSB_CFG_HOST_CONTROLLER_NUM];
 
 STATIC_ usbh_device_info_t device_info_pool[TUSB_CFG_HOST_DEVICE_MAX];
 
@@ -81,39 +76,38 @@ 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)
 {
-  usbh_enumerate_t enum_item;
   tusb_error_t error;
 
   OSAL_TASK_LOOP_BEGIN
 
-  osal_queue_receive(enum_queue_hdl, (uint32_t*)&enum_item, OSAL_TIMEOUT_NORMAL, &error);
+  osal_queue_receive(enum_queue_hdl, (uint32_t*)(&device_addr0.enum_entry), OSAL_TIMEOUT_NORMAL, &error);
   TASK_ASSERT_STATUS(error);
 
-  if (enum_item.hub_address == 0) // direct connection
+  if (device_addr0.enum_entry.hub_addr == 0) // direct connection
   {
-    if ( enum_item.connect_status == hcd_port_connect_status(enum_item.core_id) ) // there chances the event is out-dated
+    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 =
     {
-      tusb_std_request_t request_dev_desc =
-      {
-          .bmRequestType =
-          {
-              .direction = TUSB_DIR_DEV_TO_HOST,
-              .type      = TUSB_REQUEST_TYPE_STANDARD,
-              .recipient = TUSB_REQUEST_RECIPIENT_DEVICE
-          },
+        .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
-      };
-      tusb_speed_t speed = hcd_port_speed(enum_item.core_id);
-      pipe_handle_t pipe_addr0 = hcd_pipe_addr0_open(enum_item.core_id, speed, enum_item.hub_address, enum_item.hub_port);
+        .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");
@@ -123,6 +117,11 @@ void usbh_enumeration_task(void)
 }
 
 //--------------------------------------------------------------------+
+// REPORTER TASK & ITS DATA
+//--------------------------------------------------------------------+
+
+
+//--------------------------------------------------------------------+
 // CLASS-USBD API (don't require to verify parameters)
 //--------------------------------------------------------------------+
 tusb_error_t usbh_init(void)
diff --git a/tinyusb/host/usbd_host.h b/tinyusb/host/usbd_host.h
index 9c02378dd..12e7df48d 100644
--- a/tinyusb/host/usbd_host.h
+++ b/tinyusb/host/usbd_host.h
@@ -58,6 +58,7 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
+#include "common/common.h"
 #include "hcd.h"
 
 //--------------------------------------------------------------------+
@@ -143,11 +144,17 @@ typedef uint32_t tusb_handle_device_t;
 
 typedef struct ATTR_ALIGNED(4){
   uint8_t core_id;
-  uint8_t hub_address;
+  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
 //--------------------------------------------------------------------+
@@ -160,6 +167,12 @@ void         tusbh_device_mounted_cb (tusb_error_t const error, tusb_handle_devi
 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