jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

hosted: Really fix the case of no serial number (#807)

Browse Source
This commit is contained in:
Uwe Bonnes 2020-12-13 13:21:23 +01:00 committed by UweBonnes
parent 272a45df12
commit 98c92a6d18
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/platforms/hosted/bmp_libusb.c
View File

@ -36,13 +36,15 @@
#define VENDOR_ID_SEGGER 0x1366 #define VENDOR_ID_SEGGER 0x1366
#define NO_SERIAL_NUMBER "<no serial number>"
void bmp_ident(bmp_info_t *info) void bmp_ident(bmp_info_t *info)
{ {
DEBUG_INFO("BMP hosted %s\n for ST-Link V2/3, CMSIS_DAP, JLINK and " DEBUG_INFO("BMP hosted %s\n for ST-Link V2/3, CMSIS_DAP, JLINK and "
"LIBFTDI/MPSSE\n", FIRMWARE_VERSION); "LIBFTDI/MPSSE\n", FIRMWARE_VERSION);
if (info && info->vid && info->pid) if (info && info->vid && info->pid)
DEBUG_INFO("Using %04x:%04x %s %s\n %s\n", info->vid, info->pid, DEBUG_INFO("Using %04x:%04x %s %s\n %s\n", info->vid, info->pid,
info->serial, (info->serial[0]) ? info->serial : NO_SERIAL_NUMBER,
info->manufacturer, info->manufacturer,
info->product); info->product);
} }
@ -233,11 +235,9 @@ int find_debuggers(BMP_CL_OPTIONS_t *cl_opts,bmp_info_t *info)
if (!cable->name) if (!cable->name)
continue; continue;
} }
if (!serial[0])
strcpy(serial, "<no serial number>");
if (report) { if (report) {
DEBUG_WARN("%2d: %s, %s, %s\n", found_debuggers + 1, DEBUG_WARN("%2d: %s, %s, %s\n", found_debuggers + 1,
serial, (serial[0]) ? serial : NO_SERIAL_NUMBER,
manufacturer,product); manufacturer,product);
} }
info->vid = desc.idVendor; info->vid = desc.idVendor;