andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rename tud_control_vendor_request_cb/complete_cb to tud_vendor_control_request_cb/complete_cb

Browse Source
This commit is contained in:
hathach
2019-07-24 09:45:32 +07:00
parent 8fad8fb5c2
commit c63f2b30cb
9 changed files with 62 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/device/usbd.c
View File

@@ -136,8 +136,8 @@ static usbd_class_driver_t const usbd_class_drivers[] =
.init = vendord_init,
.reset = vendord_reset,
.open = vendord_open,
.control_request = NULL, // tud_control_vendor_request_cb
.control_complete = NULL, // tud_control_vendor_complete_cb
.control_request = NULL, // tud_vendor_control_request_cb
.control_complete = NULL, // tud_vendor_control_complete_cb
.xfer_cb = vendord_xfer_cb,
.sof = NULL
},
@@ -349,10 +349,10 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
// Vendor request
if ( p_request->bmRequestType_bit.type == TUSB_REQ_TYPE_VENDOR )
{
TU_VERIFY(tud_control_vendor_request_cb);
TU_VERIFY(tud_vendor_control_request_cb);
if (tud_control_vendor_complete_cb) usbd_control_set_complete_callback(tud_control_vendor_complete_cb);
return tud_control_vendor_request_cb(rhport, p_request);
if (tud_vendor_control_complete_cb) usbd_control_set_complete_callback(tud_vendor_control_complete_cb);
return tud_vendor_control_request_cb(rhport, p_request);
}
switch ( p_request->bmRequestType_bit.recipient )

4
src/device/usbd.h
View File

@@ -100,10 +100,6 @@ TU_ATTR_WEAK void tud_suspend_cb(bool remote_wakeup_en);
// Invoked when usb bus is resumed
TU_ATTR_WEAK void tud_resume_cb(void);
// Invoked when received control request with VENDOR TYPE
TU_ATTR_WEAK bool tud_control_vendor_request_cb(uint8_t rhport, tusb_control_request_t const * request);
TU_ATTR_WEAK bool tud_control_vendor_complete_cb(uint8_t rhport, tusb_control_request_t const * request);
//--------------------------------------------------------------------+
// Descriptor Templates
//--------------------------------------------------------------------+