add TUSB_CFG_HOST_ENUM_BUFFER_SIZE

add enum buffer
getting serious with osal_freeRTOS

2 files changed, 27 insertions, 20 deletions

diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
index 2d135d63f..38d96597d 100644
--- a/tinyusb/host/usbh.c
+++ b/tinyusb/host/usbh.c
@@ -74,10 +74,10 @@ tusbh_device_status_t tusbh_device_status_get (tusb_handle_device_t const device
 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_DEF(enum_queue, ENUM_QUEUE_DEPTH, uin32_t);
 osal_queue_handle_t enum_queue_hdl;
 usbh_device_addr0_t device_addr0 TUSB_CFG_ATTR_USBRAM;
-
+uint8_t enum_data_buffer[TUSB_CFG_HOST_ENUM_BUFFER_SIZE] TUSB_CFG_ATTR_USBRAM;
 void usbh_enumeration_task(void)
 {
   tusb_error_t error;
@@ -91,23 +91,29 @@ void usbh_enumeration_task(void)
   {
     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 =
+    device_addr0.speed = hcd_port_speed(device_addr0.enum_entry.core_id);
+    error = hcd_addr0_open(&device_addr0);
+    TASK_ASSERT_STATUS(error);
+
     {
-        .bmRequestType =
-        {
-            .direction = TUSB_DIR_DEV_TO_HOST,
-            .type      = TUSB_REQUEST_TYPE_STANDARD,
-            .recipient = TUSB_REQUEST_RECIPIENT_DEVICE
-        },
+      tusb_std_request_t request_device_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
+      };
+      hcd_pipe_control_xfer(device_addr0.pipe_hdl, &request_device_desc, enum_data_buffer);
+//      osal_sem_wait();
+    }
 
-        .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_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");
diff --git a/tinyusb/host/usbh_hcd.h b/tinyusb/host/usbh_hcd.h
index a861dbd6a..e30bf143b 100644
--- a/tinyusb/host/usbh_hcd.h
+++ b/tinyusb/host/usbh_hcd.h
@@ -59,6 +59,7 @@
 // INCLUDE
 //--------------------------------------------------------------------+
 #include "common/common.h"
+#include "osal/osal.h"
 #include "hcd.h"
 #include "usbh.h"
 
@@ -76,7 +77,9 @@ typedef struct {
   usbh_enumerate_t enum_entry;
   tusb_speed_t speed;
   tusb_std_request_t request_packet; // needed to be on USB RAM
-  uint8_t dev_desc[8];
+  pipe_handle_t pipe_hdl;
+  OSAL_SEM_DEF(semaphore);
+  osal_semaphore_handle_t sem_hdl;
 } usbh_device_addr0_t;
 
 typedef struct { // TODO internal structure, re-order members
@@ -106,9 +109,7 @@ typedef struct { // TODO internal structure, re-order members
 //--------------------------------------------------------------------+
 // ADDRESS 0 API
 //--------------------------------------------------------------------+
-pipe_handle_t hcd_addr0_open(usbh_device_addr0_t *dev_addr0);
-tusb_error_t  hcd_addr0_get_dev_desc(usbh_device_addr0_t *dev_addr0);
-tusb_error_t  hcd_addr0_set_addr(usbh_device_addr0_t *dev_addr0, uint8_t new_addr);
+tusb_error_t hcd_addr0_open(usbh_device_addr0_t *dev_addr0) ATTR_WARN_UNUSED_RESULT;
 
 #ifdef __cplusplus
  }