diff options
| author | hathach <[email protected]> | 2019-07-24 09:45:32 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2019-07-24 09:45:32 +0700 |
| commit | c63f2b30cbad128d5b46820965f0734be9879cb1 (patch) | |
| tree | 7a7d4aa4f9c9a962e7a8310a45508be9904e2cda /src/device | |
| parent | 8fad8fb5c2d4b586431c1893f912ad2ebedc9b33 (diff) | |
rename tud_control_vendor_request_cb/complete_cb to tud_vendor_control_request_cb/complete_cb
Diffstat (limited to 'src/device')
| -rw-r--r-- | src/device/usbd.c | 10 | ||||
| -rw-r--r-- | src/device/usbd.h | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/device/usbd.c b/src/device/usbd.c index a24113026..4ce056e7f 100644 --- a/src/device/usbd.c +++ b/src/device/usbd.c @@ -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 )
diff --git a/src/device/usbd.h b/src/device/usbd.h index a77110bde..5aba18ef3 100644 --- a/src/device/usbd.h +++ b/src/device/usbd.h @@ -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
//--------------------------------------------------------------------+
|