summaryrefslogtreecommitdiff
path: root/src/jtag
diff options
context:
space:
mode:
authorzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-06-23 22:45:47 +0000
committerzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-06-23 22:45:47 +0000
commit6d1d58a1fc3dfd60e9cac89460b5a6e438d11efa (patch)
tree9f1465d0768f8fde40053f539296f895d7e4e0ac /src/jtag
parentfb1a9b2cb2f844a17d26dfeb3d26849364d93e26 (diff)
downloadopenocd+libswd-6d1d58a1fc3dfd60e9cac89460b5a6e438d11efa.tar.gz
openocd+libswd-6d1d58a1fc3dfd60e9cac89460b5a6e438d11efa.tar.bz2
openocd+libswd-6d1d58a1fc3dfd60e9cac89460b5a6e438d11efa.tar.xz
openocd+libswd-6d1d58a1fc3dfd60e9cac89460b5a6e438d11efa.zip
- 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@2375 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag')
-rw-r--r--src/jtag/bitq.c16
-rw-r--r--src/jtag/ft2232.c2
-rw-r--r--src/jtag/gw16012.c2
-rw-r--r--src/jtag/parport.c6
-rw-r--r--src/jtag/presto.c6
-rw-r--r--src/jtag/tcl.c2
-rw-r--r--src/jtag/zy1000/jtag_minidriver.h8
-rw-r--r--src/jtag/zy1000/zy1000.c16
8 files changed, 29 insertions, 29 deletions
diff --git a/src/jtag/bitq.c b/src/jtag/bitq.c
index e843733c..2a153b2f 100644
--- a/src/jtag/bitq.c
+++ b/src/jtag/bitq.c
@@ -54,7 +54,7 @@ void bitq_in_proc(void)
if (bitq_in_state.cmd->type == JTAG_SCAN)
{
/* loop through the fields */
- while (bitq_in_state.field_idx<bitq_in_state.cmd->cmd.scan->num_fields)
+ while (bitq_in_state.field_idx < bitq_in_state.cmd->cmd.scan->num_fields)
{
field = &bitq_in_state.cmd->cmd.scan->fields[bitq_in_state.field_idx];
if (field->in_value)
@@ -69,7 +69,7 @@ void bitq_in_proc(void)
else
{
/* buffer reallocation needed? */
- if (field->num_bits>bitq_in_bufsize * 8)
+ if (field->num_bits > bitq_in_bufsize * 8)
{
/* buffer previously allocated? */
if (bitq_in_buffer != NULL)
@@ -79,7 +79,7 @@ void bitq_in_proc(void)
bitq_in_buffer = NULL;
}
/* double the buffer size until it fits */
- while (field->num_bits>bitq_in_bufsize * 8)
+ while (field->num_bits > bitq_in_bufsize * 8)
bitq_in_bufsize *= 2;
}
/* if necessary, allocate buffer and check for malloc error */
@@ -93,9 +93,9 @@ void bitq_in_proc(void)
}
/* field scanning */
- while (bitq_in_state.bit_pos<field->num_bits)
+ while (bitq_in_state.bit_pos < field->num_bits)
{
- if ( ( tdo = bitq_interface->in() )<0 )
+ if ( ( tdo = bitq_interface->in() ) < 0 )
{
#ifdef _DEBUG_JTAG_IO_
LOG_DEBUG("bitq in EOF");
@@ -161,7 +161,7 @@ void bitq_state_move(tap_state_t new_state)
tms_scan = tap_get_tms_path(tap_get_state(), new_state);
int tms_count = tap_get_tms_path_len(tap_get_state(), tap_get_end_state());
- for (i = 0; i<tms_count; i++)
+ for (i = 0; i < tms_count; i++)
{
bitq_io(tms_scan & 1, 0, 0);
tms_scan >>= 1;
@@ -229,7 +229,7 @@ void bitq_scan_field(scan_field_t* field, int pause)
if (field->out_value == NULL)
{
/* just send zeros and request data from TDO */
- for (bit_cnt = field->num_bits; bit_cnt>1; bit_cnt--)
+ for (bit_cnt = field->num_bits; bit_cnt > 1; bit_cnt--)
bitq_io(0, 0, tdo_req);
bitq_io(pause, 0, tdo_req);
@@ -239,7 +239,7 @@ void bitq_scan_field(scan_field_t* field, int pause)
/* send data, and optionally request TDO */
out_mask = 0x01;
out_ptr = field->out_value;
- for (bit_cnt = field->num_bits; bit_cnt>1; bit_cnt--)
+ for (bit_cnt = field->num_bits; bit_cnt > 1; bit_cnt--)
{
bitq_io(0, ( (*out_ptr) & out_mask ) != 0, tdo_req);
if (out_mask == 0x80)
diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c
index c56d309e..5cea4d48 100644
--- a/src/jtag/ft2232.c
+++ b/src/jtag/ft2232.c
@@ -2794,7 +2794,7 @@ static int ft2232_handle_device_desc_command(struct command_context_s* cmd_ctx,
cp[-2] = 0;
ft2232_device_desc = strdup(buf);
} else {
- // <space>A not defined
+ // <space > A not defined
// so create it
sprintf(buf, "%s A", ft2232_device_desc);
ft2232_device_desc_A = strdup(buf);
diff --git a/src/jtag/gw16012.c b/src/jtag/gw16012.c
index 51958db4..7096d62c 100644
--- a/src/jtag/gw16012.c
+++ b/src/jtag/gw16012.c
@@ -500,7 +500,7 @@ static int gw16012_init_device(void)
LOG_DEBUG("opening %s...", buffer);
device_handle = open(buffer, O_WRONLY);
- if (device_handle<0)
+ if (device_handle < 0)
{
LOG_ERROR("cannot open device. check it exists and that user read and write rights are set");
return ERROR_JTAG_INIT_FAILED;
diff --git a/src/jtag/parport.c b/src/jtag/parport.c
index ab393e58..50c08314 100644
--- a/src/jtag/parport.c
+++ b/src/jtag/parport.c
@@ -345,7 +345,7 @@ static int parport_init(void)
#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
i = ioctl(device_handle, PPCLAIM);
- if (i<0)
+ if (i < 0)
{
LOG_ERROR("cannot claim device");
return ERROR_JTAG_INIT_FAILED;
@@ -353,7 +353,7 @@ static int parport_init(void)
i = PARPORT_MODE_COMPAT;
i= ioctl(device_handle, PPSETMODE, & i);
- if (i<0)
+ if (i < 0)
{
LOG_ERROR(" cannot set compatible mode to device");
return ERROR_JTAG_INIT_FAILED;
@@ -361,7 +361,7 @@ static int parport_init(void)
i = IEEE1284_MODE_COMPAT;
i = ioctl(device_handle, PPNEGOT, & i);
- if (i<0)
+ if (i < 0)
{
LOG_ERROR("cannot set compatible 1284 mode to device");
return ERROR_JTAG_INIT_FAILED;
diff --git a/src/jtag/presto.c b/src/jtag/presto.c
index fceae34a..9aca9097 100644
--- a/src/jtag/presto.c
+++ b/src/jtag/presto.c
@@ -553,7 +553,7 @@ static int presto_getbyte(void)
if (presto_flush() != ERROR_OK)
return -1;
- if (presto->buff_in_pos<presto->buff_in_len)
+ if (presto->buff_in_pos < presto->buff_in_len)
return presto->buff_in[presto->buff_in_pos++];
return -1;
@@ -625,14 +625,14 @@ static int presto_bitq_out(int tms, int tdi, int tdo_req)
}
/* delay with TCK low */
- for (i = presto->jtag_speed; i>1; i--)
+ for (i = presto->jtag_speed; i > 1; i--)
presto_sendbyte(cmd);
cmd |= 0x04;
presto_sendbyte(cmd | (tdo_req ? 0x10 : 0));
/* delay with TCK high */
- for (i = presto->jtag_speed; i>1; i--)
+ for (i = presto->jtag_speed; i > 1; i--)
presto_sendbyte(cmd);
presto->jtag_tck = 1;
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index 593330b5..a6f7b5dd 100644
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -1396,7 +1396,7 @@ static int Jim_Command_pathmove(Jim_Interp *interp, int argc, Jim_Obj *const *ar
script_debug(interp, "pathmove", argc, args);
int i;
- for (i = 0; i<argc-1; i++)
+ for (i = 0; i < argc-1; i++)
{
const char *cp;
cp = Jim_GetString( args[i + 1], NULL );
diff --git a/src/jtag/zy1000/jtag_minidriver.h b/src/jtag/zy1000/jtag_minidriver.h
index 3fd471b2..103a692c 100644
--- a/src/jtag/zy1000/jtag_minidriver.h
+++ b/src/jtag/zy1000/jtag_minidriver.h
@@ -96,7 +96,7 @@ static __inline__ void shiftValueInner(const enum tap_state state, const enum ta
{
int i;
setCurrentState(state);
- for (i = 0; i<repeat; i++)
+ for (i = 0; i < repeat; i++)
{
int tms;
tms = 0;
@@ -124,11 +124,11 @@ static __inline__ void shiftValueInner(const enum tap_state state, const enum ta
#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<repeat-1; i++)
+ for (i = 0; i < repeat-1; i++)
{
sampleShiftRegister();
ZY1000_POKE(ZY1000_JTAG_BASE + 0xc, value >> i);
@@ -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]);
}
diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 73efcd2e..33947332 100644
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -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
@@ -179,7 +179,7 @@ void zy1000_reset(int trst, int srst)
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);
}
@@ -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;
- 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;
- if (k>32)
+ if (k > 32)
{
k = 32;
/* we have more to shift out */
@@ -455,7 +455,7 @@ static __inline void scanFields(int num_fields, const scan_field_t *fields, tap_
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;
}
@@ -472,7 +472,7 @@ 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;
- for (l = 0; l<k; l += 8)
+ for (l = 0; l < k; l += 8)
{
inBuffer[(j + l)/8]=(value >> l)&0xff;
}
@@ -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;
- for (i = 0; i<num_cycles; i += 32)
+ for (i = 0; i < num_cycles; i += 32)
{
int num;
num = 32;
- if (num_cycles-i<num)
+ if (num_cycles-i < num)
{
num = num_cycles-i;
}