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 | |
| 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')
| -rw-r--r-- | src/jtag/zy1000/jtag_minidriver.h | 10 | ||||
| -rw-r--r-- | src/jtag/zy1000/zy1000.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/jtag/zy1000/jtag_minidriver.h b/src/jtag/zy1000/jtag_minidriver.h index 22307aa9..37e9b35a 100644 --- a/src/jtag/zy1000/jtag_minidriver.h +++ b/src/jtag/zy1000/jtag_minidriver.h @@ -92,7 +92,7 @@ static __inline__ void shiftValueInner(const enum tap_state state, const enum ta ZY1000_POKE(ZY1000_JTAG_BASE+0xc, value); #if 1 #if TEST_MANUAL() - if ((state==TAP_DRSHIFT)&&(endState != TAP_DRSHIFT)) + if ((state==TAP_DRSHIFT) && (endState != TAP_DRSHIFT)) { int i; setCurrentState(state); @@ -100,7 +100,7 @@ static __inline__ void shiftValueInner(const enum tap_state state, const enum ta { int tms; tms=0; - if ((i==repeat-1)&&(state != endState)) + if ((i==repeat-1) && (state != endState)) { tms=1; } @@ -124,7 +124,7 @@ static __inline__ void shiftValueInner(const enum tap_state state, const enum ta #endif #else /* maximum debug version */ - if ((repeat>0)&&((state==TAP_DRSHIFT)||(state==TAP_SI))) + if ((repeat>0) && ((state==TAP_DRSHIFT)||(state==TAP_SI))) { int i; /* sample shift register for every bit. */ @@ -188,13 +188,13 @@ static __inline__ void interface_jtag_add_dr_out(jtag_tap_t *target_tap, { int singletap=(jtag_tap_next_enabled(jtag_tap_next_enabled(NULL))==NULL); - if ((singletap)&&(num_fields==3)) + if ((singletap) && (num_fields==3)) { /* used by embeddedice_write_reg_inner() */ shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, num_bits[0], value[0]); shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, num_bits[1], value[1]); shiftValueInner(TAP_DRSHIFT, end_state, num_bits[2], value[2]); - } else if ((singletap)&&(num_fields==2)) + } else if ((singletap) && (num_fields==2)) { /* used by arm7 code */ shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, num_bits[0], value[0]); 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 */ |