X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fzy1000%2Fjtag_minidriver.h;h=9d093ca31091f7173fa2ab808dc748c5a3db7534;hp=6b51844b67b2f8d259f30a8acdb7743fb6b3f060;hb=0f1163e823c6ca3c2a81fa296157f5dde0635fea;hpb=aea6815462d3302f7f8b6576f59320d5f5985642 diff --git a/src/jtag/zy1000/jtag_minidriver.h b/src/jtag/zy1000/jtag_minidriver.h index 6b51844b67..9d093ca310 100644 --- a/src/jtag/zy1000/jtag_minidriver.h +++ b/src/jtag/zy1000/jtag_minidriver.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2008 by Øyvind Harboe * + * Copyright (C) 2007-2008 by Øyvind Harboe * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -26,9 +26,9 @@ #define TEST_MANUAL() 0 #if 0 -int diag_printf( const char *fmt, ... ); +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,8 +40,8 @@ static __inline__ void waitIdle(void) cyg_uint32 empty; do { - ZY1000_PEEK(ZY1000_JTAG_BASE+0x10, empty); - } while ((empty & 0x100)==0); + ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, empty); + } while ((empty & 0x100) == 0); } static __inline__ void waitQueue(void) @@ -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; - if (state==TAP_RESET) + 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,62 +85,62 @@ 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)) + if ((state == TAP_DRSHIFT) && (endState != TAP_DRSHIFT)) { int i; setCurrentState(state); - for (i=0; i> 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 */ - 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. */ - for (i=0; i> 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 @@ -148,7 +148,7 @@ static __inline__ void shiftValueInner(const enum tap_state state, const enum ta -static __inline__ void interface_jtag_add_dr_out_core(jtag_tap_t *target_tap, +static __inline__ void interface_jtag_add_dr_out_core(struct jtag_tap *struct targetap, int num_fields, const int *num_bits, const uint32_t *value, @@ -156,18 +156,18 @@ 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) + struct jtag_tap *tap, *nextTap; + for (tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap = nextTap) { - nextTap=jtag_tap_next_enabled(tap); - if (nextTap==NULL) + nextTap = jtag_tap_next_enabled(tap); + if (nextTap == NULL) { pause_state = end_state; } - if (tap == target_tap) + if (tap == struct targetap) { 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]); } @@ -180,28 +180,28 @@ static __inline__ void interface_jtag_add_dr_out_core(jtag_tap_t *target_tap, } } -static __inline__ void interface_jtag_add_dr_out(jtag_tap_t *target_tap, +static __inline__ void interface_jtag_add_dr_out(struct jtag_tap *struct targetap, int num_fields, const int *num_bits, const uint32_t *value, enum tap_state end_state) { - int singletap=(jtag_tap_next_enabled(jtag_tap_next_enabled(NULL))==NULL); - if ((singletap) && (num_fields==3)) + int singletap = (jtag_tap_next_enabled(jtag_tap_next_enabled(NULL)) == NULL); + 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]); shiftValueInner(TAP_DRSHIFT, end_state, num_bits[1], value[1]); } else { - interface_jtag_add_dr_out_core(target_tap, num_fields, num_bits, value, end_state); + interface_jtag_add_dr_out_core(struct targetap, num_fields, num_bits, value, end_state); } }