- Fixes '[<>]' whitespace

[openocd.git] / src / jtag / zy1000 / zy1000.c

diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index c5239ee8c33f46922a0cc4f33811ecc0a5e0e5e9..33947332bb563a5dfd1fda94e0f0c97d320c74c3 100644 (file)
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -78,8 +78,8 @@ static bool readPowerDropout(void)
 {
        cyg_uint32 state;
        // sample and clear power dropout
 {
        cyg_uint32 state;
        // sample and clear power dropout

-       HAL_WRITE_UINT32(ZY1000_JTAG_BASE+0x10, 0x80);
-       HAL_READ_UINT32(ZY1000_JTAG_BASE+0x10, state);
+       HAL_WRITE_UINT32(ZY1000_JTAG_BASE + 0x10, 0x80);
+       HAL_READ_UINT32(ZY1000_JTAG_BASE + 0x10, state);

        bool powerDropout;
        powerDropout = (state & 0x80) != 0;
        return powerDropout;
        bool powerDropout;
        powerDropout = (state & 0x80) != 0;
        return powerDropout;


@@ -90,8 +90,8 @@ static bool readSRST(void)
 {
        cyg_uint32 state;
        // sample and clear SRST sensing
 {
        cyg_uint32 state;
        // sample and clear SRST sensing

-       HAL_WRITE_UINT32(ZY1000_JTAG_BASE+0x10, 0x00000040);
-       HAL_READ_UINT32(ZY1000_JTAG_BASE+0x10, state);
+       HAL_WRITE_UINT32(ZY1000_JTAG_BASE + 0x10, 0x00000040);
+       HAL_READ_UINT32(ZY1000_JTAG_BASE + 0x10, state);

        bool srstAsserted;
        srstAsserted = (state & 0x40) != 0;
        return srstAsserted;
        bool srstAsserted;
        srstAsserted = (state & 0x40) != 0;
        return srstAsserted;


@@ -129,42 +129,42 @@ void zy1000_reset(int trst, int srst)
        LOG_DEBUG("zy1000 trst=%d, srst=%d", trst, srst);
        if (!srst)
        {
        LOG_DEBUG("zy1000 trst=%d, srst=%d", trst, srst);
        if (!srst)
        {

-               ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x00000001);
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x00000001);

        }
        else
        {
                /* Danger!!! if clk != 0 when in
                 * idle in TAP_IDLE, reset halt on str912 will fail.
                 */
        }
        else
        {
                /* Danger!!! if clk != 0 when in
                 * idle in TAP_IDLE, reset halt on str912 will fail.
                 */

-               ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x00000001);
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x00000001);

        }
 
        if (!trst)
        {
        }
 
        if (!trst)
        {

-               ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x00000002);
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x00000002);

        }
        else
        {
                /* assert reset */
        }
        else
        {
                /* assert reset */

-               ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x00000002);
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x00000002);

        }
 
        if (trst||(srst && (jtag_get_reset_config() & RESET_SRST_PULLS_TRST)))
        {
                waitIdle();
                /* we're now in the RESET state until trst is deasserted */
        }
 
        if (trst||(srst && (jtag_get_reset_config() & RESET_SRST_PULLS_TRST)))
        {
                waitIdle();
                /* we're now in the RESET state until trst is deasserted */

-               ZY1000_POKE(ZY1000_JTAG_BASE+0x20, TAP_RESET);
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, TAP_RESET);

        } else
        {
                /* We'll get RCLK failure when we assert TRST, so clear any false positives here */
        } else
        {
                /* We'll get RCLK failure when we assert TRST, so clear any false positives here */

-               ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x400);
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x400);

        }
 
        /* wait for srst to float back up */
        if (!srst)
        {
                int i;
        }
 
        /* wait for srst to float back up */
        if (!srst)
        {
                int i;

-               for (i = 0; i<1000; i++)
+               for (i = 0; i < 1000; i++)

                {
                        // We don't want to sense our own reset, so we clear here.
                        // There is of course a timing hole where we could loose
                {
                        // We don't want to sense our own reset, so we clear here.
                        // There is of course a timing hole where we could loose


@@ -179,7 +179,7 @@ void zy1000_reset(int trst, int srst)
                if (i == 1000)
                {
                        LOG_USER("SRST didn't deassert after %dms", i);
                if (i == 1000)
                {
                        LOG_USER("SRST didn't deassert after %dms", i);

-               } else if (i>1)
+               } else if (i > 1)

                {
                        LOG_USER("SRST took %dms to deassert", i);
                }
                {
                        LOG_USER("SRST took %dms to deassert", i);
                }


@@ -192,7 +192,7 @@ int zy1000_speed(int speed)
        {
                /*0 means RCLK*/
                speed = 0;
        {
                /*0 means RCLK*/
                speed = 0;

-               ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x100);
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x100);

                LOG_DEBUG("jtag_speed using RCLK");
        }
        else
                LOG_DEBUG("jtag_speed using RCLK");
        }
        else


@@ -204,8 +204,8 @@ int zy1000_speed(int speed)
                }
 
                LOG_USER("jtag_speed %d => JTAG clk=%f", speed, 64.0/(float)speed);
                }
 
                LOG_USER("jtag_speed %d => JTAG clk=%f", speed, 64.0/(float)speed);

-               ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x100);
-               ZY1000_POKE(ZY1000_JTAG_BASE+0x1c, speed&~1);
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x100);
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x1c, speed&~1);

        }
        return ERROR_OK;
 }
        }
        return ERROR_OK;
 }


@@ -218,10 +218,10 @@ static void setPower(bool power)
        savePower = power;
        if (power)
        {
        savePower = power;
        if (power)
        {

-               HAL_WRITE_UINT32(ZY1000_JTAG_BASE+0x14, 0x8);
+               HAL_WRITE_UINT32(ZY1000_JTAG_BASE + 0x14, 0x8);

        } else
        {
        } else
        {

-               HAL_WRITE_UINT32(ZY1000_JTAG_BASE+0x10, 0x8);
+               HAL_WRITE_UINT32(ZY1000_JTAG_BASE + 0x10, 0x8);

        }
 }
 
        }
 }
 


@@ -271,7 +271,7 @@ static int jim_zy1000_version(Jim_Interp *interp, int argc, Jim_Obj *const *argv
                if (strcmp("openocd", str) == 0)
                {
                        int revision;
                if (strcmp("openocd", str) == 0)
                {
                        int revision;

-                       revision = atol(ZYLIN_OPENOCD+strlen("XRevision: "));
+                       revision = atol(ZYLIN_OPENOCD + strlen("XRevision: "));

                        sprintf(buff, "%d", revision);
                        version_str = buff;
                }
                        sprintf(buff, "%d", revision);
                        version_str = buff;
                }


@@ -307,7 +307,7 @@ zylinjtag_Jim_Command_powerstatus(Jim_Interp *interp,
        }
 
        cyg_uint32 status;
        }
 
        cyg_uint32 status;

-       ZY1000_PEEK(ZY1000_JTAG_BASE+0x10, status);
+       ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, status);

 
        Jim_SetResult(interp, Jim_NewIntObj(interp, (status&0x80) != 0));
 
 
        Jim_SetResult(interp, Jim_NewIntObj(interp, (status&0x80) != 0));
 


@@ -334,7 +334,7 @@ int zy1000_init(void)
 {
        LOG_USER("%s", ZYLIN_OPENOCD_VERSION);
 
 {
        LOG_USER("%s", ZYLIN_OPENOCD_VERSION);
 

-       ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x30); // Turn on LED1 & LED2
+       ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x30); // Turn on LED1 & LED2

 
        setPower(true); // on by default
 
 
        setPower(true); // on by default
 


@@ -359,9 +359,9 @@ int interface_jtag_execute_queue(void)
        cyg_uint32 empty;
 
        waitIdle();
        cyg_uint32 empty;
 
        waitIdle();

-       ZY1000_PEEK(ZY1000_JTAG_BASE+0x10, empty);
+       ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, empty);

        /* clear JTAG error register */
        /* clear JTAG error register */

-       ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x400);
+       ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x400);

 
        if ((empty&0x400) != 0)
        {
 
        if ((empty&0x400) != 0)
        {


@@ -382,7 +382,7 @@ static cyg_uint32 getShiftValue(void)
 {
        cyg_uint32 value;
        waitIdle();
 {
        cyg_uint32 value;
        waitIdle();

-       ZY1000_PEEK(ZY1000_JTAG_BASE+0xc, value);
+       ZY1000_PEEK(ZY1000_JTAG_BASE + 0xc, value);

        VERBOSE(LOG_INFO("getShiftValue %08x", value));
        return value;
 }
        VERBOSE(LOG_INFO("getShiftValue %08x", value));
        return value;
 }


@@ -391,7 +391,7 @@ static cyg_uint32 getShiftValueFlip(void)
 {
        cyg_uint32 value;
        waitIdle();
 {
        cyg_uint32 value;
        waitIdle();

-       ZY1000_PEEK(ZY1000_JTAG_BASE+0x18, value);
+       ZY1000_PEEK(ZY1000_JTAG_BASE + 0x18, value);

        VERBOSE(LOG_INFO("getShiftValue %08x (flipped)", value));
        return value;
 }
        VERBOSE(LOG_INFO("getShiftValue %08x (flipped)", value));
        return value;
 }


@@ -404,8 +404,8 @@ static void shiftValueInnerFlip(const tap_state_t state, const tap_state_t endSt
        cyg_uint32 a,b;
        a = state;
        b = endState;
        cyg_uint32 a,b;
        a = state;
        b = endState;

-       ZY1000_POKE(ZY1000_JTAG_BASE+0xc, value);
-       ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (1 << 15)|(repeat << 8)|(a << 4)|b);
+       ZY1000_POKE(ZY1000_JTAG_BASE + 0xc, value);
+       ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (1 << 15) | (repeat << 8) | (a << 4) | b);

        VERBOSE(getShiftValueFlip());
 }
 #endif
        VERBOSE(getShiftValueFlip());
 }
 #endif


@@ -434,13 +434,13 @@ static __inline void scanFields(int num_fields, const scan_field_t *fields, tap_
 
                // here we shuffle N bits out/in
                j = 0;
 
                // here we shuffle N bits out/in
                j = 0;

-               while (j<num_bits)
+               while (j < num_bits)

                {
                        tap_state_t pause_state;
                        int l;
                        k = num_bits-j;
                        pause_state = (shiftState == TAP_DRSHIFT)?TAP_DRSHIFT:TAP_IRSHIFT;
                {
                        tap_state_t pause_state;
                        int l;
                        k = num_bits-j;
                        pause_state = (shiftState == TAP_DRSHIFT)?TAP_DRSHIFT:TAP_IRSHIFT;

-                       if (k>32)
+                       if (k > 32)

                        {
                                k = 32;
                                /* we have more to shift out */
                        {
                                k = 32;
                                /* we have more to shift out */


@@ -450,14 +450,14 @@ static __inline void scanFields(int num_fields, const scan_field_t *fields, tap_
                                pause_state = end_state;
                        }
 
                                pause_state = end_state;
                        }
 

-                       // we have (num_bits+7)/8 bytes of bits to toggle out.
+                       // we have (num_bits + 7)/8 bytes of bits to toggle out.

                        // bits are pushed out LSB to MSB
                        value = 0;
                        if (fields[i].out_value != NULL)
                        {
                        // bits are pushed out LSB to MSB
                        value = 0;
                        if (fields[i].out_value != NULL)
                        {

-                               for (l = 0; l<k; l += 8)
+                               for (l = 0; l < k; l += 8)

                                {
                                {

-                                       value|=fields[i].out_value[(j+l)/8]<<l;
+                                       value|=fields[i].out_value[(j + l)/8]<<l;

                                }
                        }
                        /* mask away unused bits for easier debugging */
                                }
                        }
                        /* mask away unused bits for easier debugging */


@@ -472,9 +472,9 @@ static __inline void scanFields(int num_fields, const scan_field_t *fields, tap_
                                // we're shifting in data to MSB, shift data to be aligned for returning the value
                                value >>= 32-k;
 
                                // we're shifting in data to MSB, shift data to be aligned for returning the value
                                value >>= 32-k;
 

-                               for (l = 0; l<k; l += 8)
+                               for (l = 0; l < k; l += 8)

                                {
                                {

-                                       inBuffer[(j+l)/8]=(value >> l)&0xff;
+                                       inBuffer[(j + l)/8]=(value >> l)&0xff;

                                }
                        }
                        j += k;
                                }
                        }
                        j += k;


@@ -517,7 +517,7 @@ int interface_jtag_add_ir_scan(int num_fields, const scan_field_t *fields, tap_s
                        {
                                found = 1;
 
                        {
                                found = 1;
 

-                               scanFields(1, fields+j, TAP_IRSHIFT, end_state);
+                               scanFields(1, fields + j, TAP_IRSHIFT, end_state);

                                /* update device information */
                                buf_cpy(fields[j].out_value, tap->cur_instr, scan_size);
 
                                /* update device information */
                                buf_cpy(fields[j].out_value, tap->cur_instr, scan_size);
 


@@ -582,7 +582,7 @@ int interface_jtag_add_dr_scan(int num_fields, const scan_field_t *fields, tap_s
                        {
                                found = 1;
 
                        {
                                found = 1;
 

-                               scanFields(1, fields+j, TAP_DRSHIFT, end_state);
+                               scanFields(1, fields + j, TAP_DRSHIFT, end_state);

                        }
                }
                if (!found)
                        }
                }
                if (!found)


@@ -634,11 +634,11 @@ static int zy1000_jtag_add_clocks(int num_cycles, tap_state_t state, tap_state_t
 
        /* execute num_cycles, 32 at the time. */
        int i;
 
        /* execute num_cycles, 32 at the time. */
        int i;

-       for (i = 0; i<num_cycles; i += 32)
+       for (i = 0; i < num_cycles; i += 32)

        {
                int num;
                num = 32;
        {
                int num;
                num = 32;

-               if (num_cycles-i<num)
+               if (num_cycles-i < num)

                {
                        num = num_cycles-i;
                }
                {
                        num = num_cycles-i;
                }


@@ -659,10 +659,10 @@ static int zy1000_jtag_add_clocks(int num_cycles, tap_state_t state, tap_state_t
        {
                tms = (tms_scan >> i) & 1;
                waitIdle();
        {
                tms = (tms_scan >> i) & 1;
                waitIdle();

-               ZY1000_POKE(ZY1000_JTAG_BASE+0x28,  tms);
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x28,  tms);

        }
        waitIdle();
        }
        waitIdle();

-       ZY1000_POKE(ZY1000_JTAG_BASE+0x20, state);
+       ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, state);

 #endif
 
 
 #endif
 
 


@@ -714,7 +714,7 @@ int interface_jtag_add_pathmove(int num_states, const tap_state_t *path)
                }
 
                waitIdle();
                }
 
                waitIdle();

-               ZY1000_POKE(ZY1000_JTAG_BASE+0x28,  tms);
+               ZY1000_POKE(ZY1000_JTAG_BASE + 0x28,  tms);

 
                cur_state = path[state_count];
                state_count++;
 
                cur_state = path[state_count];
                state_count++;


@@ -722,7 +722,7 @@ int interface_jtag_add_pathmove(int num_states, const tap_state_t *path)
        }
 
        waitIdle();
        }
 
        waitIdle();

-       ZY1000_POKE(ZY1000_JTAG_BASE+0x20,  cur_state);
+       ZY1000_POKE(ZY1000_JTAG_BASE + 0x20,  cur_state);

        return ERROR_OK;
 }
 
        return ERROR_OK;
 }
 


@@ -741,7 +741,7 @@ void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, uint8_t *buffer, int l
                        for (i = 0; i < count; i++)
                        {
                                shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, 32, fast_target_buffer_get_u32(buffer, 1));
                        for (i = 0; i < count; i++)
                        {
                                shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, 32, fast_target_buffer_get_u32(buffer, 1));

-                               shiftValueInner(TAP_DRSHIFT, end_state, 6, reg_addr|(1 << 5));
+                               shiftValueInner(TAP_DRSHIFT, end_state, 6, reg_addr | (1 << 5));

                                buffer += 4;
                        }
                } else
                                buffer += 4;
                        }
                } else


@@ -750,7 +750,7 @@ void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, uint8_t *buffer, int l
                        for (i = 0; i < count; i++)
                        {
                                shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, 32, fast_target_buffer_get_u32(buffer, 0));
                        for (i = 0; i < count; i++)
                        {
                                shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, 32, fast_target_buffer_get_u32(buffer, 0));

-                               shiftValueInner(TAP_DRSHIFT, end_state, 6, reg_addr|(1 << 5));
+                               shiftValueInner(TAP_DRSHIFT, end_state, 6, reg_addr | (1 << 5));

                                buffer += 4;
                        }
                }
                                buffer += 4;
                        }
                }