Merge pull request #89 from hathach/develop

resolve #35 (vendor class), implement #86 (webusb)

2 files changed, 10 insertions, 10 deletions

diff --git a/src/class/cdc/cdc_device.c b/src/class/cdc/cdc_device.c
index 6d13dafc0..d4952d115 100644
--- a/src/class/cdc/cdc_device.c
+++ b/src/class/cdc/cdc_device.c
@@ -300,7 +300,7 @@ bool cdcd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t
 

 // Invoked when class request DATA stage is finished.

 // return false to stall control endpoint (e.g Host send non-sense DATA)

-bool cdcd_control_request_complete(uint8_t rhport, tusb_control_request_t const * request)

+bool cdcd_control_complete(uint8_t rhport, tusb_control_request_t const * request)

 {

   (void) rhport;

 

@@ -334,11 +334,11 @@ bool cdcd_control_request(uint8_t rhport, tusb_control_request_t const * request
   switch ( request->bRequest )

   {

     case CDC_REQUEST_SET_LINE_CODING:

-      usbd_control_xfer(rhport, request, &p_cdc->line_coding, sizeof(cdc_line_coding_t));

+      tud_control_xfer(rhport, request, &p_cdc->line_coding, sizeof(cdc_line_coding_t));

     break;

 

     case CDC_REQUEST_GET_LINE_CODING:

-      usbd_control_xfer(rhport, request, &p_cdc->line_coding, sizeof(cdc_line_coding_t));

+      tud_control_xfer(rhport, request, &p_cdc->line_coding, sizeof(cdc_line_coding_t));

     break;

 

     case CDC_REQUEST_SET_CONTROL_LINE_STATE:

@@ -349,7 +349,7 @@ bool cdcd_control_request(uint8_t rhport, tusb_control_request_t const * request
       //        This signal corresponds to V.24 signal 105 and RS-232 signal RTS (Request to Send)

       p_cdc->line_state = (uint8_t) request->wValue;

 

-      usbd_control_status(rhport, request);

+      tud_control_status(rhport, request);

 

       // Invoke callback

       if ( tud_cdc_line_state_cb) tud_cdc_line_state_cb(itf, tu_bit_test(request->wValue, 0), tu_bit_test(request->wValue, 1));

diff --git a/src/class/cdc/cdc_device.h b/src/class/cdc/cdc_device.h
index 8d09094a0..f1ac08e73 100644
--- a/src/class/cdc/cdc_device.h
+++ b/src/class/cdc/cdc_device.h
@@ -176,12 +176,12 @@ static inline bool tud_cdc_write_flush (void)
 //--------------------------------------------------------------------+

 // INTERNAL USBD-CLASS DRIVER API

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

-void cdcd_init               (void);

-bool cdcd_open               (uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length);

-bool cdcd_control_request (uint8_t rhport, tusb_control_request_t const * p_request);

-bool cdcd_control_request_complete (uint8_t rhport, tusb_control_request_t const * p_request);

-bool cdcd_xfer_cb            (uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint32_t xferred_bytes);

-void cdcd_reset              (uint8_t rhport);

+void cdcd_init             (void);

+void cdcd_reset            (uint8_t rhport);

+bool cdcd_open             (uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t *p_length);

+bool cdcd_control_request  (uint8_t rhport, tusb_control_request_t const * request);

+bool cdcd_control_complete (uint8_t rhport, tusb_control_request_t const * request);

+bool cdcd_xfer_cb          (uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint32_t xferred_bytes);

 

 #ifdef __cplusplus

  }