diff options
| author | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-23 22:39:47 +0000 |
|---|---|---|
| committer | zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-06-23 22:39:47 +0000 |
| commit | 128a73342856217e98a5da64b2805e062fd4e00d (patch) | |
| tree | 3cd1656b9f3eb2e9be261b003283dce596362d7a /src/jtag/zy1000/zy1000.c | |
| parent | 319fdecb76318ec982855f298b1a4a3a60375748 (diff) | |
| download | openocd+libswd-128a73342856217e98a5da64b2805e062fd4e00d.tar.gz openocd+libswd-128a73342856217e98a5da64b2805e062fd4e00d.tar.bz2 openocd+libswd-128a73342856217e98a5da64b2805e062fd4e00d.tar.xz openocd+libswd-128a73342856217e98a5da64b2805e062fd4e00d.zip | |
- Fixes '&&' whitespace
- Replace ')\(&&\)(' with ') \1 ('.
- Replace '\(\w\)\(&&\)(' with '\1 \2 ('.
- Replace '\(\w\)\(&&\)\(\w\)' with '\1 \2 \3'.
git-svn-id: svn://svn.berlios.de/openocd/trunk@2366 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag/zy1000/zy1000.c')
| -rw-r--r-- | src/jtag/zy1000/zy1000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c index 5e4bda0f..29ab3e46 100644 --- a/src/jtag/zy1000/zy1000.c +++ b/src/jtag/zy1000/zy1000.c @@ -149,7 +149,7 @@ void zy1000_reset(int trst, int srst) ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x00000002); } - if (trst||(srst&&(jtag_get_reset_config() & RESET_SRST_PULLS_TRST))) + if (trst||(srst && (jtag_get_reset_config() & RESET_SRST_PULLS_TRST))) { waitIdle(); /* we're now in the RESET state until trst is deasserted */ |