add tud_control_vendor_request_cb()/tud_control_vendor_complete_cb(), expose usbd control transfer

rename usbd_control_transfer/status to tud_control_transfer/status

3 files changed, 12 insertions, 12 deletions

diff --git a/src/class/cdc/cdc_device.c b/src/class/cdc/cdc_device.c
index 874f751af..d4952d115 100644
--- a/src/class/cdc/cdc_device.c
+++ b/src/class/cdc/cdc_device.c
@@ -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/hid/hid_device.c b/src/class/hid/hid_device.c
index 54ba39643..949fd183d 100644
--- a/src/class/hid/hid_device.c
+++ b/src/class/hid/hid_device.c
@@ -205,7 +205,7 @@ bool hidd_control_request(uint8_t rhport, tusb_control_request_t const * p_reque
     if (p_request->bRequest == TUSB_REQ_GET_DESCRIPTOR && desc_type == HID_DESC_TYPE_REPORT)

     {

       uint8_t const * desc_report = tud_hid_descriptor_report_cb();

-      usbd_control_xfer(rhport, p_request, (void*) desc_report, p_hid->reprot_desc_len);

+      tud_control_xfer(rhport, p_request, (void*) desc_report, p_hid->reprot_desc_len);

     }else

     {

       return false; // stall unsupported request

@@ -225,12 +225,12 @@ bool hidd_control_request(uint8_t rhport, tusb_control_request_t const * p_reque
         uint16_t xferlen  = tud_hid_get_report_cb(report_id, (hid_report_type_t) report_type, p_hid->epin_buf, p_request->wLength);

         TU_ASSERT( xferlen > 0 );

 

-        usbd_control_xfer(rhport, p_request, p_hid->epin_buf, xferlen);

+        tud_control_xfer(rhport, p_request, p_hid->epin_buf, xferlen);

       }

       break;

 

       case  HID_REQ_CONTROL_SET_REPORT:

-        usbd_control_xfer(rhport, p_request, p_hid->epout_buf, p_request->wLength);

+        tud_control_xfer(rhport, p_request, p_hid->epout_buf, p_request->wLength);

       break;

 

       case HID_REQ_CONTROL_SET_IDLE:

@@ -241,18 +241,18 @@ bool hidd_control_request(uint8_t rhport, tusb_control_request_t const * p_reque
           if ( !tud_hid_set_idle_cb(p_hid->idle_rate) ) return false;

         }

 

-        usbd_control_status(rhport, p_request);

+        tud_control_status(rhport, p_request);

       break;

 

       case HID_REQ_CONTROL_GET_IDLE:

         // TODO idle rate of report

-        usbd_control_xfer(rhport, p_request, &p_hid->idle_rate, 1);

+        tud_control_xfer(rhport, p_request, &p_hid->idle_rate, 1);

       break;

 

       case HID_REQ_CONTROL_GET_PROTOCOL:

       {

         uint8_t protocol = 1-p_hid->boot_mode;   // 0 is Boot, 1 is Report protocol

-        usbd_control_xfer(rhport, p_request, &protocol, 1);

+        tud_control_xfer(rhport, p_request, &protocol, 1);

       }

       break;

 

@@ -261,7 +261,7 @@ bool hidd_control_request(uint8_t rhport, tusb_control_request_t const * p_reque
 

         if (tud_hid_boot_mode_cb) tud_hid_boot_mode_cb(p_hid->boot_mode);

 

-        usbd_control_status(rhport, p_request);

+        tud_control_status(rhport, p_request);

       break;

 

       default: return false; // stall unsupported request

diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index 86e47ead0..ebc2af1d5 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -154,7 +154,7 @@ bool mscd_control_request(uint8_t rhport, tusb_control_request_t const * p_reque
   {

     case MSC_REQ_RESET:

       // TODO: Actually reset interface.

-      usbd_control_status(rhport, p_request);

+      tud_control_status(rhport, p_request);

     break;

 

     case MSC_REQ_GET_MAX_LUN:

@@ -166,7 +166,7 @@ bool mscd_control_request(uint8_t rhport, tusb_control_request_t const * p_reque
       // MAX LUN is minus 1 by specs

       maxlun--;

 

-      usbd_control_xfer(rhport, p_request, &maxlun, 1);

+      tud_control_xfer(rhport, p_request, &maxlun, 1);

     }

     break;