diff options
| author | mifi <mifi@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-05-24 11:33:34 +0000 |
|---|---|---|
| committer | mifi <mifi@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-05-24 11:33:34 +0000 |
| commit | 8b916771331a17231c9501d86b10e6bd37bfae2c (patch) | |
| tree | 4b17f655b57bcfb4ce2e1c5637ceeb35ce594802 | |
| parent | 20937dd33aa726d043a535a95661913a450b4a35 (diff) | |
| download | openocd_libswd-8b916771331a17231c9501d86b10e6bd37bfae2c.tar.gz openocd_libswd-8b916771331a17231c9501d86b10e6bd37bfae2c.tar.bz2 openocd_libswd-8b916771331a17231c9501d86b10e6bd37bfae2c.tar.xz openocd_libswd-8b916771331a17231c9501d86b10e6bd37bfae2c.zip | |
- swap processing of reset handling. First srst and than trst.
git-svn-id: svn://svn.berlios.de/openocd/trunk@680 b42882b7-edfa-0310-969c-e2dbd0fdcd60
| -rw-r--r-- | src/jtag/jlink.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c index 190ada46..3d2468e1 100644 --- a/src/jtag/jlink.c +++ b/src/jtag/jlink.c @@ -447,22 +447,22 @@ void jlink_reset(int trst, int srst) LOG_DEBUG("trst: %i, srst: %i", trst, srst); /* Signals are active low */ - if (trst == 0) + if (srst == 0) { - jlink_simple_command(EMU_CMD_HW_TRST1); + jlink_simple_command(EMU_CMD_HW_RESET1); } - else if (trst == 1) + else if (srst == 1) { - jlink_simple_command(EMU_CMD_HW_TRST0); + jlink_simple_command(EMU_CMD_HW_RESET0); } - if (srst == 0) + if (trst == 0) { - jlink_simple_command(EMU_CMD_HW_RESET1); + jlink_simple_command(EMU_CMD_HW_TRST1); } - else if (srst == 1) + else if (trst == 1) { - jlink_simple_command(EMU_CMD_HW_RESET0); + jlink_simple_command(EMU_CMD_HW_TRST0); } } |