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

Fix build for non-native targets.

Browse Source
This commit is contained in:
Gareth McMullin 2014-08-08 20:22:33 +12:00
parent 84fc40085e
commit 8a32b46f65
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/command.c
View File

@ -47,7 +47,9 @@ static bool cmd_swdp_scan(void);
static bool cmd_targets(target *t); static bool cmd_targets(target *t);
static bool cmd_morse(void); static bool cmd_morse(void);
static bool cmd_connect_srst(target *t, int argc, const char **argv); static bool cmd_connect_srst(target *t, int argc, const char **argv);
#ifdef PLATFORM_HAS_POWER_SWITCH
static bool cmd_target_power(target *t, int argc, const char **argv); static bool cmd_target_power(target *t, int argc, const char **argv);
#endif
#ifdef PLATFORM_HAS_TRACESWO #ifdef PLATFORM_HAS_TRACESWO
static bool cmd_traceswo(void); static bool cmd_traceswo(void);
#endif #endif
@ -60,7 +62,9 @@ const struct command_s cmd_list[] = {
{"targets", (cmd_handler)cmd_targets, "Display list of available targets" }, {"targets", (cmd_handler)cmd_targets, "Display list of available targets" },
{"morse", (cmd_handler)cmd_morse, "Display morse error message" }, {"morse", (cmd_handler)cmd_morse, "Display morse error message" },
{"connect_srst", (cmd_handler)cmd_connect_srst, "Configure connect under SRST: (enable|disable)" }, {"connect_srst", (cmd_handler)cmd_connect_srst, "Configure connect under SRST: (enable|disable)" },
#ifdef PLATFORM_HAS_POWER_SWITCH
{"tpwr", (cmd_handler)cmd_target_power, "Supplies power to the target: (enable|disable)"}, {"tpwr", (cmd_handler)cmd_target_power, "Supplies power to the target: (enable|disable)"},
#endif
#ifdef PLATFORM_HAS_TRACESWO #ifdef PLATFORM_HAS_TRACESWO
{"traceswo", (cmd_handler)cmd_traceswo, "Start trace capture" }, {"traceswo", (cmd_handler)cmd_traceswo, "Start trace capture" },
#endif #endif
@ -223,6 +227,8 @@ static bool cmd_connect_srst(target *t, int argc, const char **argv)
connect_assert_srst = !strcmp(argv[1], "enable"); connect_assert_srst = !strcmp(argv[1], "enable");
return true; return true;
} }
#ifdef PLATFORM_HAS_POWER_SWITCH
static bool cmd_target_power(target *t, int argc, const char **argv) static bool cmd_target_power(target *t, int argc, const char **argv)
{ {
(void)t; (void)t;
@ -233,6 +239,7 @@ static bool cmd_target_power(target *t, int argc, const char **argv)
platform_target_set_power(!strncmp(argv[1], "enable", strlen(argv[1]))); platform_target_set_power(!strncmp(argv[1], "enable", strlen(argv[1])));
return true; return true;
} }
#endif
#ifdef PLATFORM_HAS_TRACESWO #ifdef PLATFORM_HAS_TRACESWO
static bool cmd_traceswo(void) static bool cmd_traceswo(void)

5
src/platforms/native/platform.h
View File

@ -39,6 +39,7 @@
#define INLINE_GPIO #define INLINE_GPIO
#define CDCACM_PACKET_SIZE 64 #define CDCACM_PACKET_SIZE 64
#define PLATFORM_HAS_TRACESWO #define PLATFORM_HAS_TRACESWO
#define PLATFORM_HAS_POWER_SWITCH
#define BOARD_IDENT "Black Magic Probe" #define BOARD_IDENT "Black Magic Probe"
#define BOARD_IDENT_DFU "Black Magic Probe (Upgrade)" #define BOARD_IDENT_DFU "Black Magic Probe (Upgrade)"
#define BOARD_IDENT_UPD "Black Magic Probe (DFU Upgrade)" #define BOARD_IDENT_UPD "Black Magic Probe (DFU Upgrade)"
@ -225,7 +226,6 @@ static inline uint16_t _gpio_get(uint32_t gpioport, uint16_t gpios)
#define gpio_get _gpio_get #define gpio_get _gpio_get
#endif #endif
#endif
#define disconnect_usb() gpio_set_mode(USB_PU_PORT, GPIO_MODE_INPUT, 0, USB_PU_PIN); #define disconnect_usb() gpio_set_mode(USB_PU_PORT, GPIO_MODE_INPUT, 0, USB_PU_PIN);
void assert_boot_pin(void); void assert_boot_pin(void);
@ -233,3 +233,6 @@ void setup_vbus_irq(void);
void platform_srst_set_val(bool assert); void platform_srst_set_val(bool assert);
bool platform_target_get_power(void); bool platform_target_get_power(void);
void platform_target_set_power(bool power); void platform_target_set_power(bool power);
#endif