sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow BOARD_IDENT as function

This commit is contained in:
Uwe Bonnes 2020-04-18 14:17:03 +02:00
parent 563df2d354
commit 9a46c6fd25
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/command.c
View File

@ -136,7 +136,7 @@ bool cmd_version(target *t, int argc, char **argv)
(void)argc; (void)argc;
(void)argv; (void)argv;
#if PC_HOSTED == 1 #if PC_HOSTED == 1
gdb_outf("Black Magic Probe, PC-Hosted for " PLATFORM_IDENT gdb_outf("Black Magic Probe, PC-Hosted for " PLATFORM_IDENT()
", Version " FIRMWARE_VERSION "\n"); ", Version " FIRMWARE_VERSION "\n");
#else #else
gdb_outf("Black Magic Probe (Firmware " FIRMWARE_VERSION ") (Hardware Version %d)\n", platform_hwversion()); gdb_outf("Black Magic Probe (Firmware " FIRMWARE_VERSION ") (Hardware Version %d)\n", platform_hwversion());

2
src/platforms/libftdi/platform.h
View File

@ -38,7 +38,7 @@
#define PLATFORM_HAS_DEBUG #define PLATFORM_HAS_DEBUG
#define PLATFORM_IDENT "FTDI/MPSSE" #define PLATFORM_IDENT() "FTDI/MPSSE"
#define SET_RUN_STATE(state) #define SET_RUN_STATE(state)
#define SET_IDLE_STATE(state) #define SET_IDLE_STATE(state)
#define SET_ERROR_STATE(state) #define SET_ERROR_STATE(state)

2
src/platforms/pc-hosted/platform.h
View File

@ -35,7 +35,7 @@
#define PLATFORM_HAS_DEBUG #define PLATFORM_HAS_DEBUG
#define PLATFORM_HAS_POWER_SWITCH #define PLATFORM_HAS_POWER_SWITCH
#define PLATFORM_MAX_MSG_SIZE (256) #define PLATFORM_MAX_MSG_SIZE (256)
#define PLATFORM_IDENT "PC-HOSTED" #define PLATFORM_IDENT() "PC-HOSTED"
#define BOARD_IDENT PLATFORM_IDENT #define BOARD_IDENT PLATFORM_IDENT
#define SET_RUN_STATE(state) #define SET_RUN_STATE(state)
#define SET_IDLE_STATE(state) #define SET_IDLE_STATE(state)

2
src/platforms/pc-stlinkv2/platform.h
View File

@ -35,7 +35,7 @@
#define PLATFORM_HAS_DEBUG #define PLATFORM_HAS_DEBUG
#define PLATFORM_IDENT "StlinkV2/3" #define PLATFORM_IDENT() "StlinkV2/3"
#define SET_RUN_STATE(state) #define SET_RUN_STATE(state)
void stlink_check_detach(int state); void stlink_check_detach(int state);
#define SET_IDLE_STATE(state) stlink_check_detach(state) #define SET_IDLE_STATE(state) stlink_check_detach(state)

2
src/remote.c
View File

@ -243,7 +243,7 @@ void remotePacketProcessGEN(uint8_t i, char *packet)
break; break;
#if !defined(BOARD_IDENT) && defined(PLATFORM_IDENT) #if !defined(BOARD_IDENT) && defined(PLATFORM_IDENT)
# define BOARD_IDENT PLATFORM_IDENT # define BOARD_IDENT() PLATFORM_IDENT
#endif #endif
case REMOTE_START: case REMOTE_START:
_respondS(REMOTE_RESP_OK, BOARD_IDENT " " FIRMWARE_VERSION); _respondS(REMOTE_RESP_OK, BOARD_IDENT " " FIRMWARE_VERSION);