rename to hcd_edpt_open()

9 files changed, 12 insertions, 12 deletions

diff --git a/src/class/cdc/cdc_host.c b/src/class/cdc/cdc_host.c
index 78b338f15..f889c8c90 100644
--- a/src/class/cdc/cdc_host.c
+++ b/src/class/cdc/cdc_host.c
@@ -173,7 +173,7 @@ bool cdch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *it
     // notification endpoint

     tusb_desc_endpoint_t const * ep_desc = (tusb_desc_endpoint_t const *) p_desc;

 

-    TU_ASSERT( hcd_pipe_open(rhport, dev_addr, ep_desc) );

+    TU_ASSERT( hcd_edpt_open(rhport, dev_addr, ep_desc) );

     p_cdc->ep_notif = ep_desc->bEndpointAddress;

 

     (*p_length) += p_desc[DESC_OFFSET_LEN];

@@ -194,7 +194,7 @@ bool cdch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *it
       TU_ASSERT(TUSB_DESC_ENDPOINT == ep_desc->bDescriptorType);

       TU_ASSERT(TUSB_XFER_BULK == ep_desc->bmAttributes.xfer);

 

-      TU_ASSERT(hcd_pipe_open(rhport, dev_addr, ep_desc));

+      TU_ASSERT(hcd_edpt_open(rhport, dev_addr, ep_desc));

 

       if ( edpt_dir(ep_desc->bEndpointAddress) ==  TUSB_DIR_IN )

       {

diff --git a/src/class/custom/custom_host.c b/src/class/custom/custom_host.c
index 2a8206e36..e840a2829 100644
--- a/src/class/custom/custom_host.c
+++ b/src/class/custom/custom_host.c
@@ -121,7 +121,7 @@ tusb_error_t cush_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_
 
     pipe_handle_t * p_pipe_hdl =  ( p_endpoint->bEndpointAddress &  TUSB_DIR_IN_MASK ) ?
                          &custom_interface[dev_addr-1].pipe_in : &custom_interface[dev_addr-1].pipe_out;
-    *p_pipe_hdl = hcd_pipe_open(dev_addr, p_endpoint, TUSB_CLASS_VENDOR_SPECIFIC);
+    *p_pipe_hdl = hcd_edpt_open(dev_addr, p_endpoint, TUSB_CLASS_VENDOR_SPECIFIC);
     TU_ASSERT ( pipehandle_is_valid(*p_pipe_hdl), TUSB_ERROR_HCD_OPEN_PIPE_FAILED );
 
     p_desc = descriptor_next(p_desc);
diff --git a/src/class/hid/hid_host.c b/src/class/hid/hid_host.c
index 980381bf5..8d7dce70a 100644
--- a/src/class/hid/hid_host.c
+++ b/src/class/hid/hid_host.c
@@ -56,7 +56,7 @@
 //--------------------------------------------------------------------+

 static inline bool hidh_interface_open(uint8_t dev_addr, uint8_t interface_number, tusb_desc_endpoint_t const *p_endpoint_desc, hidh_interface_info_t *p_hid)

 {

-  p_hid->pipe_hdl         = hcd_pipe_open(dev_addr, p_endpoint_desc, TUSB_CLASS_HID);

+  p_hid->pipe_hdl         = hcd_edpt_open(dev_addr, p_endpoint_desc, TUSB_CLASS_HID);

   p_hid->report_size      = p_endpoint_desc->wMaxPacketSize.size; // TODO get size from report descriptor

   p_hid->interface_number = interface_number;

 

diff --git a/src/class/msc/msc_host.c b/src/class/msc/msc_host.c
index 1053d42d2..8e51debcf 100644
--- a/src/class/msc/msc_host.c
+++ b/src/class/msc/msc_host.c
@@ -307,7 +307,7 @@ bool msch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *it
     TU_ASSERT(TUSB_DESC_ENDPOINT == ep_desc->bDescriptorType);

     TU_ASSERT(TUSB_XFER_BULK == ep_desc->bmAttributes.xfer);

 

-    TU_ASSERT(hcd_pipe_open(rhport, dev_addr, ep_desc));

+    TU_ASSERT(hcd_edpt_open(rhport, dev_addr, ep_desc));

 

     if ( edpt_dir(ep_desc->bEndpointAddress) ==  TUSB_DIR_IN )

     {

diff --git a/src/host/ehci/ehci.c b/src/host/ehci/ehci.c
index ce74476bb..94796c9dd 100644
--- a/src/host/ehci/ehci.c
+++ b/src/host/ehci/ehci.c
@@ -313,7 +313,7 @@ bool hcd_setup_send(uint8_t rhport, uint8_t dev_addr, uint8_t const setup_packet
 //--------------------------------------------------------------------+

 // BULK/INT/ISO PIPE API

 //--------------------------------------------------------------------+

-bool hcd_pipe_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_endpoint_t const * ep_desc)

+bool hcd_edpt_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_endpoint_t const * ep_desc)

 {

   // TODO not support ISO yet

   TU_ASSERT (ep_desc->bmAttributes.xfer != TUSB_XFER_ISOCHRONOUS);

diff --git a/src/host/hcd.h b/src/host/hcd.h
index dcc2bdf53..9b7b99321 100644
--- a/src/host/hcd.h
+++ b/src/host/hcd.h
@@ -128,15 +128,15 @@ void hcd_event_xfer_complete(uint8_t dev_addr, uint8_t ep_addr, xfer_result_t ev
 //--------------------------------------------------------------------+

 // Endpoints API

 //--------------------------------------------------------------------+

-bool hcd_edpt_close(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr);

 bool hcd_setup_send(uint8_t rhport, uint8_t dev_addr, uint8_t const setup_packet[8]);

-bool hcd_edpt_xfer(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr, uint8_t * buffer, uint16_t buflen);

+bool hcd_edpt_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_endpoint_t const * ep_desc);

 

+bool hcd_edpt_close(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr);

+bool hcd_edpt_xfer(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr, uint8_t * buffer, uint16_t buflen);

 //--------------------------------------------------------------------+

 // PIPE API

 //--------------------------------------------------------------------+

 // TODO control xfer should be used via usbh layer

-bool hcd_pipe_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_endpoint_t const * ep_desc);

 bool hcd_pipe_queue_xfer(uint8_t dev_addr, uint8_t ep_addr, uint8_t buffer[], uint16_t total_bytes); // only queue, not transferring yet

 bool hcd_pipe_xfer(uint8_t dev_addr, uint8_t ep_addr, uint8_t buffer[], uint16_t total_bytes, bool int_on_complete);

 bool hcd_pipe_close(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr); // TODO remove

diff --git a/src/host/hub.c b/src/host/hub.c
index f755928e8..411e1ae95 100644
--- a/src/host/hub.c
+++ b/src/host/hub.c
@@ -168,7 +168,7 @@ bool hub_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *p_i
   TU_ASSERT(TUSB_DESC_ENDPOINT == ep_desc->bDescriptorType);

   TU_ASSERT(TUSB_XFER_INTERRUPT == ep_desc->bmAttributes.xfer);

   

-  TU_ASSERT(hcd_pipe_open(rhport, dev_addr, ep_desc));

+  TU_ASSERT(hcd_edpt_open(rhport, dev_addr, ep_desc));

 

   hub_data[dev_addr-1].itf_num = p_interface_desc->bInterfaceNumber;

   hub_data[dev_addr-1].ep_status = ep_desc->bEndpointAddress;

diff --git a/src/host/ohci/ohci.c b/src/host/ohci/ohci.c
index 5923be936..37de86c60 100644
--- a/src/host/ohci/ohci.c
+++ b/src/host/ohci/ohci.c
@@ -481,7 +481,7 @@ static void ed_list_remove(ohci_ed_t * p_head, ohci_ed_t * p_ed)
   p_ed->used      = 0; // free ED

 }

 

-pipe_handle_t hcd_pipe_open(uint8_t dev_addr, tusb_desc_endpoint_t const * p_endpoint_desc, uint8_t class_code)

+pipe_handle_t hcd_edpt_open(uint8_t dev_addr, tusb_desc_endpoint_t const * p_endpoint_desc, uint8_t class_code)

 {

   pipe_handle_t const null_handle = { .dev_addr = 0, .xfer_type = 0, .index = 0 };

 

diff --git a/src/host/usbh.c b/src/host/usbh.c
index 3ab3bd71e..ff4343fd2 100644
--- a/src/host/usbh.c
+++ b/src/host/usbh.c
@@ -236,7 +236,7 @@ tusb_error_t usbh_pipe_control_open(uint8_t dev_addr, uint8_t max_packet_size)
     .bInterval        = 0

   };

 

-  hcd_pipe_open(_usbh_devices[dev_addr].rhport, dev_addr, &ep0_desc);

+  hcd_edpt_open(_usbh_devices[dev_addr].rhport, dev_addr, &ep0_desc);

 

   return TUSB_ERROR_NONE;

 }