Don Porges fixed c99 issues.

git-svn-id: svn://svn.berlios.de/openocd/trunk@553 b42882b7-edfa-0310-969c-e2dbd0fdcd60

7 files changed, 32 insertions, 28 deletions

diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/amt_jtagaccel.c
index 1a34073a..b94b6f76 100644
--- a/src/jtag/amt_jtagaccel.c
+++ b/src/jtag/amt_jtagaccel.c
@@ -34,9 +34,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <sys/time.h>
-#include <time.h>
-
 #if PARPORT_USE_PPDEV == 1
 #include <linux/parport.h>
 #include <linux/ppdev.h>
diff --git a/src/jtag/bitbang.c b/src/jtag/bitbang.c
index f79d2af7..79f77b56 100644
--- a/src/jtag/bitbang.c
+++ b/src/jtag/bitbang.c
@@ -34,9 +34,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <sys/time.h>
-#include <time.h>
-
 bitbang_interface_t *bitbang_interface;
 
 int bitbang_execute_queue(void);
diff --git a/src/jtag/bitq.c b/src/jtag/bitq.c
index e2a243fb..93bb3063 100644
--- a/src/jtag/bitq.c
+++ b/src/jtag/bitq.c
@@ -34,9 +34,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <sys/time.h>
-#include <time.h>
-
 
 bitq_interface_t *bitq_interface; /* low level bit queue interface */
 
diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c
index 20824bbb..2740c3be 100644
--- a/src/jtag/ft2232.c
+++ b/src/jtag/ft2232.c
@@ -46,9 +46,6 @@
 #include <ftdi.h>
 #endif
 
-#include <sys/time.h>
-#include <time.h>
-
 /* enable this to debug io latency
  */
 #if 0
@@ -455,11 +452,11 @@ void ft2232_add_pathmove(pathmove_command_t *cmd)
 	state_count = 0;
 	while (num_states)
 	{
-		tms_byte = 0x0;
 		int bit_count = 0;
 		
 		int num_states_batch = num_states > 7 ? 7 : num_states;
 
+		tms_byte = 0x0;
 		/* command "Clock Data to TMS/CS Pin (no Read)" */
 		BUFFER_ADD = 0x4b;
 		/* number of states remaining */
diff --git a/src/jtag/gw16012.c b/src/jtag/gw16012.c
index 8caaba63..8c7dc81b 100644
--- a/src/jtag/gw16012.c
+++ b/src/jtag/gw16012.c
@@ -50,9 +50,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <sys/time.h>
-#include <time.h>
-
 #if PARPORT_USE_PPDEV == 1
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <dev/ppbus/ppi.h>
diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index 291c4010..b177c8e2 100644
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -361,6 +361,7 @@ void* cmd_queue_alloc(size_t size)
 {
 	cmd_queue_page_t **p_page = &cmd_queue_pages;
 	int offset;
+	u8 *t;
 
 	if (*p_page)
 	{
@@ -381,7 +382,7 @@ void* cmd_queue_alloc(size_t size)
 	offset = (*p_page)->used;
 	(*p_page)->used += size;
 	
-	u8 *t=(u8 *)((*p_page)->address);
+	t=(u8 *)((*p_page)->address);
 	return t + offset;
 }
 
@@ -425,9 +426,11 @@ static void jtag_prelude(enum tap_state state)
 
 void jtag_add_ir_scan(int num_fields, scan_field_t *fields, enum tap_state state)
 {
+	int retval;
+	
 	jtag_prelude(state);
 	
-	int retval=interface_jtag_add_ir_scan(num_fields, fields, cmd_queue_end_state);
+	retval=interface_jtag_add_ir_scan(num_fields, fields, cmd_queue_end_state);
 	if (retval!=ERROR_OK)
 		jtag_error=retval;
 }
@@ -511,9 +514,11 @@ int MINIDRIVER(interface_jtag_add_ir_scan)(int num_fields, scan_field_t *fields,
 
 void jtag_add_plain_ir_scan(int num_fields, scan_field_t *fields, enum tap_state state)
 {
+	int retval;
+	
 	jtag_prelude(state);
 	
-	int retval=interface_jtag_add_plain_ir_scan(num_fields, fields, cmd_queue_end_state);
+	retval=interface_jtag_add_plain_ir_scan(num_fields, fields, cmd_queue_end_state);
 	if (retval!=ERROR_OK)
 		jtag_error=retval;
 }
@@ -557,9 +562,11 @@ int MINIDRIVER(interface_jtag_add_plain_ir_scan)(int num_fields, scan_field_t *f
 
 void jtag_add_dr_scan(int num_fields, scan_field_t *fields, enum tap_state state)
 {
+	int retval;
+	
 	jtag_prelude(state);
 
-	int retval=interface_jtag_add_dr_scan(num_fields, fields, cmd_queue_end_state);
+	retval=interface_jtag_add_dr_scan(num_fields, fields, cmd_queue_end_state);
 	if (retval!=ERROR_OK)
 		jtag_error=retval;
 }
@@ -742,9 +749,11 @@ void MINIDRIVER(interface_jtag_add_dr_out)(int device_num,
 
 void jtag_add_plain_dr_scan(int num_fields, scan_field_t *fields, enum tap_state state)
 {
+	int retval;
+	
 	jtag_prelude(state);
 
-	int retval=interface_jtag_add_plain_dr_scan(num_fields, fields, cmd_queue_end_state);
+	retval=interface_jtag_add_plain_dr_scan(num_fields, fields, cmd_queue_end_state);
 	if (retval!=ERROR_OK)
 		jtag_error=retval;
 }
@@ -815,6 +824,10 @@ int MINIDRIVER(interface_jtag_add_tlr)()
 
 void jtag_add_pathmove(int num_states, enum tap_state *path)
 {
+	enum tap_state cur_state=cmd_queue_cur_state;
+	int i;
+	int retval;
+
 	/* the last state has to be a stable state */
 	if (tap_move_map[path[num_states - 1]] == -1)
 	{
@@ -822,8 +835,6 @@ void jtag_add_pathmove(int num_states, enum tap_state *path)
 		exit(-1);
 	}
 
-	enum tap_state cur_state=cmd_queue_cur_state;
-	int i;
 	for (i=0; i<num_states; i++)
 	{
 		if ((tap_transitions[cur_state].low != path[i])&&
@@ -839,7 +850,7 @@ void jtag_add_pathmove(int num_states, enum tap_state *path)
 	
 	cmd_queue_cur_state = path[num_states - 1];
 
-	int retval=interface_jtag_add_pathmove(num_states, path);
+	retval=interface_jtag_add_pathmove(num_states, path);
 	if (retval!=ERROR_OK)
 		jtag_error=retval;
 }
@@ -885,10 +896,12 @@ int MINIDRIVER(interface_jtag_add_runtest)(int num_cycles, enum tap_state state)
 
 void jtag_add_runtest(int num_cycles, enum tap_state state)
 {
+	int retval;
+	
 	jtag_prelude(state);
 	
 	/* executed by sw or hw fifo */
-	int retval=interface_jtag_add_runtest(num_cycles, cmd_queue_end_state);
+	retval=interface_jtag_add_runtest(num_cycles, cmd_queue_end_state);
 	if (retval!=ERROR_OK)
 		jtag_error=retval;
 }
@@ -1275,6 +1288,8 @@ void jtag_sleep(u32 us)
 	usleep(us);
 }
 
+int cwvx_device_num = -1, cwvx_version_num, cwvx_part_num;
+
 /* Try to examine chain layout according to IEEE 1149.1 §12
  */
 int jtag_examine_chain()
@@ -1355,6 +1370,13 @@ int jtag_examine_chain()
 			LOG_INFO("JTAG device found: 0x%8.8x (Manufacturer: 0x%3.3x, Part: 0x%4.4x, Version: 0x%1.1x)", 
 				idcode, manufacturer, part, version);
 			
+			/* Total hacky hack!	PORGES */
+			if (manufacturer == 0x1a2) {
+			    cwvx_device_num = device_count-1;
+			    cwvx_part_num = part;
+			    cwvx_version_num = version;
+			}
+			
 			bit_count += 32;
 		}
 	}
diff --git a/src/jtag/presto.c b/src/jtag/presto.c
index d9661fc4..aa82f413 100644
--- a/src/jtag/presto.c
+++ b/src/jtag/presto.c
@@ -40,9 +40,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <sys/time.h>
-#include <time.h>
-
 /* PRESTO access library includes */
 #if BUILD_PRESTO_FTD2XX == 1
 #include <ftd2xx.h>