- Fixes '+' whitespace

[fw/openocd] / src / jtag / zy1000 / jtag_minidriver.h

diff --git a/src/jtag/zy1000/jtag_minidriver.h b/src/jtag/zy1000/jtag_minidriver.h
index 9f24dd661fa024ee422d334443b439a9a9ed7ea1..66debe39df60b49a341aff03e6fef803d8c89d0e 100644 (file)
--- a/src/jtag/zy1000/jtag_minidriver.h
+++ b/src/jtag/zy1000/jtag_minidriver.h
@@ -28,7 +28,7 @@
 #if 0
 int  diag_printf( const char *fmt, ... );
 #define ZY1000_POKE(a, b) HAL_WRITE_UINT32(a, b); diag_printf("poke 0x%08x,0x%08x\n", a, b)
-#define ZY1000_PEEK(a, b) HAL_READ_UINT32(a, b); diag_printf("peek 0x%08x=0x%08x\n", a, b)
+#define ZY1000_PEEK(a, b) HAL_READ_UINT32(a, b); diag_printf("peek 0x%08x = 0x%08x\n", a, b)
 #else
 #define ZY1000_POKE(a, b) HAL_WRITE_UINT32(a, b)
 #define ZY1000_PEEK(a, b) HAL_READ_UINT32(a, b)
@@ -40,7 +40,7 @@ static __inline__ void waitIdle(void)
        cyg_uint32 empty;
        do
        {
-               ZY1000_PEEK(ZY1000_JTAG_BASE+0x10, empty);
+               ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, empty);
        } while ((empty & 0x100) == 0);
 }
 
@@ -54,7 +54,7 @@ static void sampleShiftRegister(void)
 #if 0
        cyg_uint32 dummy;
        waitIdle();
-       ZY1000_PEEK(ZY1000_JTAG_BASE+0xc, dummy);
+       ZY1000_PEEK(ZY1000_JTAG_BASE + 0xc, dummy);
 #endif
 }
 
@@ -62,19 +62,19 @@ static void sampleShiftRegister(void)
 static void setCurrentState(enum tap_state state)
 {
        cyg_uint32 a;
-       a=state;
-       int repeat=0;
+       a = state;
+       int repeat = 0;
        if (state == TAP_RESET)
        {
                // The FPGA nor we know the current state of the CPU TAP
                // controller. This will move it to TAP for sure.
                //
                // 5 should be enough here, 7 is what OpenOCD uses
-               repeat=7;
+               repeat = 7;
        }
        waitQueue();
        sampleShiftRegister();
-       ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (repeat << 8)|(a << 4)|a);
+       ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (repeat << 8)|(a << 4)|a);
 
 }
 
@@ -85,42 +85,42 @@ static void setCurrentState(enum tap_state state)
 static __inline__ void shiftValueInner(const enum tap_state state, const enum tap_state endState, int repeat, cyg_uint32 value)
 {
        cyg_uint32 a,b;
-       a=state;
-       b=endState;
+       a = state;
+       b = endState;
        waitQueue();
        sampleShiftRegister();
-       ZY1000_POKE(ZY1000_JTAG_BASE+0xc, value);
+       ZY1000_POKE(ZY1000_JTAG_BASE + 0xc, value);
 #if 1
 #if TEST_MANUAL()
        if ((state == TAP_DRSHIFT) && (endState != TAP_DRSHIFT))
        {
                int i;
                setCurrentState(state);
-               for (i=0; i<repeat; i++)
+               for (i = 0; i<repeat; i++)
                {
                        int tms;
-                       tms=0;
+                       tms = 0;
                        if ((i == repeat-1) && (state != endState))
                        {
-                               tms=1;
+                               tms = 1;
                        }
                        /* shift out value */
                        waitIdle();
-                       ZY1000_POKE(ZY1000_JTAG_BASE+0x28, (((value >> i)&1) << 1)|tms);
+                       ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, (((value >> i)&1) << 1)|tms);
                }
                waitIdle();
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x28, 0);
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
                waitIdle();
-               //ZY1000_POKE(ZY1000_JTAG_BASE+0x20, TAP_DRSHIFT); // set this state and things break => expected
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x20, TAP_DRPAUSE); // set this and things will work => expected. Not setting this is not sufficient to make things break.
+               //ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, TAP_DRSHIFT); // set this state and things break => expected
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, TAP_DRPAUSE); // set this and things will work => expected. Not setting this is not sufficient to make things break.
                setCurrentState(endState);
        } else
        {
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (repeat << 8)|(a << 4)|b);
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (repeat << 8)|(a << 4)|b);
        }
 #else
        /* fast version */
-       ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (repeat << 8)|(a << 4)|b);
+       ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (repeat << 8)|(a << 4)|b);
 #endif
 #else
        /* maximum debug version */
@@ -128,19 +128,19 @@ static __inline__ void shiftValueInner(const enum tap_state state, const enum ta
        {
                int i;
                /* sample shift register for every bit. */
-               for (i=0; i<repeat-1; i++)
+               for (i = 0; i<repeat-1; i++)
                {
                        sampleShiftRegister();
-                       ZY1000_POKE(ZY1000_JTAG_BASE+0xc, value >> i);
-                       ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (1 << 8)|(a << 4)|a);
+                       ZY1000_POKE(ZY1000_JTAG_BASE + 0xc, value >> i);
+                       ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (1 << 8)|(a << 4)|a);
                }
                sampleShiftRegister();
-               ZY1000_POKE(ZY1000_JTAG_BASE+0xc, value >> (repeat-1));
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (1 << 8)|(a << 4)|b);
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0xc, value >> (repeat-1));
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (1 << 8)|(a << 4)|b);
        } else
        {
                sampleShiftRegister();
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (repeat << 8)|(a << 4)|b);
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (repeat << 8)|(a << 4)|b);
        }
        sampleShiftRegister();
 #endif
@@ -157,9 +157,9 @@ static __inline__ void interface_jtag_add_dr_out_core(jtag_tap_t *target_tap,
        enum tap_state pause_state = TAP_DRSHIFT;
 
        jtag_tap_t *tap, *nextTap;
-       for (tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap)
+       for (tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap = nextTap)
        {
-               nextTap=jtag_tap_next_enabled(tap);
+               nextTap = jtag_tap_next_enabled(tap);
                if (nextTap == NULL)
                {
                        pause_state = end_state;
@@ -167,7 +167,7 @@ static __inline__ void interface_jtag_add_dr_out_core(jtag_tap_t *target_tap,
                if (tap == target_tap)
                {
                        int j;
-                       for (j=0; j<(num_fields-1); j++)
+                       for (j = 0; j<(num_fields-1); j++)
                        {
                                shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, num_bits[j], value[j]);
                        }
@@ -187,7 +187,7 @@ static __inline__ void interface_jtag_add_dr_out(jtag_tap_t *target_tap,
                enum tap_state end_state)
 {
 
-       int singletap=(jtag_tap_next_enabled(jtag_tap_next_enabled(NULL)) == NULL);
+       int singletap = (jtag_tap_next_enabled(jtag_tap_next_enabled(NULL)) == NULL);
        if ((singletap) && (num_fields == 3))
        {
                /* used by embeddedice_write_reg_inner() */