From 95d2a2372421aeddae01f1af51279ab7989e46b5 Mon Sep 17 00:00:00 2001 From: zwelch Date: Tue, 23 Jun 2009 22:37:21 +0000 Subject: [PATCH] - Replace 'for(' with 'for ('. git-svn-id: svn://svn.berlios.de/openocd/trunk@2360 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/flash/cfi.c | 4 ++-- src/flash/flash.c | 4 ++-- src/flash/nand_ecc.c | 2 +- src/flash/pic32mx.c | 4 ++-- src/helper/jim.c | 8 ++++---- src/helper/options.c | 2 +- src/jtag/core.c | 4 ++-- src/jtag/interface.c | 6 +++--- src/jtag/rlink/rlink.c | 24 ++++++++++++------------ src/jtag/tcl.c | 2 +- src/jtag/zy1000/jtag_minidriver.h | 2 +- src/jtag/zy1000/zy1000.c | 4 ++-- src/server/gdb_server.c | 2 +- src/target/mips_m4k.c | 4 ++-- src/target/target.c | 22 +++++++++++----------- src/target/xscale.c | 4 ++-- src/xsvf/xsvf.c | 4 ++-- testing/examples/PIC32/BlinkingLeds.c | 6 +++--- 18 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/flash/cfi.c b/src/flash/cfi.c index 529890740..f6ddead30 100644 --- a/src/flash/cfi.c +++ b/src/flash/cfi.c @@ -212,7 +212,7 @@ static uint16_t cfi_query_u16(flash_bank_t *bank, int sector, uint32_t offset) if (cfi_info->x16_as_x8) { uint8_t i; - for(i=0;i<2;i++) + for (i=0;i<2;i++) target_read_memory(target, flash_address(bank, sector, offset+i), bank->bus_width, 1, &data[i*bank->bus_width] ); } @@ -234,7 +234,7 @@ static uint32_t cfi_query_u32(flash_bank_t *bank, int sector, uint32_t offset) if (cfi_info->x16_as_x8) { uint8_t i; - for(i=0;i<4;i++) + for (i=0;i<4;i++) target_read_memory(target, flash_address(bank, sector, offset+i), bank->bus_width, 1, &data[i*bank->bus_width] ); } diff --git a/src/flash/flash.c b/src/flash/flash.c index 02505b038..796af7152 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -770,13 +770,13 @@ static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cm switch (wordsize) { case 4: - for(i = 0; i < chunk_count; i++) + for (i = 0; i < chunk_count; i++) { target_buffer_set_u32(target, chunk + i * wordsize, pattern); } break; case 2: - for(i = 0; i < chunk_count; i++) + for (i = 0; i < chunk_count; i++) { target_buffer_set_u16(target, chunk + i * wordsize, pattern); } diff --git a/src/flash/nand_ecc.c b/src/flash/nand_ecc.c index 567e3b380..c154d6979 100644 --- a/src/flash/nand_ecc.c +++ b/src/flash/nand_ecc.c @@ -77,7 +77,7 @@ int nand_calculate_ecc(struct nand_device_s *device, const uint8_t *dat, uint8_t reg1 = reg2 = reg3 = 0; /* Build up column parity */ - for(i = 0; i < 256; i++) { + for (i = 0; i < 256; i++) { /* Get CP0 - CP5 from table */ idx = nand_ecc_precalc_table[*dat++]; reg1 ^= (idx & 0x3f); diff --git a/src/flash/pic32mx.c b/src/flash/pic32mx.c index 378d9b242..65bdef1c4 100644 --- a/src/flash/pic32mx.c +++ b/src/flash/pic32mx.c @@ -620,7 +620,7 @@ static int pic32mx_probe(struct flash_bank_s *bank) num_pages = 12; } else { /* 0xBD000000: Program flash size varies with device */ - for(i=0; pic32mx_devs[i].name != NULL; i++) + for (i=0; pic32mx_devs[i].name != NULL; i++) if (pic32mx_devs[i].devid == ((device_id >> 12) & 0xff)) { num_pages = pic32mx_devs[i].pfm_size; break; @@ -704,7 +704,7 @@ static int pic32mx_info(struct flash_bank_s *bank, char *buf, int buf_size) PIC32MX_MANUF_ID); return ERROR_FLASH_OPERATION_FAILED; } - for(i=0; pic32mx_devs[i].name != NULL; i++) + for (i=0; pic32mx_devs[i].name != NULL; i++) if (pic32mx_devs[i].devid == ((device_id >> 12) & 0xff)) { printed = snprintf(buf, buf_size, "PIC32MX%s", pic32mx_devs[i].name); break; diff --git a/src/helper/jim.c b/src/helper/jim.c index 84ac39b5e..ab0b18c6c 100644 --- a/src/helper/jim.c +++ b/src/helper/jim.c @@ -504,7 +504,7 @@ static jim_wide JimPowWide(jim_wide b, jim_wide e) { jim_wide i, res = 1; if ((b==0 && e!=0) || (e<0)) return 0; - for(i=0; iinterp, p->interp->cookie_stderr, "---args---\n"); - for( x = 0 ; x < p->argc ; x++ ){ + for ( x = 0 ; x < p->argc ; x++ ){ Jim_fprintf( p->interp, p->interp->cookie_stderr, "%2d) %s\n", x, @@ -12823,7 +12823,7 @@ Jim_Debug_ArgvString( Jim_Interp *interp, int argc, Jim_Obj *const *argv ) } debug_string_obj = Jim_NewEmptyStringObj( interp ); - for( x = 0 ; x < argc ; x++ ){ + for ( x = 0 ; x < argc ; x++ ){ Jim_AppendStrings( interp, debug_string_obj, Jim_GetString( argv[x], NULL ), diff --git a/src/helper/options.c b/src/helper/options.c index c48939e5a..23491d3f5 100644 --- a/src/helper/options.c +++ b/src/helper/options.c @@ -90,7 +90,7 @@ int add_default_dirs(void) GetModuleFileName (NULL, strExePath, MAX_PATH); *strrchr(strExePath, '\\')=0; strcat(strExePath, "/../lib/"PACKAGE); - for(p=strExePath; *p; p++) { + for (p=strExePath; *p; p++) { if (*p == '\\') *p = '/'; } diff --git a/src/jtag/core.c b/src/jtag/core.c index dd5c0a0e2..6ebddfc78 100644 --- a/src/jtag/core.c +++ b/src/jtag/core.c @@ -1024,7 +1024,7 @@ int jtag_validate_chain(void) tap = NULL; total_ir_length = 0; - for(;;){ + for (;;){ tap = jtag_tap_next_enabled(tap); if ( tap == NULL ){ break; @@ -1048,7 +1048,7 @@ int jtag_validate_chain(void) tap = NULL; chain_pos = 0; int val; - for(;;){ + for (;;){ tap = jtag_tap_next_enabled(tap); if ( tap == NULL ){ break; diff --git a/src/jtag/interface.c b/src/jtag/interface.c index e35d3557e..6a45d5939 100644 --- a/src/jtag/interface.c +++ b/src/jtag/interface.c @@ -359,7 +359,7 @@ tap_state_t tap_state_by_name(const char *name) { tap_state_t x; - for( x = 0 ; x < TAP_NUM_STATES ; x++ ){ + for ( x = 0 ; x < TAP_NUM_STATES ; x++ ){ /* be nice to the human */ if ( 0 == strcasecmp( name, tap_state_name(x) ) ){ return x; @@ -403,9 +403,9 @@ tap_state_t jtag_debug_state_machine(const void *tms_buf, const void *tdi_buf, DEBUG_JTAG_IO("TAP/SM: TMS bits: %u (bytes: %u)", tap_bits, tap_bytes); tap_out_bits = 0; - for(cur_byte = 0; cur_byte < tap_bytes; cur_byte++) + for (cur_byte = 0; cur_byte < tap_bytes; cur_byte++) { - for(cur_bit = 0; cur_bit < 8; cur_bit++) + for (cur_bit = 0; cur_bit < 8; cur_bit++) { // make sure we do not run off the end of the buffers unsigned tap_bit = cur_byte * 8 + cur_bit; diff --git a/src/jtag/rlink/rlink.c b/src/jtag/rlink/rlink.c index aa6eb6c07..11381d68b 100644 --- a/src/jtag/rlink/rlink.c +++ b/src/jtag/rlink/rlink.c @@ -518,7 +518,7 @@ dtc_run_download( /* Wait for DTC to finish running command buffer */ - for(i = 10;;) { + for (i = 10;;) { usb_err = ep1_generic_commandl( pHDev, 4, @@ -711,7 +711,7 @@ dtc_queue_run(void) { /* The rigamarole with the masks and doing it bit-by-bit is due to the fact that the scan buffer is LSb-first and the DTC code is MSb-first for hardware reasons. It was that or craft a function to do the reversal, and that wouldn't work with bit-stuffing (supplying extra bits to use mostly byte operations), or any other scheme which would throw the byte alignment off. */ - for( + for ( rq_p = dtc_queue.rq_head; rq_p != NULL; rq_p = rq_next @@ -726,7 +726,7 @@ dtc_queue_run(void) { dtc_mask = 1 << (8 - 1); - for( + for ( ; bit_cnt; bit_cnt-- @@ -764,7 +764,7 @@ dtc_queue_run(void) { dtc_mask = 1 << (bit_cnt - 1); } - for( + for ( ; bit_cnt; bit_cnt-- @@ -834,7 +834,7 @@ tap_state_queue_run(void) { if (!tap_state_queue.length) return(retval); bits = 1; byte = 0; - for(i = tap_state_queue.length; i--;) { + for (i = tap_state_queue.length; i--;) { byte <<= 1; if (tap_state_queue.buffer & 1) { @@ -1140,7 +1140,7 @@ rlink_scan( buffer[scan_size / 8] &= ((1 << ((scan_size - 1) % 8) + 1) - 1); printf("before scan:"); - for(i = 0; i < (scan_size + 7) / 8; i++) { + for (i = 0; i < (scan_size + 7) / 8; i++) { printf(" %02x", buffer[i]); } printf("\n"); @@ -1503,7 +1503,7 @@ int rlink_speed(int speed) speed = rlink_speed_table[rlink_speed_table_size - 1].prescaler; } - for(i = rlink_speed_table_size; i--; ) { + for (i = rlink_speed_table_size; i--; ) { if (rlink_speed_table[i].prescaler == speed) { if (dtc_load_from_buffer(pHDev, rlink_speed_table[i].dtc, rlink_speed_table[i].dtc_size) != 0) { LOG_ERROR("An error occurred while trying to load DTC code for speed \"%d\".\n", speed); @@ -1534,7 +1534,7 @@ int rlink_speed_div( ) { int i; - for(i = rlink_speed_table_size; i--; ) { + for (i = rlink_speed_table_size; i--; ) { if (rlink_speed_table[i].prescaler == speed) { *khz = rlink_speed_table[i].khz; return(ERROR_OK); @@ -1558,7 +1558,7 @@ int rlink_khz( return ERROR_FAIL; } - for(i = rlink_speed_table_size; i--; ) { + for (i = rlink_speed_table_size; i--; ) { if (rlink_speed_table[i].khz <= khz) { *speed = rlink_speed_table[i].prescaler; return(ERROR_OK); @@ -1630,11 +1630,11 @@ int rlink_init(void) busses = usb_get_busses(); - for(bus = busses; bus; bus = bus->next) + for (bus = busses; bus; bus = bus->next) { struct usb_device *dev; - for(dev = bus->devices; dev; dev = dev->next) + for (dev = bus->devices; dev; dev = dev->next) { if ( (dev->descriptor.idVendor == USB_IDVENDOR) && (dev->descriptor.idProduct == USB_IDPRODUCT) ) { @@ -1715,7 +1715,7 @@ int rlink_init(void) /* The device starts out in an unknown state on open. As such, result reads time out, and it's not even known whether the command was accepted. So, for this first command, we issue it repeatedly until its response doesn't time out. Also, if sending a command is going to time out, we'll find that out here. */ /* It must be possible to open the device in such a way that this special magic isn't needed, but, so far, it escapes us. */ - for(i = 0; i < 5; i++) { + for (i = 0; i < 5; i++) { j = ep1_generic_commandl( pHDev, 1, EP1_CMD_GET_FWREV diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c index c0498abfa..d09e78123 100644 --- a/src/jtag/tcl.c +++ b/src/jtag/tcl.c @@ -1181,7 +1181,7 @@ static int handle_irscan_command(struct command_context_s *cmd_ctx, char *cmd, c const char *cpA; const char *cpS; cpA = args[ argc-1 ]; - for( endstate = 0 ; endstate < TAP_NUM_STATES ; endstate++ ){ + for ( endstate = 0 ; endstate < TAP_NUM_STATES ; endstate++ ){ cpS = tap_state_name( endstate ); if ( 0 == strcmp( cpA, cpS ) ){ break; diff --git a/src/jtag/zy1000/jtag_minidriver.h b/src/jtag/zy1000/jtag_minidriver.h index 28d1201f5..496dfd202 100644 --- a/src/jtag/zy1000/jtag_minidriver.h +++ b/src/jtag/zy1000/jtag_minidriver.h @@ -157,7 +157,7 @@ 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); if (nextTap==NULL) diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c index 3425a4f06..8f9b774f8 100644 --- a/src/jtag/zy1000/zy1000.c +++ b/src/jtag/zy1000/zy1000.c @@ -494,7 +494,7 @@ 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); tap_state_t end_state; @@ -563,7 +563,7 @@ 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; diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index bf11be1a0..09603b38f 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -2041,7 +2041,7 @@ int gdb_input_inner(connection_t *connection) // binary packets spew junk into the debug log stream char buf[ 50 ]; int x; - for( x = 0 ; (x < 49) && (packet[x] != ':') ; x++ ){ + for ( x = 0 ; (x < 49) && (packet[x] != ':') ; x++ ){ buf[x] = packet[x]; } buf[x] = 0; diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c index c1b279b8b..e4259ae63 100644 --- a/src/target/mips_m4k.c +++ b/src/target/mips_m4k.c @@ -763,7 +763,7 @@ int mips_m4k_read_memory(struct target_s *target, uint32_t address, uint32_t siz uint32_t i, t32; uint16_t t16; - for(i = 0; i < (count*size); i += size) + for (i = 0; i < (count*size); i += size) { switch (size) { @@ -808,7 +808,7 @@ int mips_m4k_write_memory(struct target_s *target, uint32_t address, uint32_t si uint32_t i, t32; uint16_t t16; - for(i = 0; i < (count*size); i += size) + for (i = 0; i < (count*size); i += size) { switch (size) { diff --git a/src/target/target.c b/src/target/target.c index a427c66af..159464502 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -3829,7 +3829,7 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv ) b = 1; break; } - for( x = 0 ; x < c ; x++ ){ + for ( x = 0 ; x < c ; x++ ){ e = target_write_memory( target, a, b, 1, target_buf ); if ( e != ERROR_OK ){ Jim_SetResult_sprintf( interp, "Error writing @ 0x%08x: %d\n", (int)(a), e ); @@ -3895,36 +3895,36 @@ static int tcl_target_func( Jim_Interp *interp, int argc, Jim_Obj *const *argv ) Jim_fprintf( interp, interp->cookie_stdout, "0x%08x ", (int)(a) ); switch ( b ){ case 4: - for( x = 0 ; (x < 16) && (x < y) ; x += 4 ){ + for ( x = 0 ; (x < 16) && (x < y) ; x += 4 ){ z = target_buffer_get_u32( target, &(target_buf[ x * 4 ]) ); Jim_fprintf( interp, interp->cookie_stdout, "%08x ", (int)(z) ); } - for( ; (x < 16) ; x += 4 ){ + for ( ; (x < 16) ; x += 4 ){ Jim_fprintf( interp, interp->cookie_stdout, " " ); } break; case 2: - for( x = 0 ; (x < 16) && (x < y) ; x += 2 ){ + for ( x = 0 ; (x < 16) && (x < y) ; x += 2 ){ z = target_buffer_get_u16( target, &(target_buf[ x * 2 ]) ); Jim_fprintf( interp, interp->cookie_stdout, "%04x ", (int)(z) ); } - for( ; (x < 16) ; x += 2 ){ + for ( ; (x < 16) ; x += 2 ){ Jim_fprintf( interp, interp->cookie_stdout, " " ); } break; case 1: default: - for( x = 0 ; (x < 16) && (x < y) ; x += 1 ){ + for ( x = 0 ; (x < 16) && (x < y) ; x += 1 ){ z = target_buffer_get_u8( target, &(target_buf[ x * 4 ]) ); Jim_fprintf( interp, interp->cookie_stdout, "%02x ", (int)(z) ); } - for( ; (x < 16) ; x += 1 ){ + for ( ; (x < 16) ; x += 1 ){ Jim_fprintf( interp, interp->cookie_stdout, " " ); } break; } /* ascii-ify the bytes */ - for( x = 0 ; x < y ; x++ ){ + for ( x = 0 ; x < y ; x++ ){ if ( (target_buf[x] >= 0x20) && (target_buf[x] <= 0x7e) ){ /* good */ @@ -4132,7 +4132,7 @@ static int target_create( Jim_GetOptInfo *goi ) e = Jim_GetOpt_String( goi, &cp2, NULL ); cp = cp2; /* now does target type exist */ - for( x = 0 ; target_types[x] ; x++ ){ + for ( x = 0 ; target_types[x] ; x++ ){ if ( 0 == strcmp( cp, target_types[x]->name ) ){ /* found */ break; @@ -4140,7 +4140,7 @@ static int target_create( Jim_GetOptInfo *goi ) } if ( target_types[x] == NULL ){ Jim_SetResult_sprintf( goi->interp, "Unknown target type %s, try one of ", cp ); - for( x = 0 ; target_types[x] ; x++ ){ + for ( x = 0 ; target_types[x] ; x++ ){ if ( target_types[x+1] ){ Jim_AppendStrings( goi->interp, Jim_GetResult(goi->interp), @@ -4313,7 +4313,7 @@ static int jim_target( Jim_Interp *interp, int argc, Jim_Obj *const *argv ) return JIM_ERR; } Jim_SetResult( goi.interp, Jim_NewListObj( goi.interp, NULL, 0 ) ); - for( x = 0 ; target_types[x] ; x++ ){ + for ( x = 0 ; target_types[x] ; x++ ){ Jim_ListAppendElement( goi.interp, Jim_GetResult(goi.interp), Jim_NewStringObj( goi.interp, target_types[x]->name, -1 ) ); diff --git a/src/target/xscale.c b/src/target/xscale.c index 1e20afaa0..e9c1d5444 100644 --- a/src/target/xscale.c +++ b/src/target/xscale.c @@ -1783,7 +1783,7 @@ int xscale_full_context(target_t *target) * we can't enter User mode on an XScale (unpredictable), * but User shares registers with SYS */ - for(i = 1; i < 7; i++) + for (i = 1; i < 7; i++) { int valid = 1; @@ -1855,7 +1855,7 @@ int xscale_restore_context(target_t *target) * we can't enter User mode on an XScale (unpredictable), * but User shares registers with SYS */ - for(i = 1; i < 7; i++) + for (i = 1; i < 7; i++) { int dirty = 0; diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c index f0213c3e8..f4c5df629 100644 --- a/src/xsvf/xsvf.c +++ b/src/xsvf/xsvf.c @@ -366,7 +366,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha LOG_DEBUG("%s %d", op_name, xsdrsize); - for( attempt=0; attempt