diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-05-19 20:11:05 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-05-19 20:11:05 +0000 |
| commit | 0989c374e91fb7c743c8f791e55fcca935351e9d (patch) | |
| tree | 09d6e23733675d922d1476b3f2b0ed5a8338ea66 /src/jtag/jtag.c | |
| parent | 05d143857ccadfa2ab3a9bf11461482f8e3a53b7 (diff) | |
| download | openocd+libswd-0989c374e91fb7c743c8f791e55fcca935351e9d.tar.gz openocd+libswd-0989c374e91fb7c743c8f791e55fcca935351e9d.tar.bz2 openocd+libswd-0989c374e91fb7c743c8f791e55fcca935351e9d.tar.xz openocd+libswd-0989c374e91fb7c743c8f791e55fcca935351e9d.zip | |
reverted change in 658 and simply removed the busted warning for now.
git-svn-id: svn://svn.berlios.de/openocd/trunk@668 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag/jtag.c')
| -rw-r--r-- | src/jtag/jtag.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c index 1e0e889b..e0b008ba 100644 --- a/src/jtag/jtag.c +++ b/src/jtag/jtag.c @@ -937,7 +937,8 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst) ((req_srst&&!jtag_srst)|| (!req_srst&&jtag_srst))) { - LOG_ERROR("BUG: transition of req_tlr_or_trst and req_srst in the same jtag_add_reset() call is undefined"); + // FIX!!! srst_pulls_trst allows 1,1 => 0,0 transition.... + //LOG_ERROR("BUG: transition of req_tlr_or_trst and req_srst in the same jtag_add_reset() call is undefined"); } } @@ -1592,7 +1593,8 @@ int jtag_init_reset(struct command_context_s *cmd_ctx) if (jtag_reset_config & RESET_HAS_SRST) { jtag_add_reset(1, 1); - jtag_add_reset(0, 1); + if ((jtag_reset_config & RESET_SRST_PULLS_TRST)==0) + jtag_add_reset(0, 1); } jtag_add_reset(0, 0); if ((retval = jtag_execute_queue()) != ERROR_OK) |