From 84df52f9ea78e2d71bde648a16b69d80404c6421 Mon Sep 17 00:00:00 2001 From: zwelch Date: Tue, 23 Jun 2009 22:42:54 +0000 Subject: - Fixes '=' whitespace - Replace ')\(=\)\(\w\)' with ') \1 \2'. - Replace '\(\w\)\(=\)(' with '\1 \2 ('. - Replace '\(\w\)\(=\)\(\w\)' with '\1 \2 \3'. git-svn-id: svn://svn.berlios.de/openocd/trunk@2372 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/jtag/zy1000/jtag_minidriver.h | 28 +++++++------- src/jtag/zy1000/zy1000.c | 78 +++++++++++++++++++-------------------- 2 files changed, 53 insertions(+), 53 deletions(-) (limited to 'src/jtag/zy1000') diff --git a/src/jtag/zy1000/jtag_minidriver.h b/src/jtag/zy1000/jtag_minidriver.h index 9f24dd66..9606a2dd 100644 --- 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) @@ -62,15 +62,15 @@ 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(); @@ -85,8 +85,8 @@ 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); @@ -96,13 +96,13 @@ static __inline__ void shiftValueInner(const enum tap_state state, const enum ta { int i; setCurrentState(state); - for (i=0; i> i); @@ -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() */ diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c index 079e1b99..c5239ee8 100644 --- a/src/jtag/zy1000/zy1000.c +++ b/src/jtag/zy1000/zy1000.c @@ -51,11 +51,11 @@ static int zy1000_khz(int khz, int *jtag_speed) { if (khz == 0) { - *jtag_speed=0; + *jtag_speed = 0; } else { - *jtag_speed=64000/khz; + *jtag_speed = 64000/khz; } return ERROR_OK; } @@ -68,7 +68,7 @@ static int zy1000_speed_div(int speed, int *khz) } else { - *khz=64000/speed; + *khz = 64000/speed; } return ERROR_OK; @@ -99,13 +99,13 @@ static bool readSRST(void) static int zy1000_srst_asserted(int *srst_asserted) { - *srst_asserted=readSRST(); + *srst_asserted = readSRST(); return ERROR_OK; } static int zy1000_power_dropout(int *dropout) { - *dropout=readPowerDropout(); + *dropout = readPowerDropout(); return ERROR_OK; } @@ -164,7 +164,7 @@ void zy1000_reset(int trst, int srst) 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 @@ -260,11 +260,11 @@ static int jim_zy1000_version(Jim_Interp *interp, int argc, Jim_Obj *const *argv if ((argc < 1) || (argc > 2)) return JIM_ERR; char buff[128]; - const char *version_str=NULL; + const char *version_str = NULL; if (argc == 1) { - version_str=ZYLIN_OPENOCD_VERSION; + version_str = ZYLIN_OPENOCD_VERSION; } else { const char *str = Jim_GetString(argv[1], NULL); @@ -273,15 +273,15 @@ static int jim_zy1000_version(Jim_Interp *interp, int argc, Jim_Obj *const *argv int revision; revision = atol(ZYLIN_OPENOCD+strlen("XRevision: ")); sprintf(buff, "%d", revision); - version_str=buff; + version_str = buff; } else if (strcmp("zy1000", str) == 0) { - version_str=ZYLIN_VERSION; + version_str = ZYLIN_VERSION; } else if (strcmp("date", str) == 0) { - version_str=ZYLIN_DATE; + version_str = ZYLIN_DATE; } else { @@ -402,8 +402,8 @@ static void shiftValueInnerFlip(const tap_state_t state, const tap_state_t endSt { VERBOSE(LOG_INFO("shiftValueInner %s %s %d %08x (flipped)", tap_state_name(state), tap_state_name(endState), repeat, value)); cyg_uint32 a,b; - a=state; - b=endState; + a = state; + b = endState; ZY1000_POKE(ZY1000_JTAG_BASE+0xc, value); ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (1 << 15)|(repeat << 8)|(a << 4)|b); VERBOSE(getShiftValueFlip()); @@ -422,40 +422,40 @@ static __inline void scanFields(int num_fields, const scan_field_t *fields, tap_ { cyg_uint32 value; - uint8_t *inBuffer=NULL; + uint8_t *inBuffer = NULL; // figure out where to store the input data - int num_bits=fields[i].num_bits; + int num_bits = fields[i].num_bits; if (fields[i].in_value != NULL) { - inBuffer=fields[i].in_value; + inBuffer = fields[i].in_value; } // here we shuffle N bits out/in - j=0; + j = 0; while (j32) { - k=32; + k = 32; /* we have more to shift out */ } else if (i == num_fields-1) { /* this was the last to shift out this time */ - pause_state=end_state; + pause_state = end_state; } // we have (num_bits+7)/8 bytes of bits to toggle out. // bits are pushed out LSB to MSB - value=0; + value = 0; if (fields[i].out_value != NULL) { - for (l=0; l>= 32-k; - for (l=0; l> l)&0xff; } @@ -494,9 +494,9 @@ int interface_jtag_add_ir_scan(int num_fields, const scan_field_t *fields, tap_s int j; int scan_size = 0; 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); tap_state_t end_state; if (nextTap == NULL) { @@ -511,7 +511,7 @@ int interface_jtag_add_ir_scan(int num_fields, const scan_field_t *fields, tap_s scan_size = tap->ir_length; /* search the list */ - for (j=0; j < num_fields; j++) + for (j = 0; j < num_fields; j++) { if (tap == fields[j].tap) { @@ -563,10 +563,10 @@ int interface_jtag_add_dr_scan(int num_fields, const scan_field_t *fields, tap_s int j; 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); - int found=0; + nextTap = jtag_tap_next_enabled(tap); + int found = 0; tap_state_t end_state; if (nextTap == NULL) { @@ -576,7 +576,7 @@ int interface_jtag_add_dr_scan(int num_fields, const scan_field_t *fields, tap_s end_state = TAP_DRSHIFT; } - for (j=0; j < num_fields; j++) + for (j = 0; j < num_fields; j++) { if (tap == fields[j].tap) { @@ -634,13 +634,13 @@ 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; - for (i=0; i