add test & code for open bulk transfer to hcd_pipe_open()

5 files changed, 70 insertions, 15 deletions

diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c
index fb4f4d230..2f3107a35 100644
--- a/tinyusb/class/hid_host.c
+++ b/tinyusb/class/hid_host.c
@@ -71,7 +71,7 @@ tusb_error_t tusbh_hid_keyboard_get(tusb_handle_device_t const device_hdl, uint8
 
   p_kbd = &keyboard_info_pool[device_hdl].instance[instance_num];
 
-  ASSERT(0 != p_kbd->pipe_in, TUSB_ERROR_CLASS_DEVICE_DONT_SUPPORT);
+  ASSERT(0 != p_kbd->pipe_in.dev_addr, TUSB_ERROR_CLASS_DEVICE_DONT_SUPPORT);
 
   ASSERT_INT(PIPE_STATUS_COMPLETE, usbh_pipe_status_get(p_kbd->pipe_in), TUSB_ERROR_CLASS_DATA_NOT_AVAILABLE);
 
diff --git a/tinyusb/core/tusb_types.h b/tinyusb/core/tusb_types.h
index a6864cbf4..d35c3f645 100644
--- a/tinyusb/core/tusb_types.h
+++ b/tinyusb/core/tusb_types.h
@@ -73,13 +73,6 @@ typedef enum {
   TUSB_DIR_DEV_TO_HOST = 1
 }tusb_direction_t;
 
-/// TBD
-typedef enum {
-  TUSB_PID_SETUP,
-  TUSB_PID_IN,
-  TUSB_PID_OUT
-}tusb_pid_t;
-
 /// USB Descriptor Types (section 9.4 table 9-5)
 typedef enum {
   TUSB_DESC_DEVICE =1                 , ///< 1
diff --git a/tinyusb/host/ehci/ehci.c b/tinyusb/host/ehci/ehci.c
index a5a5fe4db..799e952d1 100644
--- a/tinyusb/host/ehci/ehci.c
+++ b/tinyusb/host/ehci/ehci.c
@@ -262,7 +262,7 @@ tusb_error_t  hcd_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size)
   }else
   {
     p_qhd = &ehci_data.device[dev_addr].control.qhd;
-    p_qhd->head_list_flag      = 0; // make sure it is still head of list
+    p_qhd->head_list_flag      = 0;
   }
 
   p_qhd->device_address      = dev_addr;
@@ -308,9 +308,60 @@ tusb_error_t  hcd_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size)
 //}
 //
 
-pipe_handle_t hcd_pipe_open(uint8_t dev_addr, tusb_descriptor_endpoint_t const * endpoint_desc)
+pipe_handle_t hcd_pipe_open(uint8_t dev_addr, tusb_descriptor_endpoint_t const * p_endpoint_desc)
 {
-  return TUSB_ERROR_NONE;
+  pipe_handle_t const null_handle = { .dev_addr = 0, .xfer_type = 0, .index = 0 };
+
+  if (p_endpoint_desc->bmAttributes.xfer == TUSB_XFER_BULK)
+  {
+    uint8_t index=0;
+    while( index<EHCI_MAX_QHD && ehci_data.device[dev_addr].qhd[index].used )
+    {
+      index++;
+    }
+
+    ASSERT( index < EHCI_MAX_QHD, null_handle);
+
+    ehci_qhd_t * const p_qhd = &ehci_data.device[dev_addr].qhd[index];
+    memclr_(p_qhd, sizeof(ehci_qhd_t));
+
+    p_qhd->device_address          = dev_addr;
+    p_qhd->inactive_next_xact      = 0;
+    p_qhd->endpoint_number         = p_endpoint_desc->bEndpointAddress & 0x0F;
+    p_qhd->endpoint_speed          = usbh_device_info_pool[dev_addr].speed;
+    p_qhd->data_toggle_control     = 0;
+    p_qhd->head_list_flag          = 0;
+    p_qhd->max_package_size        = p_endpoint_desc->wMaxPacketSize;
+    p_qhd->non_hs_control_endpoint = 0;
+    p_qhd->nak_count_reload        = 0;
+
+    p_qhd->smask                   = 0;
+    p_qhd->cmask                   = 0;
+    p_qhd->hub_address             = usbh_device_info_pool[dev_addr].hub_addr;
+    p_qhd->hub_port                = usbh_device_info_pool[dev_addr].hub_port;
+    p_qhd->mult                    = 1; // TODO not use high bandwidth/park mode yet
+
+    //------------- inactive when just opened -------------//
+    p_qhd->qtd_overlay.next.terminate      = 1;
+    p_qhd->qtd_overlay.alternate.terminate = 1;
+    p_qhd->qtd_overlay.halted              = 1;
+
+    //------------- HCD Management Data -------------//
+    p_qhd->used            = 1;
+    p_qhd->p_qtd_list      = NULL;
+    p_qhd->pid_non_control = (p_endpoint_desc->bEndpointAddress & 0x80) ? EHCI_PID_IN : EHCI_PID_OUT; // PID for TD under this endpoint
+
+    //------------- insert to async list -------------//
+    // TODO disable async list first if got error
+    ehci_qhd_t * const async_head = get_async_head(usbh_device_info_pool[dev_addr].core_id);
+    p_qhd->next = async_head->next;
+    async_head->next.address = (uint32_t) p_qhd;
+    async_head->next.type = EHCI_QUEUE_ELEMENT_QHD;
+
+    return (pipe_handle_t) { .dev_addr = dev_addr, .xfer_type = p_endpoint_desc->bmAttributes.xfer, .index = index};
+  }
+
+  return null_handle;
 }
 
 #endif
diff --git a/tinyusb/host/ehci/ehci.h b/tinyusb/host/ehci/ehci.h
index 7b41bdc66..74099c15d 100644
--- a/tinyusb/host/ehci/ehci.h
+++ b/tinyusb/host/ehci/ehci.h
@@ -101,6 +101,13 @@ enum ehci_queue_element_type_{
   EHCI_QUEUE_ELEMENT_FSTN      ///< 3
 };
 
+/// TBD
+enum tusb_pid_{
+  EHCI_PID_OUT = 0 ,
+  EHCI_PID_IN      ,
+  EHCI_PID_SETUP
+};
+
 /// Link pointer
 typedef union {
 	uint32_t address;
@@ -189,8 +196,9 @@ typedef struct {
 	/// Due to the fact QHD is 32 bytes aligned but occupies only 48 bytes
 	/// thus there are 16 bytes padding free that we can make use of.
 	uint8_t used;
+	uint8_t pid_non_control;
 	uint8_t list_index;
-	uint8_t reserved[2];
+	uint8_t reserved;
 
 	ehci_qtd_t *p_qtd_list;	/* used as TD head to clean up TD chain when transfer done */ // TODO consider using ehci_link_t (terminate bit)
 
@@ -427,7 +435,6 @@ typedef volatile struct {
 // EHCI Data Organization
 //--------------------------------------------------------------------+
 typedef struct {
-//  ehci_itd_t  itd[EHCI_MAX_ITD]   ; ///< Iso Transfer Pool
 
   struct {
     ehci_qhd_t async_head[CONTROLLER_HOST_NUMBER]; /// head qhd of async list, also is used as control endpoint for address 0
@@ -436,6 +443,7 @@ typedef struct {
   }controller; ///< Static Interrupt Queue Head
 
   struct {
+//  ehci_itd_t  itd[EHCI_MAX_ITD]   ; ///< Iso Transfer Pool
     struct {
       ehci_qhd_t qhd;
       ehci_qtd_t qtd[3];
diff --git a/tinyusb/host/hcd.h b/tinyusb/host/hcd.h
index c6c511e09..d180d1c58 100644
--- a/tinyusb/host/hcd.h
+++ b/tinyusb/host/hcd.h
@@ -60,8 +60,11 @@
 //--------------------------------------------------------------------+
 // MACRO CONSTANT TYPEDEF
 //--------------------------------------------------------------------+
-typedef uint32_t pipe_handle_t;
-
+typedef struct {
+  uint8_t dev_addr;
+  uint8_t xfer_type;
+  uint8_t index;
+} pipe_handle_t;
 
 //--------------------------------------------------------------------+
 // USBH-HCD API