Merge pull request #61 from hathach/develop

enhance HID, add HID out endpoint support

2 files changed, 12 insertions, 6 deletions

diff --git a/src/class/cdc/cdc_device.c b/src/class/cdc/cdc_device.c
index c194aacd8..7a0380e6b 100644
--- a/src/class/cdc/cdc_device.c
+++ b/src/class/cdc/cdc_device.c
@@ -71,7 +71,7 @@ typedef struct
 //--------------------------------------------------------------------+

 // INTERNAL OBJECT & FUNCTION DECLARATION

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

-CFG_TUSB_MEM_SECTION static cdcd_interface_t _cdcd_itf[CFG_TUD_CDC] = { { 0 } };

+CFG_TUSB_MEM_SECTION static cdcd_interface_t _cdcd_itf[CFG_TUD_CDC];

 

 // TODO will be replaced by dcd_edpt_busy()

 bool pending_read_from_host;

@@ -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/cdc/cdc_device.h b/src/class/cdc/cdc_device.h
index 6c59bac7a..18d6f842f 100644
--- a/src/class/cdc/cdc_device.h
+++ b/src/class/cdc/cdc_device.h
@@ -89,9 +89,17 @@ static inline bool     tud_cdc_write_flush     (void)
 //--------------------------------------------------------------------+

 // APPLICATION CALLBACK API (WEAK is optional)

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

+

+// Invoked when received new data

 ATTR_WEAK void tud_cdc_rx_cb(uint8_t itf);

+

+// Invoked when received `wanted_char`

 ATTR_WEAK void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char);

+

+// Invoked when line state DTR & RTS are changed via SET_CONTROL_LINE_STATE

 ATTR_WEAK void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts);

+

+// Invoked when line coding is change via SET_LINE_CODING

 ATTR_WEAK void tud_cdc_line_coding_cb(uint8_t itf, cdc_line_coding_t const* p_line_coding);

 

 /** @} */