From b94ccfab1f8218b2236b62846c32f42171abb9fc Mon Sep 17 00:00:00 2001 From: Sid Price Date: Thu, 13 Jul 2023 10:10:36 -0600 Subject: [PATCH] hosted/bmp_libusb: PR review, remove excess braces, process_cmsis_interface_probe --- src/platforms/hosted/bmp_libusb.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/platforms/hosted/bmp_libusb.c b/src/platforms/hosted/bmp_libusb.c index 79be647b1e3..19cb436d9f5 100644 --- a/src/platforms/hosted/bmp_libusb.c +++ b/src/platforms/hosted/bmp_libusb.c @@ -275,25 +275,20 @@ bool process_cmsis_interface_probe( device_descriptor->idProduct == PRODUCT_ID_ORBTRACE) { orbtrace_read_version(device, handle, read_string, sizeof(read_string)); version = strdup(read_string); - } else { + } else version = strdup("---"); - } - if (device_descriptor->iSerialNumber == 0) { + if (device_descriptor->iSerialNumber == 0) serial = strdup("Unknown serial number"); - } else { + else serial = get_device_descriptor_string(handle, device_descriptor->iSerialNumber); - } - if (device_descriptor->iManufacturer == 0) { + if (device_descriptor->iManufacturer == 0) manufacturer = strdup("Unknown manufacturer"); - } else { + else manufacturer = get_device_descriptor_string(handle, device_descriptor->iManufacturer); - } - if (device_descriptor->iProduct == 0) { + if (device_descriptor->iProduct == 0) product = strdup("Unknown product"); - } else { + else product = get_device_descriptor_string(handle, device_descriptor->iProduct); - ; - } *probe_list = probe_info_add_by_id(*probe_list, BMP_TYPE_CMSIS_DAP, device, device_descriptor->idVendor, device_descriptor->idProduct, manufacturer, product, serial, version); @@ -303,7 +298,6 @@ bool process_cmsis_interface_probe( } libusb_close(handle); } - return cmsis_dap; }