resolve conflict between usbh & hcd

4 files changed, 13 insertions, 15 deletions

diff --git a/tinyusb/host/hcd.h b/tinyusb/host/hcd.h
index d4c288223..db16ce869 100644
--- a/tinyusb/host/hcd.h
+++ b/tinyusb/host/hcd.h
@@ -56,12 +56,11 @@
 #endif
 
 #include "common/common.h"
-#include "usbh_hcd.h"
 
 //--------------------------------------------------------------------+
 // MACRO CONSTANT TYPEDEF
 //--------------------------------------------------------------------+
-
+typedef uint32_t pipe_handle_t;
 
 
 //--------------------------------------------------------------------+
@@ -72,7 +71,6 @@ 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_control_open(uint8_t dev_addr, uint8_t max_packet_size);
 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);
diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
index 594a8c12d..2d135d63f 100644
--- a/tinyusb/host/usbh.c
+++ b/tinyusb/host/usbh.c
@@ -45,8 +45,8 @@
 // INCLUDE
 //--------------------------------------------------------------------+
 #include "common/common.h"
-#include "usbh.h"
 #include "osal/osal.h"
+#include "usbh_hcd.h"
 
 //--------------------------------------------------------------------+
 // MACRO CONSTANT TYPEDEF
@@ -105,9 +105,9 @@ void usbh_enumeration_task(void)
         .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);
+    pipe_handle_t pipe_addr0 = hcd_addr0_open(&device_addr0);
 
-      //        hcd_pipe_control_xfer(pipe_addr0, &request_dev_desc)
+//    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.h b/tinyusb/host/usbh.h
index cb71d2725..9aa447d58 100644
--- a/tinyusb/host/usbh.h
+++ b/tinyusb/host/usbh.h
@@ -59,7 +59,6 @@
 // INCLUDE
 //--------------------------------------------------------------------+
 #include "common/common.h"
-#include "usbh_hcd.h"
 #include "hcd.h"
 
 //--------------------------------------------------------------------+
@@ -117,6 +116,7 @@ typedef enum {
 
 typedef uint32_t tusbh_flag_class_t;
 typedef uint32_t tusb_handle_device_t;
+typedef uint8_t  tusbh_device_status_t;
 
 //--------------------------------------------------------------------+
 // INTERNAL OBJECT & FUNCTION DECLARATION
diff --git a/tinyusb/host/usbh_hcd.h b/tinyusb/host/usbh_hcd.h
index 923e5c3d9..a861dbd6a 100644
--- a/tinyusb/host/usbh_hcd.h
+++ b/tinyusb/host/usbh_hcd.h
@@ -59,13 +59,12 @@
 // INCLUDE
 //--------------------------------------------------------------------+
 #include "common/common.h"
+#include "hcd.h"
+#include "usbh.h"
 
 //--------------------------------------------------------------------+
 // USBH
 //--------------------------------------------------------------------+
-typedef uint8_t  tusbh_device_status_t;
-typedef uint32_t pipe_handle_t;
-
 typedef struct ATTR_ALIGNED(4){
   uint8_t core_id;
   uint8_t hub_addr;
@@ -77,6 +76,7 @@ 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];
 } usbh_device_addr0_t;
 
 typedef struct { // TODO internal structure, re-order members
@@ -90,6 +90,7 @@ typedef struct { // TODO internal structure, re-order members
   uint8_t configure_count;
 
   tusbh_device_status_t status;
+
   pipe_handle_t pipe_control;
   tusb_std_request_t request_control;
 
@@ -103,12 +104,11 @@ typedef struct { // TODO internal structure, re-order members
 } usbh_device_info_t;
 
 //--------------------------------------------------------------------+
-// HCD
-//--------------------------------------------------------------------+
-
-//--------------------------------------------------------------------+
-// IMPLEMENTATION
+// 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);
 
 #ifdef __cplusplus
  }