adding optional ep out for hid

refactor usbd_open_edpt_pair

5 files changed, 21 insertions, 29 deletions

diff --git a/src/class/cdc/cdc_device.c b/src/class/cdc/cdc_device.c
index c194aacd8..5e0f4e3f7 100644
--- a/src/class/cdc/cdc_device.c
+++ b/src/class/cdc/cdc_device.c
@@ -289,14 +289,12 @@ bool cdcd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t
        (TUSB_CLASS_CDC_DATA == ((tusb_desc_interface_t const *) p_desc)->bInterfaceClass) )

   {

     // next to endpoint descriptor

-    (*p_length) += tu_desc_len(p_desc);

     p_desc = tu_desc_next(p_desc);

 

-    // Open endpoint pair with usbd helper

-    tusb_desc_endpoint_t const *p_desc_ep = (tusb_desc_endpoint_t const *) p_desc;

-    TU_ASSERT( usbd_open_edpt_pair(rhport, p_desc_ep, TUSB_XFER_BULK, &p_cdc->ep_out, &p_cdc->ep_in) );

+    // Open endpoint pair

+    TU_ASSERT( usbd_open_edpt_pair(rhport, p_desc, 2, TUSB_XFER_BULK, &p_cdc->ep_out, &p_cdc->ep_in) );

 

-    (*p_length) += 2*sizeof(tusb_desc_endpoint_t);

+    (*p_length) += sizeof(tusb_desc_interface_t) + 2*sizeof(tusb_desc_endpoint_t);

   }

 

   // Prepare for incoming data

diff --git a/src/class/hid/hid_device.c b/src/class/hid/hid_device.c
index b1a4efe9a..87b1b2c7b 100644
--- a/src/class/hid/hid_device.c
+++ b/src/class/hid/hid_device.c
@@ -160,6 +160,10 @@ bool hidd_open(uint8_t rhport, tusb_desc_interface_t const * desc_itf, uint16_t
 {

   uint8_t const *p_desc = (uint8_t const *) desc_itf;

 

+  // TODO support multiple HID interface

+  uint8_t itf = 0;

+  hidd_interface_t * p_hid = &_hidd_itf[itf];

+

   //------------- HID descriptor -------------//

   p_desc = tu_desc_next(p_desc);

   tusb_hid_descriptor_hid_t const *desc_hid = (tusb_hid_descriptor_hid_t const *) p_desc;

@@ -167,20 +171,12 @@ bool hidd_open(uint8_t rhport, tusb_desc_interface_t const * desc_itf, uint16_t
 

   //------------- Endpoint Descriptor -------------//

   p_desc = tu_desc_next(p_desc);

-  tusb_desc_endpoint_t const *desc_edpt = (tusb_desc_endpoint_t const *) p_desc;

-  TU_ASSERT(TUSB_DESC_ENDPOINT == desc_edpt->bDescriptorType);

-

-  TU_ASSERT(dcd_edpt_open(rhport, desc_edpt));

-

-  // TODO support multiple HID interface

-  uint8_t itf = 0;

-  hidd_interface_t * p_hid = &_hidd_itf[itf];

+  TU_ASSERT(usbd_open_edpt_pair(rhport, p_desc, desc_itf->bNumEndpoints, TUSB_XFER_INTERRUPT, &p_hid->ep_out, &p_hid->ep_in));

 

   if ( desc_itf->bInterfaceSubClass == HID_SUBCLASS_BOOT ) p_hid->boot_protocol = desc_itf->bInterfaceProtocol;

 

   p_hid->boot_mode = false; // default mode is REPORT

   p_hid->itf_num   = desc_itf->bInterfaceNumber;

-  p_hid->ep_in     = desc_edpt->bEndpointAddress;

   p_hid->reprot_desc_len  = desc_hid->wReportLength;

 

   *p_len = sizeof(tusb_desc_interface_t) + sizeof(tusb_hid_descriptor_hid_t) + desc_itf->bNumEndpoints*sizeof(tusb_desc_endpoint_t);

diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index 360503d9b..1d5a3fc26 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -135,9 +135,8 @@ bool mscd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t
 

   mscd_interface_t * p_msc = &_mscd_itf;

 

-  // Open endpoint pair with usbd helper

-  tusb_desc_endpoint_t const *p_desc_ep = (tusb_desc_endpoint_t const *) tu_desc_next( itf_desc );

-  TU_ASSERT( usbd_open_edpt_pair(rhport, p_desc_ep, TUSB_XFER_BULK, &p_msc->ep_out, &p_msc->ep_in) );

+  // Open endpoint pair

+  TU_ASSERT( usbd_open_edpt_pair(rhport, tu_desc_next(itf_desc), 2, TUSB_XFER_BULK, &p_msc->ep_out, &p_msc->ep_in) );

 

   p_msc->itf_num = itf_desc->bInterfaceNumber;

   (*p_len) = sizeof(tusb_desc_interface_t) + 2*sizeof(tusb_desc_endpoint_t);

diff --git a/src/device/usbd.c b/src/device/usbd.c
index f02b21208..d811c471a 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -702,25 +702,25 @@ void dcd_event_xfer_complete (uint8_t rhport, uint8_t ep_addr, uint32_t xferred_
 // Helper

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

 

-// Helper to parse an pair of endpoint descriptors (IN & OUT)

-bool usbd_open_edpt_pair(uint8_t rhport, tusb_desc_endpoint_t const* ep_desc, uint8_t xfer_type, uint8_t* ep_out, uint8_t* ep_in)

+// Parse consecutive endpoint descriptors (IN & OUT)

+bool usbd_open_edpt_pair(uint8_t rhport, uint8_t const* p_desc, uint8_t ep_count, uint8_t xfer_type, uint8_t* ep_out, uint8_t* ep_in)

 {

-  for(int i=0; i<2; i++)

+  for(int i=0; i<ep_count; i++)

   {

-    TU_ASSERT(TUSB_DESC_ENDPOINT == ep_desc->bDescriptorType &&

-              xfer_type          == ep_desc->bmAttributes.xfer );

+    tusb_desc_endpoint_t const * desc_ep = (tusb_desc_endpoint_t const *) p_desc;

 

-    TU_ASSERT(dcd_edpt_open(rhport, ep_desc));

+    TU_VERIFY(TUSB_DESC_ENDPOINT == desc_ep->bDescriptorType && xfer_type == desc_ep->bmAttributes.xfer);

+    TU_ASSERT(dcd_edpt_open(rhport, desc_ep));

 

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

+    if ( tu_edpt_dir(desc_ep->bEndpointAddress) == TUSB_DIR_IN )

     {

-      (*ep_in) = ep_desc->bEndpointAddress;

+      (*ep_in) = desc_ep->bEndpointAddress;

     }else

     {

-      (*ep_out) = ep_desc->bEndpointAddress;

+      (*ep_out) = desc_ep->bEndpointAddress;

     }

 

-    ep_desc = (tusb_desc_endpoint_t const *) tu_desc_next(ep_desc);

+    p_desc = tu_desc_next(p_desc);

   }

 

   return true;

diff --git a/src/device/usbd_pvt.h b/src/device/usbd_pvt.h
index 8518ee209..fb3672359 100644
--- a/src/device/usbd_pvt.h
+++ b/src/device/usbd_pvt.h
@@ -53,9 +53,8 @@ bool usbd_edpt_stalled(uint8_t rhport, uint8_t ep_addr);
 /*------------------------------------------------------------------*/
 /* Helper
  *------------------------------------------------------------------*/
-// helper to parse an pair of In and Out endpoint descriptors. They must be consecutive
-bool usbd_open_edpt_pair(uint8_t rhport, tusb_desc_endpoint_t const* p_desc_ep, uint8_t xfer_type, uint8_t* ep_out, uint8_t* ep_in);
 
+bool usbd_open_edpt_pair(uint8_t rhport, uint8_t const* p_desc, uint8_t ep_count, uint8_t xfer_type, uint8_t* ep_out, uint8_t* ep_in);
 void usbd_defer_func( osal_task_func_t func, void* param, bool in_isr );