Skip to content

Commit 9aaf9b5

Browse files
committed
add back weak callback for tud_vendor_control_xfer_cb due to conflict with arduino esp32
1 parent 7a32772 commit 9aaf9b5

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

src/device/usbd.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ TU_ATTR_WEAK void tud_suspend_cb(bool remote_wakeup_en) {
8686
TU_ATTR_WEAK void tud_resume_cb(void) {
8787
}
8888

89-
TU_ATTR_WEAK bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_request_t const* request) {
90-
(void) rhport;
91-
(void) stage;
92-
(void) request;
93-
return false;
94-
}
89+
//TU_ATTR_WEAK bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_request_t const* request) {
90+
// (void) rhport;
91+
// (void) stage;
92+
// (void) request;
93+
// return false;
94+
//}
9595

9696
TU_ATTR_WEAK bool dcd_deinit(uint8_t rhport) {
9797
(void) rhport;
@@ -715,6 +715,7 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
715715

716716
// Vendor request
717717
if ( p_request->bmRequestType_bit.type == TUSB_REQ_TYPE_VENDOR ) {
718+
TU_VERIFY(tud_vendor_control_xfer_cb);
718719
usbd_control_set_complete_callback(tud_vendor_control_xfer_cb);
719720
return tud_vendor_control_xfer_cb(rhport, CONTROL_STAGE_SETUP, p_request);
720721
}

src/device/usbd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ void tud_event_hook_cb(uint8_t rhport, uint32_t eventid, bool in_isr);
159159
void tud_sof_cb(uint32_t frame_count);
160160

161161
// Invoked when received control request with VENDOR TYPE
162-
bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_request_t const * request);
162+
TU_ATTR_WEAK bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_request_t const * request);
163163

164164
//--------------------------------------------------------------------+
165165
// Binary Device Object Store (BOS) Descriptor Templates

0 commit comments

Comments
 (0)