Improve handling of RP2040 devices after reboot

Calling GET_INFO when not available sometimes causes issues with forced commands

Also improve libusb error messages when debugging

Author: will-v-pi

main.cpp

@@ -8762,7 +8762,7 @@ int main(int argc, char **argv) {
                         // again is to assume it has the same serial number.
                         settings.address = -1;
                         settings.bus = -1;
-                        // also skip vid/pid filtering, as that will typically change in BOOTSEL mode
+                        // also skip vid/pid filtering, as that will typically change in BOOTSEL mode, and could be white-labelled on RP2350
                         settings.pid = -1;
                         // still filter for rpi vid/pid if we don't have a serial number, as that is an RP2040 running a no_flash binary, so will
                         // have a standard rpi vid/pid in BOOTSEL mode

picoboot_connection/picoboot_connection.c

@@ -69,7 +69,7 @@ enum picoboot_device_result picoboot_open_device(libusb_device *device, libusb_d
     int ret = libusb_get_device_descriptor(device, &desc);
     enum picoboot_device_result res = dr_vidpid_unknown;
     if (ret && verbose) {
-        output("Failed to read device descriptor\n");
+        output("Failed to read device descriptor %s\n", libusb_error_name(ret));
     }
     if (!ret) {
         if (pid >= 0) {
@@ -107,14 +107,14 @@ enum picoboot_device_result picoboot_open_device(libusb_device *device, libusb_d
         }
         ret = libusb_get_active_config_descriptor(device, &config);
         if (ret && verbose) {
-            output("Failed to read config descriptor\n");
+            output("Failed to read config descriptor %s\n", libusb_error_name(ret));
         }
     }
 
     if (!ret) {
         ret  = libusb_open(device, dev_handle);
         if (ret && verbose) {
-            output("Failed to open device %d\n", ret);
+            output("Failed to open device %s\n", libusb_error_name(ret));
         }
         if (ret) {
             if (vid == 0 || strlen(ser) != 0) {
@@ -169,7 +169,7 @@ enum picoboot_device_result picoboot_open_device(libusb_device *device, libusb_d
             if (verbose) output("Found PICOBOOT interface\n");
             ret = libusb_claim_interface(*dev_handle, interface);
             if (ret) {
-                if (verbose) output("Failed to claim interface\n");
+                if (verbose) output("Failed to claim interface %s\n", libusb_error_name(ret));
                 return dr_vidpid_bootrom_no_interface;
             }
         } else {
@@ -180,16 +180,22 @@ enum picoboot_device_result picoboot_open_device(libusb_device *device, libusb_d
 
     if (!ret) {
         if (*model == unknown) {
-            struct picoboot_get_info_cmd info_cmd;
-            info_cmd.bType = PICOBOOT_GET_INFO_SYS,
-            info_cmd.dParams[0] = (uint32_t) (SYS_INFO_CHIP_INFO);
-            uint32_t word_buf[64];
-            // RP2040 doesn't have this function, so returns non-zero
-            int info_ret = picoboot_get_info(*dev_handle, &info_cmd, (uint8_t*)word_buf, sizeof(word_buf));
-            if (info_ret) {
+            if (desc.idVendor == VENDOR_ID_RASPBERRY_PI && desc.idProduct == PRODUCT_ID_RP2040_USBBOOT) {
+                // Set model based on bootrom vid/pid for RP2040, as it cannot be white-labelled
                 *model = rp2040;
             } else {
-                *model = rp2350;
+                // Otherwise check the chip info
+                struct picoboot_get_info_cmd info_cmd;
+                info_cmd.bType = PICOBOOT_GET_INFO_SYS,
+                info_cmd.dParams[0] = (uint32_t) (SYS_INFO_CHIP_INFO);
+                uint32_t word_buf[64];
+                // RP2040 doesn't have this function, so returns non-zero
+                int info_ret = picoboot_get_info(*dev_handle, &info_cmd, (uint8_t*)word_buf, sizeof(word_buf));
+                if (info_ret) {
+                    *model = rp2040;
+                } else {
+                    *model = rp2350;
+                }
             }
         }
         if (strlen(ser) != 0) {
@@ -301,7 +307,7 @@ int picoboot_cmd(libusb_device_handle *usb_device, struct picoboot_cmd *cmd, uin
     ret = libusb_bulk_transfer(usb_device, out_ep, (uint8_t *) cmd, sizeof(struct picoboot_cmd), &sent, 3000);
 
     if (ret != 0 || sent != sizeof(struct picoboot_cmd)) {
-        output("   ...failed to send command %d\n", ret);
+        output("   ...failed to send command %s\n", libusb_error_name(ret));
         return ret;
     }
 
@@ -321,15 +327,15 @@ int picoboot_cmd(libusb_device_handle *usb_device, struct picoboot_cmd *cmd, uin
             int received = 0;
             ret = libusb_bulk_transfer(usb_device, in_ep, buffer, cmd->dTransferLength, &received, timeout);
             if (ret != 0 || received != (int) cmd->dTransferLength) {
-                output("  ...failed to receive data %d %d/%d\n", ret, received, cmd->dTransferLength);
+                output("  ...failed to receive data %s %d/%d\n", libusb_error_name(ret), received, cmd->dTransferLength);
                 if (!ret) ret = 1;
                 return ret;
             }
         } else {
             if (verbose) output("  send %d...\n", cmd->dTransferLength);
             ret = libusb_bulk_transfer(usb_device, out_ep, buffer, cmd->dTransferLength, &sent, timeout);
             if (ret != 0 || sent != (int) cmd->dTransferLength) {
-                output("  ...failed to send data %d %d/%d\n", ret, sent, cmd->dTransferLength);
+                output("  ...failed to send data %s %d/%d\n", libusb_error_name(ret), sent, cmd->dTransferLength);
                 if (!ret) ret = 1;
                 picoboot_cmd_status_verbose(usb_device, NULL, true);
                 return ret;