From 5e3cadec20a5fa3ec6eef53f23520707d0db5380 Mon Sep 17 00:00:00 2001 From: Piotr Esden-Tempski Date: Mon, 30 May 2022 15:09:55 -0700 Subject: [PATCH] Updated Copyright and Vendor strings to Black Magic Debug. The project is not part of Black Sphere Technologies any more. It was renamed to Black Magic Debug instead. --- src/command.c | 2 +- src/platforms/common/cdcacm.c | 2 +- src/platforms/hosted/bmp_serial.c | 8 +++++--- src/platforms/pc/serial_unix.c | 12 +++++++++--- src/platforms/stm32/dfucore.c | 2 +- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/command.c b/src/command.c index fdda867..9909634 100644 --- a/src/command.c +++ b/src/command.c @@ -141,7 +141,7 @@ bool cmd_version(target *t, int argc, char **argv) #else gdb_out(BOARD_IDENT); gdb_outf(", Hardware Version %d\n", platform_hwversion()); - gdb_out("Copyright (C) 2015 Black Sphere Technologies Ltd.\n"); + gdb_out("Copyright (C) 2022 Black Magic Debug Project\n"); gdb_out("License GPLv3+: GNU GPL version 3 or later " "\n\n"); #endif diff --git a/src/platforms/common/cdcacm.c b/src/platforms/common/cdcacm.c index 399dd3d..ed7b08d 100644 --- a/src/platforms/common/cdcacm.c +++ b/src/platforms/common/cdcacm.c @@ -414,7 +414,7 @@ static char serial_no[DFU_SERIAL_LENGTH]; #define BOARD_IDENT "Black Magic Probe " PLATFORM_IDENT FIRMWARE_VERSION static const char *usb_strings[] = { - "Black Sphere Technologies", + "Black Magic Debug", BOARD_IDENT, serial_no, "Black Magic GDB Server", diff --git a/src/platforms/hosted/bmp_serial.c b/src/platforms/hosted/bmp_serial.c index c6d3e52..03ef66e 100644 --- a/src/platforms/hosted/bmp_serial.c +++ b/src/platforms/hosted/bmp_serial.c @@ -159,7 +159,9 @@ print_probes_info: * Recent: Black_Sphere_Technologies_Black_Magic_Probe_v1.7.1-212-g212292ab_7BAE7AB8-if00 * usb-Black_Sphere_Technologies_Black_Magic_Probe__SWLINK__v1.7.1-155-gf55ad67b-dirty_DECB8811-if00 */ -#define BMP_IDSTRING "usb-Black_Sphere_Technologies_Black_Magic_Probe" +#define BMP_IDSTRING_BLACKSPHERE "usb-Black_Sphere_Technologies_Black_Magic_Probe" +#define BMP_IDSTRING_BLACKMAGIC "usb-Black_Magic_Debug_Black_Magic_Probe" +#define BMP_IDSTRING_1BITSQUARED "usb-1BitSquared_Black_Magic_Probe" #define DEVICE_BY_ID "/dev/serial/by-id/" /* @@ -170,7 +172,7 @@ print_probes_info: */ static int scan_linux_id(char *name, char *type, char *version, char *serial) { - name += strlen(BMP_IDSTRING) + 1; + name += strlen(BMP_IDSTRING_BLACKSPHERE) + 1; while (*name == '_') name++; if (!*name) { @@ -279,7 +281,7 @@ int find_debuggers(BMP_CL_OPTIONS_t *cl_opts, bmp_info_t *info) strncpy(info->version, version, sizeof(info->version)); break; } else if (found_bmps > 0) { - DEBUG_WARN("%2d: %s, Black Sphere Technologies, Black Magic " + DEBUG_WARN("%2d: %s, Black Magic Debug, Black Magic " "Probe (%s), %s\n", i, serial, type, version); } } diff --git a/src/platforms/pc/serial_unix.c b/src/platforms/pc/serial_unix.c index 08f0113..9598bf3 100644 --- a/src/platforms/pc/serial_unix.c +++ b/src/platforms/pc/serial_unix.c @@ -95,7 +95,9 @@ int serial_open(BMP_CL_OPTIONS_t *cl_opts, char *serial) return set_interface_attribs(); } #else -#define BMP_IDSTRING "usb-Black_Sphere_Technologies_Black_Magic_Probe" +#define BMP_IDSTRING_BLACKSPHERE "usb-Black_Sphere_Technologies_Black_Magic_Probe" +#define BMP_IDSTRING_BLACKMAGIC "usb-Black_Magic_Debug_Black_Magic_Probe" +#define BMP_IDSTRING_1BITSQUARED "usb-1BitSquared_Black_Magic_Probe" #define DEVICE_BY_ID "/dev/serial/by-id/" int serial_open(BMP_CL_OPTIONS_t *cl_opts, char *serial) { @@ -111,7 +113,9 @@ int serial_open(BMP_CL_OPTIONS_t *cl_opts, char *serial) int num_devices = 0; int num_total = 0; while ((dp = readdir(dir)) != NULL) { - if ((strstr(dp->d_name, BMP_IDSTRING)) && + if ((strstr(dp->d_name, BMP_IDSTRING_BLACKSPHERE) || + strstr(dp->d_name, BMP_IDSTRING_BLACKMAGIC) || + strstr(dp->d_name, BMP_IDSTRING_1BITSQUARED)) && (strstr(dp->d_name, "-if00"))) { num_total++; if ((serial) && (!strstr(dp->d_name, serial))) @@ -130,7 +134,9 @@ int serial_open(BMP_CL_OPTIONS_t *cl_opts, char *serial) dir = opendir(DEVICE_BY_ID); if (dir) { while ((dp = readdir(dir)) != NULL) { - if ((strstr(dp->d_name, BMP_IDSTRING)) && + if ((strstr(dp->d_name, BMP_IDSTRING_BLACKSPHERE) || + strstr(dp->d_name, BMP_IDSTRING_BLACKMAGIC) || + strstr(dp->d_name, BMP_IDSTRING_1BITSQUARED)) && (strstr(dp->d_name, "-if00"))) DEBUG_WARN("%s\n", dp->d_name); } diff --git a/src/platforms/stm32/dfucore.c b/src/platforms/stm32/dfucore.c index b94a114..4f1a5b6 100644 --- a/src/platforms/stm32/dfucore.c +++ b/src/platforms/stm32/dfucore.c @@ -130,7 +130,7 @@ static char if_string[] = DFU_IFACE_STRING; #define BOARD_IDENT_DFU(BOARD_TYPE) "Black Magic Probe DFU " PLATFORM_IDENT "" FIRMWARE_VERSION static const char *usb_strings[] = { - "Black Sphere Technologies", + "Black Magic Debug", BOARD_IDENT_DFU(PLATFORM_IDENT), serial_no, /* This string is used by ST Microelectronics' DfuSe utility */