Skip to content

Fix picotool enabled USB descriptor #3162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2025
Merged

Fix picotool enabled USB descriptor #3162

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions cores/rp2040/USB.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ void USBClass::setupUSBDescriptor() {

#ifdef ENABLE_PICOTOOL_USB
uint8_t picotool_desc[] = { TUD_RPI_RESET_DESCRIPTOR(1, USB.registerString("Reset")) };
USB.registerInterface(1, picotool_desc, sizeof(picotool_desc), 100, 0);
_picotool_itf_num = USB.registerInterface(1, picotool_desc, sizeof(picotool_desc), 100, 0);
#endif

usbd_desc_cfg_len = TUD_CONFIG_DESC_LEN; // Always have a config descriptor
Expand Down Expand Up @@ -470,6 +470,9 @@ void USBClass::disconnect() {
free(_hid_report);
_hid_report = nullptr;
_hid_report_len = 0;
#ifdef ENABLE_PICOTOOL_USB
unregisterInterface(_picotool_itf_num);
#endif
}

void USBClass::connect() {
Expand Down Expand Up @@ -608,12 +611,14 @@ extern "C" void tud_msc_inquiry_cb(uint8_t lun, uint8_t vendor_id[8], uint8_t pr

#ifdef ENABLE_PICOTOOL_USB

static uint32_t _itf_num = 0;

static void resetd_init() {
}

static void resetd_reset(uint8_t rhport) {
(void) rhport;
_picotool_itf_num = 0;
_itf_num = 0;
}

static uint16_t resetd_open(uint8_t rhport,
Expand All @@ -626,7 +631,7 @@ static uint16_t resetd_open(uint8_t rhport,
uint16_t const drv_len = sizeof(tusb_desc_interface_t);
TU_VERIFY(max_len >= drv_len, 0);

_picotool_itf_num = itf_desc->bInterfaceNumber;
_itf_num = itf_desc->bInterfaceNumber;
return drv_len;
}

Expand All @@ -639,7 +644,7 @@ static bool resetd_control_xfer_cb(uint8_t rhport, uint8_t stage,
return true;
}

if (request->wIndex == _picotool_itf_num) {
if (request->wIndex == _itf_num) {
if (request->bRequest == RESET_REQUEST_BOOTSEL) {
reset_usb_boot(0, (request->wValue & 0x7f));
// does not return, otherwise we'd return true
Expand Down
Loading