diff options
| author | Spencer Oliver <spen@spen-soft.co.uk> | 2013-04-11 11:15:32 +0100 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2013-04-17 09:52:25 +0000 |
| commit | b2189fa93657a8288d2a90c92814d64bf25425b3 (patch) | |
| tree | 933949a2afde12fe87df8c3775f1c17cb3ff4300 /src/jtag/hla/hla_interface.c | |
| parent | 0a33b7b2aa25b8eba53c9097ac2c92c5be7f0227 (diff) | |
| download | riscv-openocd-b2189fa93657a8288d2a90c92814d64bf25425b3.zip riscv-openocd-b2189fa93657a8288d2a90c92814d64bf25425b3.tar.gz riscv-openocd-b2189fa93657a8288d2a90c92814d64bf25425b3.tar.bz2 | |
stlink: fix connect under reset issues
We need to make sure that srst is asserted before we attempt to switch into
jtag or swd mode otherwise we receive a error (-9) - invalid device id.
Change-Id: I625166c751cfba8e8a5290f40122bb9afc9dbb39
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/1315
Tested-by: jenkins
Diffstat (limited to 'src/jtag/hla/hla_interface.c')
| -rw-r--r-- | src/jtag/hla/hla_interface.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c index 53ad8e7..8453a6f 100644 --- a/src/jtag/hla/hla_interface.c +++ b/src/jtag/hla/hla_interface.c @@ -37,12 +37,21 @@ #include <target/target.h> -static struct hl_interface_s hl_if = { {0, 0, 0, 0, 0, 0, 0}, 0, 0 }; +static struct hl_interface_s hl_if = { {0, 0, 0, 0, 0, HL_TRANSPORT_UNKNOWN, 0, false}, 0, 0 }; int hl_interface_open(enum hl_transports tr) { LOG_DEBUG("hl_interface_open"); + enum reset_types jtag_reset_config = jtag_get_reset_config(); + + if (jtag_reset_config & RESET_CNCT_UNDER_SRST) { + if (jtag_reset_config & RESET_SRST_NO_GATING) + hl_if.param.connect_under_reset = true; + else + LOG_WARNING("\'srst_nogate\' reset_config option is required"); + } + /* set transport mode */ hl_if.param.transport = tr; @@ -117,14 +126,11 @@ static int hl_interface_execute_queue(void) int hl_interface_init_reset(void) { - enum reset_types jtag_reset_config = jtag_get_reset_config(); - - if (jtag_reset_config & RESET_CNCT_UNDER_SRST) { - if (jtag_reset_config & RESET_SRST_NO_GATING) { - jtag_add_reset(0, 1); - hl_if.layout->api->assert_srst(hl_if.fd, 0); - } else - LOG_WARNING("\'srst_nogate\' reset_config option is required"); + /* incase the adapter has not already handled asserting srst + * we will attempt it again */ + if (hl_if.param.connect_under_reset) { + jtag_add_reset(0, 1); + hl_if.layout->api->assert_srst(hl_if.fd, 0); } return ERROR_OK; |