From 8a32b46f65ad8bc20107a26df9b7d3d9a356a5ee Mon Sep 17 00:00:00 2001 From: Gareth McMullin Date: Fri, 8 Aug 2014 20:22:33 +1200 Subject: Fix build for non-native targets. --- src/command.c | 7 +++++++ src/platforms/native/platform.h | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/command.c b/src/command.c index 0c97949..e817197 100644 --- a/src/command.c +++ b/src/command.c @@ -47,7 +47,9 @@ static bool cmd_swdp_scan(void); static bool cmd_targets(target *t); static bool cmd_morse(void); 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); +#endif #ifdef PLATFORM_HAS_TRACESWO static bool cmd_traceswo(void); #endif @@ -60,7 +62,9 @@ const struct command_s cmd_list[] = { {"targets", (cmd_handler)cmd_targets, "Display list of available targets" }, {"morse", (cmd_handler)cmd_morse, "Display morse error message" }, {"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)"}, +#endif #ifdef PLATFORM_HAS_TRACESWO {"traceswo", (cmd_handler)cmd_traceswo, "Start trace capture" }, #endif @@ -223,6 +227,8 @@ static bool cmd_connect_srst(target *t, int argc, const char **argv) connect_assert_srst = !strcmp(argv[1], "enable"); return true; } + +#ifdef PLATFORM_HAS_POWER_SWITCH static bool cmd_target_power(target *t, int argc, const char **argv) { (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]))); return true; } +#endif #ifdef PLATFORM_HAS_TRACESWO static bool cmd_traceswo(void) diff --git a/src/platforms/native/platform.h b/src/platforms/native/platform.h index 5ca0408..3bbcd17 100644 --- a/src/platforms/native/platform.h +++ b/src/platforms/native/platform.h @@ -39,6 +39,7 @@ #define INLINE_GPIO #define CDCACM_PACKET_SIZE 64 #define PLATFORM_HAS_TRACESWO +#define PLATFORM_HAS_POWER_SWITCH #define BOARD_IDENT "Black Magic Probe" #define BOARD_IDENT_DFU "Black Magic Probe (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 #endif -#endif #define disconnect_usb() gpio_set_mode(USB_PU_PORT, GPIO_MODE_INPUT, 0, USB_PU_PIN); void assert_boot_pin(void); @@ -233,3 +233,6 @@ void setup_vbus_irq(void); void platform_srst_set_val(bool assert); bool platform_target_get_power(void); void platform_target_set_power(bool power); + +#endif + -- cgit v1.2.3