From 8959de9f679cfd0436d731fd91b88a68b9a75fa6 Mon Sep 17 00:00:00 2001 From: zwelch Date: Tue, 23 Jun 2009 22:44:17 +0000 Subject: - Fixes '+' whitespace - Replace ')\(+\)(' with ') \1 ('. - 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@2373 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/jtag/arm-jtag-ew.c | 10 +++--- src/jtag/ft2232.c | 2 +- src/jtag/jlink.c | 2 +- src/jtag/jtag.h | 2 +- src/jtag/presto.c | 2 +- src/jtag/tcl.c | 14 ++++----- src/jtag/vsllink.c | 2 +- src/jtag/zy1000/jtag_minidriver.h | 30 +++++++++--------- src/jtag/zy1000/zy1000.c | 66 +++++++++++++++++++-------------------- 9 files changed, 65 insertions(+), 65 deletions(-) (limited to 'src/jtag') diff --git a/src/jtag/arm-jtag-ew.c b/src/jtag/arm-jtag-ew.c index 7616fe70..3068a15f 100644 --- a/src/jtag/arm-jtag-ew.c +++ b/src/jtag/arm-jtag-ew.c @@ -207,7 +207,7 @@ static int armjtagew_speed(int speed) usb_out_buffer[0] = CMD_SET_TCK_FREQUENCY; - buf_set_u32(usb_out_buffer+1, 0, 32, speed); + buf_set_u32(usb_out_buffer + 1, 0, 32, speed); result = armjtagew_usb_message(armjtagew_jtag_handle, 4, 4); @@ -500,7 +500,7 @@ static int armjtagew_get_version_info(void) /* query hardware version */ usb_out_buffer[0] = CMD_GET_VERSION; - result = armjtagew_usb_message(armjtagew_jtag_handle, 1, 4+15+256); + result = armjtagew_usb_message(armjtagew_jtag_handle, 1, 4 + 15 + 256); if (result != 0) { @@ -509,9 +509,9 @@ static int armjtagew_get_version_info(void) } - memcpy(sn, usb_in_buffer+4, 15); + memcpy(sn, usb_in_buffer + 4, 15); sn[15] = '\0'; - memcpy(auxinfo, usb_in_buffer+4+15, 256); + memcpy(auxinfo, usb_in_buffer + 4+15, 256); auxinfo[256] = '\0'; LOG_INFO("ARM-JTAG-EW firmware version %d.%d, hardware revision %c, SN=%s, Additional info: %s", \ @@ -651,7 +651,7 @@ static int armjtagew_tap_execute(void) byte_length = tap_length / 8; usb_out_buffer[0] = CMD_TAP_SHIFT; - buf_set_u32(usb_out_buffer+1, 0, 16, byte_length); + buf_set_u32(usb_out_buffer + 1, 0, 16, byte_length); tms_offset = 3; for (i = 0; i < byte_length; i++) diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c index 80de04f9..c56d309e 100644 --- a/src/jtag/ft2232.c +++ b/src/jtag/ft2232.c @@ -188,7 +188,7 @@ static jtag_command_t* first_unsent; /* next command that has to be sent static int require_send; -/* http://urjtag.wiki.sourceforge.net/Cable+FT2232 says: +/* http://urjtag.wiki.sourceforge.net/Cable + FT2232 says: "There is a significant difference between libftdi and libftd2xx. The latter one allows to schedule up to 64*64 bytes of result data while libftdi fails diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c index bab1a31c..42787db1 100644 --- a/src/jtag/jlink.c +++ b/src/jtag/jlink.c @@ -50,7 +50,7 @@ static unsigned int jlink_hw_jtag_version = 2; //#define JLINK_TAP_BUFFER_SIZE 384 #define JLINK_IN_BUFFER_SIZE 2048 -#define JLINK_OUT_BUFFER_SIZE 2*2048+4 +#define JLINK_OUT_BUFFER_SIZE 2*2048 + 4 #define JLINK_EMU_RESULT_BUFFER_SIZE 64 /* Global USB buffers */ diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index 37adac76..1564ca65 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -633,7 +633,7 @@ extern void jtag_execute_queue_noclear(void); int jtag_get_flush_queue_count(void); -/* can be implemented by hw+sw */ +/* can be implemented by hw + sw */ extern int jtag_power_dropout(int* dropout); extern int jtag_srst_asserted(int* srst_asserted); diff --git a/src/jtag/presto.c b/src/jtag/presto.c index b1ca3bdd..fceae34a 100644 --- a/src/jtag/presto.c +++ b/src/jtag/presto.c @@ -712,7 +712,7 @@ static int presto_jtag_khz(int khz, int *jtag_speed) } if (khz >= 3000) *jtag_speed = 0; - else *jtag_speed = (1000+khz-1)/khz; + else *jtag_speed = (1000 + khz-1)/khz; return 0; } diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c index 64396df9..d3bd72d1 100644 --- a/src/jtag/tcl.c +++ b/src/jtag/tcl.c @@ -532,7 +532,7 @@ static int jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv context = Jim_GetAssocData(interp, "context"); /* go past the command */ - Jim_GetOpt_Setup( &goi, interp, argc-1, argv+1 ); + Jim_GetOpt_Setup( &goi, interp, argc-1, argv + 1 ); e = Jim_GetOpt_Nvp( &goi, jtag_cmds, &n ); if ( e != JIM_OK ){ @@ -1286,7 +1286,7 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args } /* Not valid.. are we at the end? */ - if ( ((i+2) != argc) ){ + if ( ((i + 2) != argc) ){ /* nope, then error */ return e; } @@ -1301,7 +1301,7 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args /* is it the magic? */ if ( 0 == strcmp( "-endstate", cp ) ){ /* is the statename valid? */ - cp = Jim_GetString( args[i+1], NULL ); + cp = Jim_GetString( args[i + 1], NULL ); /* see if it is a valid state name */ endstate = tap_state_by_name(cp); @@ -1340,7 +1340,7 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args const char *str; Jim_GetLong(interp, args[i], &bits); - str = Jim_GetString(args[i+1], &len); + str = Jim_GetString(args[i + 1], &len); fields[field_count].tap = tap; fields[field_count].num_bits = bits; @@ -1387,7 +1387,7 @@ static int Jim_Command_pathmove(Jim_Interp *interp, int argc, Jim_Obj *const *ar { tap_state_t states[8]; - if ((argc < 2) || ((size_t)argc > (sizeof(states)/sizeof(*states)+1))) + if ((argc < 2) || ((size_t)argc > (sizeof(states)/sizeof(*states) + 1))) { Jim_WrongNumArgs(interp, 1, args, "wrong arguments"); return JIM_ERR; @@ -1399,7 +1399,7 @@ static int Jim_Command_pathmove(Jim_Interp *interp, int argc, Jim_Obj *const *ar for (i = 0; i> ((len_all+i)%8)) & 1); + vsllink_tap_append_step(((len_all + i) < length-1 ? 0 : 1), (buffer[(len_all + i)/8] >> ((len_all + i)%8)) & 1); } pending_scan_results_length++; diff --git a/src/jtag/zy1000/jtag_minidriver.h b/src/jtag/zy1000/jtag_minidriver.h index 9606a2dd..66debe39 100644 --- a/src/jtag/zy1000/jtag_minidriver.h +++ b/src/jtag/zy1000/jtag_minidriver.h @@ -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 } @@ -74,7 +74,7 @@ static void setCurrentState(enum tap_state state) } waitQueue(); sampleShiftRegister(); - ZY1000_POKE(ZY1000_JTAG_BASE+0x8, (repeat << 8)|(a << 4)|a); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (repeat << 8)|(a << 4)|a); } @@ -89,7 +89,7 @@ static __inline__ void shiftValueInner(const enum tap_state state, const enum ta 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)) @@ -106,21 +106,21 @@ static __inline__ void shiftValueInner(const enum tap_state state, const enum ta } /* 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 */ @@ -131,16 +131,16 @@ static __inline__ void shiftValueInner(const enum tap_state state, const enum ta 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 diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c index c5239ee8..17620371 100644 --- 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 - 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; @@ -90,8 +90,8 @@ static bool readSRST(void) { 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; @@ -129,35 +129,35 @@ void zy1000_reset(int trst, int 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. */ - ZY1000_POKE(ZY1000_JTAG_BASE+0x10, 0x00000001); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x00000001); } if (!trst) { - ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x00000002); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x00000002); } 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 */ - 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 */ - ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x400); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x400); } /* wait for srst to float back up */ @@ -192,7 +192,7 @@ int zy1000_speed(int speed) { /*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 @@ -204,8 +204,8 @@ int zy1000_speed(int 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; } @@ -218,10 +218,10 @@ static void setPower(bool power) savePower = power; if (power) { - HAL_WRITE_UINT32(ZY1000_JTAG_BASE+0x14, 0x8); + HAL_WRITE_UINT32(ZY1000_JTAG_BASE + 0x14, 0x8); } 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; - revision = atol(ZYLIN_OPENOCD+strlen("XRevision: ")); + revision = atol(ZYLIN_OPENOCD + strlen("XRevision: ")); sprintf(buff, "%d", revision); version_str = buff; } @@ -307,7 +307,7 @@ zylinjtag_Jim_Command_powerstatus(Jim_Interp *interp, } 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)); @@ -334,7 +334,7 @@ int zy1000_init(void) { 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 @@ -359,9 +359,9 @@ int interface_jtag_execute_queue(void) cyg_uint32 empty; waitIdle(); - ZY1000_PEEK(ZY1000_JTAG_BASE+0x10, empty); + ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, empty); /* clear JTAG error register */ - ZY1000_POKE(ZY1000_JTAG_BASE+0x14, 0x400); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x400); if ((empty&0x400) != 0) { @@ -382,7 +382,7 @@ static cyg_uint32 getShiftValue(void) { 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; } @@ -391,7 +391,7 @@ static cyg_uint32 getShiftValueFlip(void) { 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; } @@ -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; - 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 @@ -450,14 +450,14 @@ static __inline void scanFields(int num_fields, const scan_field_t *fields, tap_ 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) { for (l = 0; l> l)&0xff; + inBuffer[(j + l)/8]=(value >> l)&0xff; } } j += k; @@ -517,7 +517,7 @@ int interface_jtag_add_ir_scan(int num_fields, const scan_field_t *fields, tap_s { 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); @@ -582,7 +582,7 @@ int interface_jtag_add_dr_scan(int num_fields, const scan_field_t *fields, tap_s { found = 1; - scanFields(1, fields+j, TAP_DRSHIFT, end_state); + scanFields(1, fields + j, TAP_DRSHIFT, end_state); } } if (!found) @@ -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(); - ZY1000_POKE(ZY1000_JTAG_BASE+0x28, tms); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, tms); } waitIdle(); - ZY1000_POKE(ZY1000_JTAG_BASE+0x20, state); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, state); #endif @@ -714,7 +714,7 @@ int interface_jtag_add_pathmove(int num_states, const tap_state_t *path) } waitIdle(); - ZY1000_POKE(ZY1000_JTAG_BASE+0x28, tms); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, tms); 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(); - ZY1000_POKE(ZY1000_JTAG_BASE+0x20, cur_state); + ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, cur_state); return ERROR_OK; } -- cgit v1.2.3