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

Merge commit '5e3cadec20a5fa3ec6eef53f23520707d0db5380' into sam-update

Browse Source
This commit is contained in:
Jason Kotzin 2022-08-10 22:33:40 -07:00
commit c9a0be19cb
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/command.c
View File

@ -159,7 +159,7 @@ bool cmd_version(target *t, int argc, char **argv)
#else #else
gdb_out(BOARD_IDENT); gdb_out(BOARD_IDENT);
gdb_outf(", Hardware Version %d\n", platform_hwversion()); 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 " gdb_out("License GPLv3+: GNU GPL version 3 or later "
"<http://gnu.org/licenses/gpl.html>\n\n"); "<http://gnu.org/licenses/gpl.html>\n\n");
#endif #endif

2
src/platforms/common/cdcacm.c
View File

@ -414,7 +414,7 @@ static char serial_no[DFU_SERIAL_LENGTH];
#define BOARD_IDENT "Black Magic Probe " PLATFORM_IDENT FIRMWARE_VERSION #define BOARD_IDENT "Black Magic Probe " PLATFORM_IDENT FIRMWARE_VERSION
static const char *usb_strings[] = { static const char *usb_strings[] = {
"Black Sphere Technologies", "Black Magic Debug",
BOARD_IDENT, BOARD_IDENT,
serial_no, serial_no,
"Black Magic GDB Server", "Black Magic GDB Server",

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

@ -159,7 +159,9 @@ print_probes_info:
* Recent: Black_Sphere_Technologies_Black_Magic_Probe_v1.7.1-212-g212292ab_7BAE7AB8-if00 * 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 * 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/" #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) 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 == '_') while (*name == '_')
name++; name++;
if (!*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)); strncpy(info->version, version, sizeof(info->version));
break; break;
} else if (found_bmps > 0) { } 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); "Probe (%s), %s\n", i, serial, type, version);
} }
} }

12
src/platforms/pc/serial_unix.c
View File

@ -95,7 +95,9 @@ int serial_open(BMP_CL_OPTIONS_t *cl_opts, char *serial)
return set_interface_attribs(); return set_interface_attribs();
} }
#else #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/" #define DEVICE_BY_ID "/dev/serial/by-id/"
int serial_open(BMP_CL_OPTIONS_t *cl_opts, char *serial) 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_devices = 0;
int num_total = 0; int num_total = 0;
while ((dp = readdir(dir)) != NULL) { 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"))) { (strstr(dp->d_name, "-if00"))) {
num_total++; num_total++;
if ((serial) && (!strstr(dp->d_name, serial))) 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); dir = opendir(DEVICE_BY_ID);
if (dir) { if (dir) {
while ((dp = readdir(dir)) != NULL) { 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"))) (strstr(dp->d_name, "-if00")))
DEBUG_WARN("%s\n", dp->d_name); DEBUG_WARN("%s\n", dp->d_name);
} }

2
src/platforms/stm32/dfucore.c
View File

@ -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 #define BOARD_IDENT_DFU(BOARD_TYPE) "Black Magic Probe DFU " PLATFORM_IDENT "" FIRMWARE_VERSION
static const char *usb_strings[] = { static const char *usb_strings[] = {
"Black Sphere Technologies", "Black Magic Debug",
BOARD_IDENT_DFU(PLATFORM_IDENT), BOARD_IDENT_DFU(PLATFORM_IDENT),
serial_no, serial_no,
/* This string is used by ST Microelectronics' DfuSe utility */ /* This string is used by ST Microelectronics' DfuSe utility */