aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGareth McMullin2014-07-30 14:19:46 +1200
committerGareth McMullin2014-07-30 14:19:46 +1200
commitbfe5d1168b705623bf5c672c93aac4edb7d17725 (patch)
treecc8e5ef061bf7f133fd6f80d5086e26edd44c431 /src
parent7e396b0205bac46ff794ff562141ab131fe0aff1 (diff)
parentc1b1d45155ba666d43d4d26b997b45eef8ff50f8 (diff)
Merge pull request #47 from richardeoin/target-power
Added monitor option to toggle target power
Diffstat (limited to 'src')
-rw-r--r--src/command.c12
-rw-r--r--src/platforms/native/platform.c13
-rw-r--r--src/platforms/native/platform.h2
-rw-r--r--src/platforms/stm32/jtagtap.c10
4 files changed, 32 insertions, 5 deletions
diff --git a/src/command.c b/src/command.c
index 8378576..0c97949 100644
--- a/src/command.c
+++ b/src/command.c
@@ -47,6 +47,7 @@ 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);
+static bool cmd_target_power(target *t, int argc, const char **argv);
#ifdef PLATFORM_HAS_TRACESWO
static bool cmd_traceswo(void);
#endif
@@ -59,6 +60,7 @@ 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)" },
+ {"tpwr", (cmd_handler)cmd_target_power, "Supplies power to the target: (enable|disable)"},
#ifdef PLATFORM_HAS_TRACESWO
{"traceswo", (cmd_handler)cmd_traceswo, "Start trace capture" },
#endif
@@ -221,6 +223,16 @@ static bool cmd_connect_srst(target *t, int argc, const char **argv)
connect_assert_srst = !strcmp(argv[1], "enable");
return true;
}
+static bool cmd_target_power(target *t, int argc, const char **argv)
+{
+ (void)t;
+ if (argc == 1)
+ gdb_outf("Target Power: %s\n",
+ !platform_target_get_power() ? "enabled" : "disabled");
+ else
+ platform_target_set_power(!strncmp(argv[1], "enable", strlen(argv[1])));
+ return true;
+}
#ifdef PLATFORM_HAS_TRACESWO
static bool cmd_traceswo(void)
diff --git a/src/platforms/native/platform.c b/src/platforms/native/platform.c
index 81a54d8..66b84fa 100644
--- a/src/platforms/native/platform.c
+++ b/src/platforms/native/platform.c
@@ -158,7 +158,18 @@ void platform_srst_set_val(bool assert)
gpio_set_val(SRST_PORT, SRST_PIN, !assert);
}
}
-
+bool platform_target_get_power(void) {
+ if (platform_hwversion() > 0) {
+ return gpio_get(PWR_BR_PORT, PWR_BR_PIN);
+ }
+ return 1; // 1 = Unpowered
+}
+void platform_target_set_power(bool power)
+{
+ if (platform_hwversion() > 0) {
+ gpio_set_val(PWR_BR_PORT, PWR_BR_PIN, !power);
+ }
+}
void platform_delay(uint32_t delay)
{
timeout_counter = delay;
diff --git a/src/platforms/native/platform.h b/src/platforms/native/platform.h
index 082f6ef..5ca0408 100644
--- a/src/platforms/native/platform.h
+++ b/src/platforms/native/platform.h
@@ -231,3 +231,5 @@ static inline uint16_t _gpio_get(uint32_t gpioport, uint16_t gpios)
void assert_boot_pin(void);
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);
diff --git a/src/platforms/stm32/jtagtap.c b/src/platforms/stm32/jtagtap.c
index 78dd300..2d09b84 100644
--- a/src/platforms/stm32/jtagtap.c
+++ b/src/platforms/stm32/jtagtap.c
@@ -42,10 +42,12 @@ int jtagtap_init(void)
void jtagtap_reset(void)
{
#ifdef TRST_PORT
- volatile int i;
- gpio_clear(TRST_PORT, TRST_PIN);
- for(i = 0; i < 10000; i++) asm("nop");
- gpio_set(TRST_PORT, TRST_PIN);
+ if (platform_hwversion() == 0) {
+ volatile int i;
+ gpio_clear(TRST_PORT, TRST_PIN);
+ for(i = 0; i < 10000; i++) asm("nop");
+ gpio_set(TRST_PORT, TRST_PIN);
+ }
#endif
jtagtap_soft_reset();
}