[Openocd-svn] r2367 - in trunk/src: flash/ocl/at91sam7x helper jtag target

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-24 00:40:10 +0200 (Wed, 24 Jun 2009)
New Revision: 2367

Modified:
   trunk/src/flash/ocl/at91sam7x/samflash.c
   trunk/src/helper/jim.c
   trunk/src/jtag/bitq.c
   trunk/src/jtag/presto.c
   trunk/src/target/arm720t.c
   trunk/src/target/arm7_9_common.c
   trunk/src/target/arm920t.c
   trunk/src/target/arm926ejs.c
   trunk/src/target/etm.h
   trunk/src/target/target.c
   trunk/src/target/xscale.c
Log:
- Fixes '>=' whitespace
- Replace ')\(>=\)\(\w\)' with ') \1 \2'.
- Replace '\(\w\)\(>=\)\(\w\)' with '\1 \2 \3'.


Modified: trunk/src/flash/ocl/at91sam7x/samflash.c
===================================================================
--- trunk/src/flash/ocl/at91sam7x/samflash.c	2009-06-23 22:39:47 UTC (rev 2366)
+++ trunk/src/flash/ocl/at91sam7x/samflash.c	2009-06-23 22:40:10 UTC (rev 2367)
@@ -82,7 +82,7 @@
 	uint32 *data_ptr;
 
 	/* select proper controller */
-	if (page_num>=1024) efc_ofs=0x10;
+	if (page_num >= 1024) efc_ofs=0x10;
 	else efc_ofs=0;
 
 	/* wait until FLASH is ready, just for sure */

Modified: trunk/src/helper/jim.c
===================================================================
--- trunk/src/helper/jim.c	2009-06-23 22:39:47 UTC (rev 2366)
+++ trunk/src/helper/jim.c	2009-06-23 22:40:10 UTC (rev 2367)
@@ -6956,7 +6956,7 @@
             case JIM_EXPROP_LT: wC = wA<wB; break;
             case JIM_EXPROP_GT: wC = wA>wB; break;
             case JIM_EXPROP_LTE: wC = wA<=wB; break;
-            case JIM_EXPROP_GTE: wC = wA>=wB; break;
+            case JIM_EXPROP_GTE: wC = wA >= wB; break;
             case JIM_EXPROP_LSHIFT: wC = wA<<wB; break;
             case JIM_EXPROP_RSHIFT: wC = wA>>wB; break;
             case JIM_EXPROP_NUMEQ: wC = wA==wB; break;
@@ -7061,7 +7061,7 @@
             case JIM_EXPROP_LT: dC = dA<dB; break;
             case JIM_EXPROP_GT: dC = dA>dB; break;
             case JIM_EXPROP_LTE: dC = dA<=dB; break;
-            case JIM_EXPROP_GTE: dC = dA>=dB; break;
+            case JIM_EXPROP_GTE: dC = dA >= dB; break;
             case JIM_EXPROP_NUMEQ: dC = dA==dB; break;
             case JIM_EXPROP_NUMNE: dC = dA != dB; break;
             case JIM_EXPROP_LOGICAND_LEFT:

Modified: trunk/src/jtag/bitq.c
===================================================================
--- trunk/src/jtag/bitq.c	2009-06-23 22:39:47 UTC (rev 2366)
+++ trunk/src/jtag/bitq.c	2009-06-23 22:40:10 UTC (rev 2367)
@@ -370,7 +370,7 @@
 		LOG_ERROR("missing data from bitq interface");
 		return ERROR_JTAG_QUEUE_FAILED;
 	}
-	if (bitq_interface->in()>=0)
+	if (bitq_interface->in() >= 0)
 	{
 		LOG_ERROR("extra data from bitq interface");
 		return ERROR_JTAG_QUEUE_FAILED;

Modified: trunk/src/jtag/presto.c
===================================================================
--- trunk/src/jtag/presto.c	2009-06-23 22:39:47 UTC (rev 2366)
+++ trunk/src/jtag/presto.c	2009-06-23 22:40:10 UTC (rev 2367)
@@ -652,14 +652,14 @@
 
 static int presto_bitq_in_rdy(void)
 {
-	if (presto->buff_in_pos>=presto->buff_in_len)
+	if (presto->buff_in_pos >= presto->buff_in_len)
 		return 0;
 	return presto->buff_in_len-presto->buff_in_pos;
 }
 
 static int presto_bitq_in(void)
 {
-	if (presto->buff_in_pos>=presto->buff_in_len)
+	if (presto->buff_in_pos >= presto->buff_in_len)
 		return -1;
 	if (presto->buff_in[presto->buff_in_pos++]&0x08) return 1;
 	return 0;

Modified: trunk/src/target/arm720t.c
===================================================================
--- trunk/src/target/arm720t.c	2009-06-23 22:39:47 UTC (rev 2366)
+++ trunk/src/target/arm720t.c	2009-06-23 22:40:10 UTC (rev 2367)
@@ -388,7 +388,7 @@
 		{
 			break;
 		}
-		if (debug_level>=3)
+		if (debug_level >= 3)
 		{
 			alive_sleep(100);
 		} else

Modified: trunk/src/target/arm7_9_common.c
===================================================================
--- trunk/src/target/arm7_9_common.c	2009-06-23 22:39:47 UTC (rev 2366)
+++ trunk/src/target/arm7_9_common.c	2009-06-23 22:40:10 UTC (rev 2367)
@@ -711,7 +711,7 @@
 		if ((buf_get_u32(dbg_stat->value, EICE_DBG_STATUS_DBGACK, 1))
 				   && (buf_get_u32(dbg_stat->value, EICE_DBG_STATUS_SYSCOMP, 1)))
 			break;
-		if (debug_level>=3)
+		if (debug_level >= 3)
 		{
 			alive_sleep(100);
 		} else
@@ -1159,7 +1159,7 @@
 		embeddedice_read_reg(dbg_stat);
 		if ((retval=jtag_execute_queue()) != ERROR_OK)
 			return retval;
-		if (debug_level>=3)
+		if (debug_level >= 3)
 		{
 			alive_sleep(100);
 		} else

Modified: trunk/src/target/arm920t.c
===================================================================
--- trunk/src/target/arm920t.c	2009-06-23 22:39:47 UTC (rev 2366)
+++ trunk/src/target/arm920t.c	2009-06-23 22:40:10 UTC (rev 2367)
@@ -587,7 +587,7 @@
 		{
 			break;
 		}
-		if (debug_level>=3)
+		if (debug_level >= 3)
 		{
 			/* do not eat all CPU, time out after 1 se*/
 			alive_sleep(100);

Modified: trunk/src/target/arm926ejs.c
===================================================================
--- trunk/src/target/arm926ejs.c	2009-06-23 22:39:47 UTC (rev 2366)
+++ trunk/src/target/arm926ejs.c	2009-06-23 22:40:10 UTC (rev 2367)
@@ -587,7 +587,7 @@
 		{
 			break;
 		}
-		if (debug_level>=1)
+		if (debug_level >= 1)
 		{
 			/* do not eat all CPU, time out after 1 se*/
 			alive_sleep(100);

Modified: trunk/src/target/etm.h
===================================================================
--- trunk/src/target/etm.h	2009-06-23 22:39:47 UTC (rev 2366)
+++ trunk/src/target/etm.h	2009-06-23 22:40:10 UTC (rev 2367)
@@ -184,7 +184,7 @@
 	BR_ENABLE  = 0x1, /* Trace has been enabled */
 	BR_RESTART = 0x2, /* Trace restarted after a FIFO overflow */
 	BR_NODEBUG = 0x3, /* ARM has exited for debug state */
-	BR_PERIOD  = 0x4, /* Peridioc synchronization point (ETM>=v1.2)*/
+	BR_PERIOD  = 0x4, /* Peridioc synchronization point (ETM >= v1.2)*/
 	BR_RSVD5   = 0x5, /* reserved */
 	BR_RSVD6   = 0x6, /* reserved */
 	BR_RSVD7   = 0x7, /* reserved */

Modified: trunk/src/target/target.c
===================================================================
--- trunk/src/target/target.c	2009-06-23 22:39:47 UTC (rev 2366)
+++ trunk/src/target/target.c	2009-06-23 22:40:10 UTC (rev 2367)
@@ -2279,7 +2279,7 @@
 
 		/* DANGER!!! beware of unsigned comparision here!!! */
 
-		if ((image.sections[i].base_address+buf_cnt>=min_address)&&
+		if ((image.sections[i].base_address+buf_cnt >= min_address)&&
 				(image.sections[i].base_address<max_address))
 		{
 			if (image.sections[i].base_address<min_address)
@@ -2955,7 +2955,7 @@
 		}
 
 		gettimeofday(&now, NULL);
-		if ((numSamples>=maxSample) || ((now.tv_sec >= timeout.tv_sec) && (now.tv_usec >= timeout.tv_usec)))
+		if ((numSamples >= maxSample) || ((now.tv_sec >= timeout.tv_sec) && (now.tv_usec >= timeout.tv_usec)))
 		{
 			command_print(cmd_ctx, "Profiling completed. %d samples.", numSamples);
 			if ((retval = target_poll(target)) != ERROR_OK)
@@ -4460,7 +4460,7 @@
 
 		/* DANGER!!! beware of unsigned comparision here!!! */
 
-		if ((image.sections[i].base_address+buf_cnt>=min_address)&&
+		if ((image.sections[i].base_address+buf_cnt >= min_address)&&
 				(image.sections[i].base_address<max_address))
 		{
 			if (image.sections[i].base_address<min_address)

Modified: trunk/src/target/xscale.c
===================================================================
--- trunk/src/target/xscale.c	2009-06-23 22:39:47 UTC (rev 2366)
+++ trunk/src/target/xscale.c	2009-06-23 22:40:10 UTC (rev 2367)
@@ -499,7 +499,7 @@
 		{
 			goto done;
 		}
-		if (debug_level>=3)
+		if (debug_level >= 3)
 		{
 			LOG_DEBUG("waiting 100ms");
 			alive_sleep(100); /* avoid flooding the logs */
@@ -580,7 +580,7 @@
 		}
 		if (!(field0_in & 1))
 			goto done;
-		if (debug_level>=3)
+		if (debug_level >= 3)
 		{
 			LOG_DEBUG("waiting 100ms");
 			alive_sleep(100); /* avoid flooding the logs */