openocd-commit — OpenOCD commit maling list - read only

[Openocd-svn] r2083 - trunk/src/jtag

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

Author: zwelch
Date: 2009-06-07 07:23:03 +0200 (Sun, 07 Jun 2009)
New Revision: 2083

Modified:
   trunk/src/jtag/jtag.c
Log:
Factoring of jtag_examine_chain for maintainability:
- Factor JTAG chain examination into static helper function.


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-07 05:22:53 UTC (rev 2082)
+++ trunk/src/jtag/jtag.c	2009-06-07 05:23:03 UTC (rev 2083)
@@ -946,12 +946,28 @@
 #define EXTRACT_PART(X) (((X) & 0xffff000) >> 12)
 #define EXTRACT_VER(X)  (((X) & 0xf0000000) >> 28)
 
+static int jtag_examine_chain_execute(u8 *idcode_buffer, unsigned num_idcode)
+{
+	scan_field_t field = {
+			.tap = NULL,
+			.num_bits = num_idcode * 32,
+			.out_value = idcode_buffer,
+			.in_value = idcode_buffer,
+		};
+
+	// initialize to the end of chain ID value
+	for (unsigned i = 0; i < JTAG_MAX_CHAIN_SIZE; i++)
+		buf_set_u32(idcode_buffer, i * 32, 32, 0x000000FF);
+
+	jtag_add_plain_dr_scan(1, &field, TAP_RESET);
+	return jtag_execute_queue();
+}
+
 /* Try to examine chain layout according to IEEE 1149.1 §12
  */
 static int jtag_examine_chain(void)
 {
 	jtag_tap_t *tap;
-	scan_field_t field;
 	u8 idcode_buffer[JTAG_MAX_CHAIN_SIZE * 4];
 	int i;
 	int bit_count;
@@ -959,23 +975,8 @@
 	u8 zero_check = 0x0;
 	u8 one_check = 0xff;
 
-	field.tap = NULL;
-	field.num_bits = sizeof(idcode_buffer) * 8;
-	field.out_value = idcode_buffer;
+	jtag_examine_chain_execute(idcode_buffer, JTAG_MAX_CHAIN_SIZE);
 
-	field.in_value = idcode_buffer;
-
-
-
-
-	for (i = 0; i < JTAG_MAX_CHAIN_SIZE; i++)
-	{
-		buf_set_u32(idcode_buffer, i * 32, 32, 0x000000FF);
-	}
-
-	jtag_add_plain_dr_scan(1, &field, TAP_RESET);
-	jtag_execute_queue();
-
 	for (i = 0; i < JTAG_MAX_CHAIN_SIZE * 4; i++)
 	{
 		zero_check |= idcode_buffer[i];

[Openocd-svn] r2082 - trunk/src/jtag

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

Author: zwelch
Date: 2009-06-07 07:22:53 +0200 (Sun, 07 Jun 2009)
New Revision: 2082

Modified:
   trunk/src/jtag/jtag.c
Log:
Factoring of jtag_examine_chain for maintainability:
- Reduce indent: invert logical test of expected_id count.


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-07 05:22:42 UTC (rev 2081)
+++ trunk/src/jtag/jtag.c	2009-06-07 05:22:53 UTC (rev 2082)
@@ -1077,30 +1077,29 @@
 		}
 
 		/* If none of the expected ids matched, log an error */
-		if (ii == tap->expected_ids_cnt) {
-			LOG_ERROR("JTAG tap: %s             got: 0x%08x (mfg: 0x%3.3x, part: 0x%4.4x, ver: 0x%1.1x)",
-					  tap->dotted_name,
-					  idcode,
-					  EXTRACT_MFG( tap->idcode ),
-					  EXTRACT_PART( tap->idcode ),
-					  EXTRACT_VER( tap->idcode ) );
-			for (ii = 0; ii < tap->expected_ids_cnt; ii++) {
-				LOG_ERROR("JTAG tap: %s expected %hhu of %hhu: 0x%08x (mfg: 0x%3.3x, part: 0x%4.4x, ver: 0x%1.1x)",
-						  tap->dotted_name,
-						  ii + 1,
-						  tap->expected_ids_cnt,
-						  tap->expected_ids[ii],
-						  EXTRACT_MFG( tap->expected_ids[ii] ),
-						  EXTRACT_PART( tap->expected_ids[ii] ),
-						  EXTRACT_VER( tap->expected_ids[ii] ) );
-			}
-
-			return ERROR_JTAG_INIT_FAILED;
-		} else {
+		if (ii != tap->expected_ids_cnt)
+		{
 			LOG_INFO("JTAG Tap/device matched");
+			tap = jtag_tap_next_enabled(tap);
+			continue;
 		}
-		
-		tap = jtag_tap_next_enabled(tap);
+		LOG_ERROR("JTAG tap: %s             got: 0x%08x (mfg: 0x%3.3x, part: 0x%4.4x, ver: 0x%1.1x)",
+				tap->dotted_name,
+				idcode,
+				EXTRACT_MFG( tap->idcode ),
+				EXTRACT_PART( tap->idcode ),
+				EXTRACT_VER( tap->idcode ) );
+		for (ii = 0; ii < tap->expected_ids_cnt; ii++) {
+			LOG_ERROR("JTAG tap: %s expected %hhu of %hhu: 0x%08x (mfg: 0x%3.3x, part: 0x%4.4x, ver: 0x%1.1x)",
+					tap->dotted_name,
+					ii + 1,
+					tap->expected_ids_cnt,
+					tap->expected_ids[ii],
+					EXTRACT_MFG( tap->expected_ids[ii] ),
+					EXTRACT_PART( tap->expected_ids[ii] ),
+					EXTRACT_VER( tap->expected_ids[ii] ) );
+		}
+		return ERROR_JTAG_INIT_FAILED;
 	}
 
 	/* see if number of discovered devices matches configuration */

[Openocd-svn] r2081 - trunk/src/jtag

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

Author: zwelch
Date: 2009-06-07 07:22:42 +0200 (Sun, 07 Jun 2009)
New Revision: 2081

Modified:
   trunk/src/jtag/jtag.c
Log:
Factoring of jtag_examine_chain for maintainability:
- Reduce indent: invert logic test for unexpected TAP (no IDs).


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-07 05:22:34 UTC (rev 2080)
+++ trunk/src/jtag/jtag.c	2009-06-07 05:22:42 UTC (rev 2081)
@@ -1058,44 +1058,48 @@
 
 		tap->idcode = idcode;
 
-		if (tap->expected_ids_cnt > 0) {
+		if (0 == tap->expected_ids_cnt)
+		{
+			// @todo Enable LOG_INFO to ask for reports about unknown TAP IDs.
+#if 0
+			LOG_INFO("Uknown JTAG TAP ID: 0x%08x", tap->idcode)
+			LOG_INFO("Please report the chip name and reported ID code to the openocd project");
+#endif
+			tap = jtag_tap_next_enabled(tap);
+			continue;
+		}
 			/* Loop over the expected identification codes and test for a match */
-			u8 ii;
-			for (ii = 0; ii < tap->expected_ids_cnt; ii++) {
-				if( tap->idcode == tap->expected_ids[ii] ){
-					break;
-				}
+		u8 ii;
+		for (ii = 0; ii < tap->expected_ids_cnt; ii++) {
+			if (tap->idcode == tap->expected_ids[ii]) {
+				break;
 			}
+		}
 
-			/* If none of the expected ids matched, log an error */
-			if (ii == tap->expected_ids_cnt) {
-				LOG_ERROR("JTAG tap: %s             got: 0x%08x (mfg: 0x%3.3x, part: 0x%4.4x, ver: 0x%1.1x)",
+		/* If none of the expected ids matched, log an error */
+		if (ii == tap->expected_ids_cnt) {
+			LOG_ERROR("JTAG tap: %s             got: 0x%08x (mfg: 0x%3.3x, part: 0x%4.4x, ver: 0x%1.1x)",
+					  tap->dotted_name,
+					  idcode,
+					  EXTRACT_MFG( tap->idcode ),
+					  EXTRACT_PART( tap->idcode ),
+					  EXTRACT_VER( tap->idcode ) );
+			for (ii = 0; ii < tap->expected_ids_cnt; ii++) {
+				LOG_ERROR("JTAG tap: %s expected %hhu of %hhu: 0x%08x (mfg: 0x%3.3x, part: 0x%4.4x, ver: 0x%1.1x)",
 						  tap->dotted_name,
-						  idcode,
-						  EXTRACT_MFG( tap->idcode ),
-						  EXTRACT_PART( tap->idcode ),
-						  EXTRACT_VER( tap->idcode ) );
-				for (ii = 0; ii < tap->expected_ids_cnt; ii++) {
-					LOG_ERROR("JTAG tap: %s expected %hhu of %hhu: 0x%08x (mfg: 0x%3.3x, part: 0x%4.4x, ver: 0x%1.1x)",
-							  tap->dotted_name,
-							  ii + 1,
-							  tap->expected_ids_cnt,
-							  tap->expected_ids[ii],
-							  EXTRACT_MFG( tap->expected_ids[ii] ),
-							  EXTRACT_PART( tap->expected_ids[ii] ),
-							  EXTRACT_VER( tap->expected_ids[ii] ) );
-				}
+						  ii + 1,
+						  tap->expected_ids_cnt,
+						  tap->expected_ids[ii],
+						  EXTRACT_MFG( tap->expected_ids[ii] ),
+						  EXTRACT_PART( tap->expected_ids[ii] ),
+						  EXTRACT_VER( tap->expected_ids[ii] ) );
+			}
 
-				return ERROR_JTAG_INIT_FAILED;
-			} else {
-				LOG_INFO("JTAG Tap/device matched");
-			}
+			return ERROR_JTAG_INIT_FAILED;
 		} else {
-#if 0
-			LOG_INFO("JTAG TAP ID: 0x%08x - Unknown - please report (A) chipname and (B) idcode to the openocd project",
-					 tap->idcode);
-#endif
+			LOG_INFO("JTAG Tap/device matched");
 		}
+		
 		tap = jtag_tap_next_enabled(tap);
 	}
 

[Openocd-svn] r2080 - trunk/src/jtag

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

Author: zwelch
Date: 2009-06-07 07:22:34 +0200 (Sun, 07 Jun 2009)
New Revision: 2080

Modified:
   trunk/src/jtag/jtag.c
Log:
Factoring of jtag_examine_chain for maintainability:
- Reduce indent: invert logic test for tap in jtag_examine_chain.


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-07 05:22:25 UTC (rev 2079)
+++ trunk/src/jtag/jtag.c	2009-06-07 05:22:34 UTC (rev 2080)
@@ -1052,51 +1052,51 @@
 
 			bit_count += 32;
 		}
-		if (tap)
-		{
-			tap->idcode = idcode;
+		device_count++;
+		if (!tap)
+			continue;
 
-			if (tap->expected_ids_cnt > 0) {
-				/* Loop over the expected identification codes and test for a match */
-				u8 ii;
-				for (ii = 0; ii < tap->expected_ids_cnt; ii++) {
-					if( tap->idcode == tap->expected_ids[ii] ){
-						break;
-					}
+		tap->idcode = idcode;
+
+		if (tap->expected_ids_cnt > 0) {
+			/* Loop over the expected identification codes and test for a match */
+			u8 ii;
+			for (ii = 0; ii < tap->expected_ids_cnt; ii++) {
+				if( tap->idcode == tap->expected_ids[ii] ){
+					break;
 				}
+			}
 
-				/* If none of the expected ids matched, log an error */
-				if (ii == tap->expected_ids_cnt) {
-					LOG_ERROR("JTAG tap: %s             got: 0x%08x (mfg: 0x%3.3x, part: 0x%4.4x, ver: 0x%1.1x)",
+			/* If none of the expected ids matched, log an error */
+			if (ii == tap->expected_ids_cnt) {
+				LOG_ERROR("JTAG tap: %s             got: 0x%08x (mfg: 0x%3.3x, part: 0x%4.4x, ver: 0x%1.1x)",
+						  tap->dotted_name,
+						  idcode,
+						  EXTRACT_MFG( tap->idcode ),
+						  EXTRACT_PART( tap->idcode ),
+						  EXTRACT_VER( tap->idcode ) );
+				for (ii = 0; ii < tap->expected_ids_cnt; ii++) {
+					LOG_ERROR("JTAG tap: %s expected %hhu of %hhu: 0x%08x (mfg: 0x%3.3x, part: 0x%4.4x, ver: 0x%1.1x)",
 							  tap->dotted_name,
-							  idcode,
-							  EXTRACT_MFG( tap->idcode ),
-							  EXTRACT_PART( tap->idcode ),
-							  EXTRACT_VER( tap->idcode ) );
-					for (ii = 0; ii < tap->expected_ids_cnt; ii++) {
-						LOG_ERROR("JTAG tap: %s expected %hhu of %hhu: 0x%08x (mfg: 0x%3.3x, part: 0x%4.4x, ver: 0x%1.1x)",
-								  tap->dotted_name,
-								  ii + 1,
-								  tap->expected_ids_cnt,
-								  tap->expected_ids[ii],
-								  EXTRACT_MFG( tap->expected_ids[ii] ),
-								  EXTRACT_PART( tap->expected_ids[ii] ),
-								  EXTRACT_VER( tap->expected_ids[ii] ) );
-					}
+							  ii + 1,
+							  tap->expected_ids_cnt,
+							  tap->expected_ids[ii],
+							  EXTRACT_MFG( tap->expected_ids[ii] ),
+							  EXTRACT_PART( tap->expected_ids[ii] ),
+							  EXTRACT_VER( tap->expected_ids[ii] ) );
+				}
 
-					return ERROR_JTAG_INIT_FAILED;
-				} else {
-					LOG_INFO("JTAG Tap/device matched");
-				}
+				return ERROR_JTAG_INIT_FAILED;
 			} else {
+				LOG_INFO("JTAG Tap/device matched");
+			}
+		} else {
 #if 0
-				LOG_INFO("JTAG TAP ID: 0x%08x - Unknown - please report (A) chipname and (B) idcode to the openocd project",
-						 tap->idcode);
+			LOG_INFO("JTAG TAP ID: 0x%08x - Unknown - please report (A) chipname and (B) idcode to the openocd project",
+					 tap->idcode);
 #endif
-			}
-			tap = jtag_tap_next_enabled(tap);
 		}
-		device_count++;
+		tap = jtag_tap_next_enabled(tap);
 	}
 
 	/* see if number of discovered devices matches configuration */

[Openocd-svn] r2079 - trunk/src/jtag

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

Author: zwelch
Date: 2009-06-07 07:22:25 +0200 (Sun, 07 Jun 2009)
New Revision: 2079

Modified:
   trunk/src/jtag/jtag.c
Log:
Factoring of jtag_examine_chain for maintainability:
- Move definition of maximum JTAG chain size closer to its only uses.


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-07 05:22:09 UTC (rev 2078)
+++ trunk/src/jtag/jtag.c	2009-06-07 05:22:25 UTC (rev 2079)
@@ -84,10 +84,6 @@
 static int jtag_nsrst_delay = 0; /* default to no nSRST delay */
 static int jtag_ntrst_delay = 0; /* default to no nTRST delay */
 
-/* maximum number of JTAG devices expected in the chain
- */
-#define JTAG_MAX_CHAIN_SIZE 20
-
 /* callbacks to inform high-level handlers about JTAG state changes */
 jtag_event_callback_t *jtag_event_callbacks;
 
@@ -943,6 +939,9 @@
 	alive_sleep(us/1000);
 }
 
+/// maximum number of JTAG devices expected in the chain
+#define JTAG_MAX_CHAIN_SIZE 20
+
 #define EXTRACT_MFG(X)  (((X) & 0xffe) >> 1)
 #define EXTRACT_PART(X) (((X) & 0xffff000) >> 12)
 #define EXTRACT_VER(X)  (((X) & 0xf0000000) >> 28)

[Openocd-svn] r2078 - trunk/src/jtag

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

Author: zwelch
Date: 2009-06-07 07:22:09 +0200 (Sun, 07 Jun 2009)
New Revision: 2078

Modified:
   trunk/src/jtag/jtag.c
Log:
Factoring of jtag_examine_chain for maintainability:
- Move JTAG EXTRACT macros out from the middle of jtag_examine_chain.


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-07 03:48:21 UTC (rev 2077)
+++ trunk/src/jtag/jtag.c	2009-06-07 05:22:09 UTC (rev 2078)
@@ -943,6 +943,10 @@
 	alive_sleep(us/1000);
 }
 
+#define EXTRACT_MFG(X)  (((X) & 0xffe) >> 1)
+#define EXTRACT_PART(X) (((X) & 0xffff000) >> 12)
+#define EXTRACT_VER(X)  (((X) & 0xf0000000) >> 28)
+
 /* Try to examine chain layout according to IEEE 1149.1 §12
  */
 static int jtag_examine_chain(void)
@@ -1039,11 +1043,8 @@
 				break;
 			}
 
-#define EXTRACT_MFG(X)  (((X) & 0xffe) >> 1)
 			manufacturer = EXTRACT_MFG(idcode);
-#define EXTRACT_PART(X) (((X) & 0xffff000) >> 12)
 			part = EXTRACT_PART(idcode);
-#define EXTRACT_VER(X)  (((X) & 0xf0000000) >> 28)
 			version = EXTRACT_VER(idcode);
 
 			LOG_INFO("JTAG tap: %s tap/device found: 0x%8.8x (Manufacturer: 0x%3.3x, Part: 0x%4.4x, Version: 0x%1.1x)",

[Openocd-svn] r2077 - trunk/src/jtag

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

Author: zwelch
Date: 2009-06-07 05:48:21 +0200 (Sun, 07 Jun 2009)
New Revision: 2077

Modified:
   trunk/src/jtag/jtag.c
Log:
Clean up handle_endstate_command():
- Merge declaration of state with first use.
- Unindent and remove unnecessary 'else' block.


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 12:58:39 UTC (rev 2076)
+++ trunk/src/jtag/jtag.c	2009-06-07 03:48:21 UTC (rev 2077)
@@ -2185,24 +2185,21 @@
 
 static int handle_endstate_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-	tap_state_t state;
-
 	if (argc < 1)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
+	tap_state_t state = tap_state_by_name(args[0]);
+	if (state < 0)
 	{
+		command_print( cmd_ctx, "Invalid state name: %s\n", args[0] );
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
-	else
-	{
-		state = tap_state_by_name( args[0] );
-		if( state < 0 ){
-			command_print( cmd_ctx, "Invalid state name: %s\n", args[0] );
-			return ERROR_COMMAND_SYNTAX_ERROR;
-		}
-		jtag_set_end_state(state);
-		jtag_execute_queue();
-	}
-	command_print(cmd_ctx, "current endstate: %s", tap_state_name(cmd_queue_end_state));
+	jtag_set_end_state(state);
+	jtag_execute_queue();
 
+	command_print(cmd_ctx, "current endstate: %s",
+			tap_state_name(cmd_queue_end_state));
+
 	return ERROR_OK;
 }
 

[Openocd-svn] r2076 - zy1000/trunk/build

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-06-05 14:58:39 +0200 (Fri, 05 Jun 2009)
New Revision: 2076

Modified:
   zy1000/trunk/build/makephi.sh
Log:
install only data files during rom image build

Modified: zy1000/trunk/build/makephi.sh
===================================================================
--- zy1000/trunk/build/makephi.sh	2009-06-05 08:35:24 UTC (rev 2075)
+++ zy1000/trunk/build/makephi.sh	2009-06-05 12:58:39 UTC (rev 2076)
@@ -5,8 +5,8 @@
 find tclconvert -regex ".*\.svn" -exec echo rm -rf {} \; | sh
 #sh $OPENOCD/html2tcl.tcl tclconvert
 find tclconvert/ -type f -exec $OPENOCD/html2tcl.tcl {} {} \;
-make -s
-make -s install
+make -s install-data-am
+
 # copy over installed stuff
 cp -r /tmp/ecosboard/ocdinstall/lib/openocd/* tclconvert/
 # Create rom filing system

[Openocd-svn] r2075 - trunk/tcl/target

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-06-05 10:35:24 +0200 (Fri, 05 Jun 2009)
New Revision: 2075

Modified:
   trunk/tcl/target/at91rm9200.cfg
Log:
David Brownell <da...@pa...> target/at91rm9200.cfg cleanup

Modified: trunk/tcl/target/at91rm9200.cfg
===================================================================
--- trunk/tcl/target/at91rm9200.cfg	2009-06-05 06:43:09 UTC (rev 2074)
+++ trunk/tcl/target/at91rm9200.cfg	2009-06-05 08:35:24 UTC (rev 2075)
@@ -1,3 +1,5 @@
+# Atmel AT91rm9200
+# http://atmel.com/products/at91/
 
 reset_config trst_and_srst
 
@@ -21,31 +23,27 @@
 
 # Never allow the following!
 if { $_CPUTAPID == 0x15b0203f } {
-   puts "-------------------------------------------------------"
-   puts "- ERROR:                                              -"
-   puts "- ERROR: TapID 0x15b0203f is wrong for at91rm9200      -"
-   puts "- ERROR: The chip/board has a JTAG select pin/jumper  -"
-   puts "- ERROR:                                              -"
-   puts "- ERROR: In one position (0x05b0203f) it selects the   -"
-   puts "- ERROR: ARM CPU, in the other position (0x1b0203f)   -"
-   puts "- ERROR: it selects boundry-scan not the ARM          -"
-   puts "- ERROR:                                              -"
-   puts "-------------------------------------------------------"
+   echo "-------------------------------------------------------"
+   echo "- ERROR:                                              -"
+   echo "- ERROR: TapID 0x15b0203f is wrong for at91rm9200     -"
+   echo "- ERROR: The chip/board has a JTAG select pin/jumper  -"
+   echo "- ERROR:                                              -"
+   echo "- ERROR: In one position (0x05b0203f) it selects the  -"
+   echo "- ERROR: ARM CPU, in the other position (0x1b0203f)   -"
+   echo "- ERROR: it selects boundry-scan not the ARM          -"
+   echo "- ERROR:                                              -"
+   echo "-------------------------------------------------------"
 }
 
 jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
 
-
 # Create the GDB Target.
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
+set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm920t -endian $_ENDIAN -chain-position $_TARGETNAME 
+
 # AT91RM9200 has a 16K block of sram @ 0x0020.0000
-$_TARGETNAME configure -work-area-virt 0x00200000 -work-area-phys 0x00200000 -work-area-size 0x4000 -work-area-backup 1
+$_TARGETNAME configure -work-area-virt 0x00200000 -work-area-phys 0x00200000 \
+		-work-area-size 0x4000 -work-area-backup 1
 
 # This chip has a DCC ... use it
 arm7_9 dcc_downloads enable
-
-
-
-
-

[Openocd-svn] r2074 - trunk/src/helper zy1000/trunk/build/include

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-06-05 08:43:09 +0200 (Fri, 05 Jun 2009)
New Revision: 2074

Removed:
   zy1000/trunk/build/include/getopt.h
   zy1000/trunk/build/include/inttypes.h
   zy1000/trunk/build/include/strings.h
   zy1000/trunk/build/include/sys/
Modified:
   trunk/src/helper/system.h
Log:
remove hacks no longer required to build OpenOCD w/eCos

Modified: trunk/src/helper/system.h
===================================================================
--- trunk/src/helper/system.h	2009-06-05 06:42:20 UTC (rev 2073)
+++ trunk/src/helper/system.h	2009-06-05 06:43:09 UTC (rev 2074)
@@ -59,6 +59,14 @@
 #ifdef HAVE_SYS_POLL_H
 #include <sys/poll.h>
 #endif
+
+#ifdef __ECOS
+/* missing from eCos */
+#ifndef EFAULT
+#define	EFAULT 14	/* Bad address */
+#endif
+#endif
+
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif

Deleted: zy1000/trunk/build/include/getopt.h
===================================================================
--- zy1000/trunk/build/include/getopt.h	2009-06-05 06:42:20 UTC (rev 2073)
+++ zy1000/trunk/build/include/getopt.h	2009-06-05 06:43:09 UTC (rev 2074)
@@ -1 +0,0 @@
-/* An empty file to avoid having to modify OpenOCD */

Deleted: zy1000/trunk/build/include/inttypes.h
===================================================================
--- zy1000/trunk/build/include/inttypes.h	2009-06-05 06:42:20 UTC (rev 2073)
+++ zy1000/trunk/build/include/inttypes.h	2009-06-05 06:43:09 UTC (rev 2074)
@@ -1,7 +0,0 @@
-// does not come w/eCos so we have this placeholder include file to avoid changing OpenOCD too much
-#define	PRId64			"lld"
-#define	PRIi64			"lli"
-#define	PRIo64			"llo"
-#define	PRIu64			"llu"
-#define	PRIx64			"llx"
-#define	PRIX64			"llX"

Deleted: zy1000/trunk/build/include/strings.h
===================================================================
--- zy1000/trunk/build/include/strings.h	2009-06-05 06:42:20 UTC (rev 2073)
+++ zy1000/trunk/build/include/strings.h	2009-06-05 06:43:09 UTC (rev 2074)
@@ -1 +0,0 @@
-/* An empty file to avoid having to modify OpenOCD */

[Openocd-svn] r2073 - trunk/src

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-06-05 08:42:20 +0200 (Fri, 05 Jun 2009)
New Revision: 2073

Modified:
   trunk/src/ecosboard.c
Log:
remove unused include file: strings.h

Modified: trunk/src/ecosboard.c
===================================================================
--- trunk/src/ecosboard.c	2009-06-05 06:41:54 UTC (rev 2072)
+++ trunk/src/ecosboard.c	2009-06-05 06:42:20 UTC (rev 2073)
@@ -39,7 +39,6 @@
 
 #include <time_support.h>
 #include <sys/time.h>
-#include <strings.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

[Openocd-svn] r2072 - in trunk/src: flash helper target

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-06-05 08:41:54 +0200 (Fri, 05 Jun 2009)
New Revision: 2072

Modified:
   trunk/src/flash/flash.c
   trunk/src/flash/nand.c
   trunk/src/helper/ioutil.c
   trunk/src/target/trace.c
Log:
remove unused include file: inttypes.h

Modified: trunk/src/flash/flash.c
===================================================================
--- trunk/src/flash/flash.c	2009-06-05 06:37:21 UTC (rev 2071)
+++ trunk/src/flash/flash.c	2009-06-05 06:41:54 UTC (rev 2072)
@@ -31,8 +31,6 @@
 #include "image.h"
 #include "time_support.h"
 
-#include <inttypes.h>
-
 /* command handlers */
 static int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 static int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);

Modified: trunk/src/flash/nand.c
===================================================================
--- trunk/src/flash/nand.c	2009-06-05 06:37:21 UTC (rev 2071)
+++ trunk/src/flash/nand.c	2009-06-05 06:41:54 UTC (rev 2072)
@@ -28,9 +28,6 @@
 #include "time_support.h"
 #include "fileio.h"
 
-#include <inttypes.h>
-
-
 static int handle_nand_list_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 static int handle_nand_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 static int handle_nand_check_bad_blocks_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);

Modified: trunk/src/helper/ioutil.c
===================================================================
--- trunk/src/helper/ioutil.c	2009-06-05 06:37:21 UTC (rev 2071)
+++ trunk/src/helper/ioutil.c	2009-06-05 06:41:54 UTC (rev 2072)
@@ -55,9 +55,6 @@
 #include <malloc.h>
 #endif
 #endif
-//#ifdef HAVE_STRINGS_H
-//#include <strings.h>
-//#endif
 
 
 int handle_rm_command(struct command_context_s *cmd_ctx, char *cmd,

Modified: trunk/src/target/trace.c
===================================================================
--- trunk/src/target/trace.c	2009-06-05 06:37:21 UTC (rev 2071)
+++ trunk/src/target/trace.c	2009-06-05 06:41:54 UTC (rev 2072)
@@ -25,8 +25,6 @@
 #include "trace.h"
 #include "target.h"
 
-#include <inttypes.h>
-
 int trace_point(target_t *target, u32 number)
 {
 	trace_t *trace = target->trace_info;

[Openocd-svn] r2071 - trunk/src/target

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-06-05 08:37:21 +0200 (Fri, 05 Jun 2009)
New Revision: 2071

Modified:
   trunk/src/target/target.c
Log:
remove unused include file: inttypes.h

Modified: trunk/src/target/target.c
===================================================================
--- trunk/src/target/target.c	2009-06-05 06:26:02 UTC (rev 2070)
+++ trunk/src/target/target.c	2009-06-05 06:37:21 UTC (rev 2071)
@@ -42,9 +42,7 @@
 #include "image.h"
 #include "jtag.h"
 
-#include <inttypes.h>
 
-
 static int handle_targets_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 
 static int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);

[Openocd-svn] r2070 - zy1000/trunk/build/include

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-06-05 08:26:02 +0200 (Fri, 05 Jun 2009)
New Revision: 2070

Modified:
   zy1000/trunk/build/include/jtag_minidriver.h
Log:
keep up with jtag_tap_next_enabled name change

Modified: zy1000/trunk/build/include/jtag_minidriver.h
===================================================================
--- zy1000/trunk/build/include/jtag_minidriver.h	2009-06-05 00:43:43 UTC (rev 2069)
+++ zy1000/trunk/build/include/jtag_minidriver.h	2009-06-05 06:26:02 UTC (rev 2070)
@@ -157,9 +157,9 @@
 	enum tap_state pause_state = TAP_DRSHIFT;
 
 	jtag_tap_t *tap, *nextTap;
-	for(tap = jtag_NextEnabledTap(NULL); tap!= NULL; tap=nextTap)
+	for(tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap)
 	{
-		nextTap=jtag_NextEnabledTap(tap);
+		nextTap=jtag_tap_next_enabled(tap);
 		if (nextTap==NULL)
 		{
 			pause_state = end_state;
@@ -187,7 +187,7 @@
 		enum tap_state end_state)
 {
 
-	int singletap=(jtag_NextEnabledTap(jtag_NextEnabledTap(NULL))==NULL);
+	int singletap=(jtag_tap_next_enabled(jtag_tap_next_enabled(NULL))==NULL);
 	if ((singletap)&&(num_fields==3))
 	{
 		/* used by embeddedice_write_reg_inner() */

[Openocd-svn] r2069 - trunk/src/jtag

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

Author: zwelch
Date: 2009-06-05 02:43:43 +0200 (Fri, 05 Jun 2009)
New Revision: 2069

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
   trunk/src/jtag/jtag_driver.c
   trunk/src/jtag/zy1000.c
Log:
Eliminate MixedCaps symbol from public JTAG TAP API:
- Purely mechanical transformations to the source files.
- Rename 'jtag_NextEnabledTap' as 'jtag_tap_next_enabled.'


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 00:43:32 UTC (rev 2068)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:43:43 UTC (rev 2069)
@@ -987,7 +987,7 @@
 	}
 
 	/* point at the 1st tap */
-	tap = jtag_NextEnabledTap(NULL);
+	tap = jtag_tap_next_enabled(NULL);
 	if( tap == NULL ){
 		LOG_ERROR("JTAG: No taps enabled?");
 		return ERROR_JTAG_INIT_FAILED;
@@ -1094,7 +1094,7 @@
 						 tap->idcode);
 #endif
 			}
-			tap = jtag_NextEnabledTap(tap);
+			tap = jtag_tap_next_enabled(tap);
 		}
 		device_count++;
 	}
@@ -1122,7 +1122,7 @@
 	tap = NULL;
 	total_ir_length = 0;
 	for(;;){
-		tap = jtag_NextEnabledTap(tap);
+		tap = jtag_tap_next_enabled(tap);
 		if( tap == NULL ){
 			break;
 		}
@@ -1146,7 +1146,7 @@
 	chain_pos = 0;
 	int val;
 	for(;;){
-		tap = jtag_NextEnabledTap(tap);
+		tap = jtag_tap_next_enabled(tap);
 		if( tap == NULL ){
 			break;
 		}
@@ -1677,7 +1677,7 @@
 
 	LOG_DEBUG("Init JTAG chain");
 
-	tap = jtag_NextEnabledTap(NULL);
+	tap = jtag_tap_next_enabled(NULL);
 	if( tap == NULL ){
 		LOG_ERROR("There are no enabled taps?");
 		return ERROR_JTAG_INIT_FAILED;

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-05 00:43:32 UTC (rev 2068)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:43:43 UTC (rev 2069)
@@ -184,7 +184,7 @@
 extern int jtag_tap_count_enabled(void);
 extern int jtag_tap_count(void);
 
-static __inline__ jtag_tap_t* jtag_NextEnabledTap(jtag_tap_t* p)
+static __inline__ jtag_tap_t* jtag_tap_next_enabled(jtag_tap_t* p)
 {
 	if (p == NULL)
 	{

Modified: trunk/src/jtag/jtag_driver.c
===================================================================
--- trunk/src/jtag/jtag_driver.c	2009-06-05 00:43:32 UTC (rev 2068)
+++ trunk/src/jtag/jtag_driver.c	2009-06-05 00:43:43 UTC (rev 2069)
@@ -96,7 +96,7 @@
 
 	/* loop over all enabled TAPs */
 
-	for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
+	for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap))
 	{
 		/* search the input field list for fields for the current TAP */
 
@@ -138,7 +138,7 @@
 		field++;
 	}
 
-	assert(field == out_fields + num_taps); /* paranoia: jtag_tap_count_enabled() and jtag_NextEnabledTap() not in sync */
+	assert(field == out_fields + num_taps); /* paranoia: jtag_tap_count_enabled() and jtag_tap_next_enabled() not in sync */
 
 	return ERROR_OK;
 }
@@ -182,7 +182,7 @@
 
 	size_t bypass_devices = 0;
 
-	for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
+	for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap))
 	{
 		if (tap->bypass)
 			bypass_devices++;
@@ -207,7 +207,7 @@
 
 	/* loop over all enabled TAPs */
 
-	for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
+	for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap))
 	{
 		/* if TAP is not bypassed insert matching input fields */
 
@@ -271,7 +271,7 @@
 
 	size_t bypass_devices = 0;
 
-	for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
+	for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap))
 	{
 		if (tap->bypass)
 			bypass_devices++;
@@ -299,7 +299,7 @@
 
 	/* loop over all enabled TAPs */
 
-	for (jtag_tap_t * tap = jtag_NextEnabledTap(NULL); tap != NULL; tap = jtag_NextEnabledTap(tap))
+	for (jtag_tap_t * tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = jtag_tap_next_enabled(tap))
 	{
 		/* if TAP is not bypassed insert matching input fields */
 

Modified: trunk/src/jtag/zy1000.c
===================================================================
--- trunk/src/jtag/zy1000.c	2009-06-05 00:43:32 UTC (rev 2068)
+++ trunk/src/jtag/zy1000.c	2009-06-05 00:43:43 UTC (rev 2069)
@@ -511,9 +511,9 @@
 	int j;
 	int scan_size = 0;
 	jtag_tap_t *tap, *nextTap;
-	for(tap = jtag_NextEnabledTap(NULL); tap!= NULL; tap=nextTap)
+	for(tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap)
 	{
-		nextTap=jtag_NextEnabledTap(tap);
+		nextTap=jtag_tap_next_enabled(tap);
 		tap_state_t end_state;
 		if (nextTap==NULL)
 		{
@@ -580,9 +580,9 @@
 
 	int j;
 	jtag_tap_t *tap, *nextTap;
-	for(tap = jtag_NextEnabledTap(NULL); tap!= NULL; tap=nextTap)
+	for(tap = jtag_tap_next_enabled(NULL); tap!= NULL; tap=nextTap)
 	{
-		nextTap=jtag_NextEnabledTap(tap);
+		nextTap=jtag_tap_next_enabled(tap);
 		int found=0;
 		tap_state_t end_state;
 		if (nextTap==NULL)
@@ -749,7 +749,7 @@
 {
 //	static int const reg_addr=0x5;
 	tap_state_t end_state=jtag_get_end_state();
-	if (jtag_NextEnabledTap(jtag_NextEnabledTap(NULL))==NULL)
+	if (jtag_tap_next_enabled(jtag_tap_next_enabled(NULL))==NULL)
 	{
 		/* better performance via code duplication */
 		if (little)

[Openocd-svn] r2068 - trunk/src/jtag

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

Author: zwelch
Date: 2009-06-05 02:43:32 +0200 (Fri, 05 Jun 2009)
New Revision: 2068

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
   trunk/src/jtag/jtag_driver.c
Log:
Eliminate MixedCaps symbol from public JTAG TAP API:
- Purely mechanical transformations to the source files.
- Rename 'jtag_NumEnabledTaps' as 'jtag_tap_count_enabled.'


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 00:43:23 UTC (rev 2067)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:43:32 UTC (rev 2068)
@@ -246,7 +246,7 @@
 	return jtag_num_taps;
 }
 
-int jtag_NumEnabledTaps(void)
+int jtag_tap_count_enabled(void)
 {
 	jtag_tap_t *t;
 	int n;
@@ -1100,10 +1100,10 @@
 	}
 
 	/* see if number of discovered devices matches configuration */
-	if (device_count != jtag_NumEnabledTaps())
+	if (device_count != jtag_tap_count_enabled())
 	{
 		LOG_ERROR("number of discovered devices in JTAG chain (%i) doesn't match (enabled) configuration (%i), total taps: %d",
-				  device_count, jtag_NumEnabledTaps(), jtag_tap_count());
+				  device_count, jtag_tap_count_enabled(), jtag_tap_count());
 		LOG_ERROR("check the config file and ensure proper JTAG communication (connections, speed, ...)");
 		return ERROR_JTAG_INIT_FAILED;
 	}

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-05 00:43:23 UTC (rev 2067)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:43:32 UTC (rev 2068)
@@ -181,7 +181,7 @@
 extern jtag_tap_t* jtag_tap_by_string(const char* dotted_name);
 extern jtag_tap_t* jtag_tap_by_jim_obj(Jim_Interp* interp, Jim_Obj* obj);
 extern jtag_tap_t* jtag_tap_by_abs_position(int abs_position);
-extern int jtag_NumEnabledTaps(void);
+extern int jtag_tap_count_enabled(void);
 extern int jtag_tap_count(void);
 
 static __inline__ jtag_tap_t* jtag_NextEnabledTap(jtag_tap_t* p)

Modified: trunk/src/jtag/jtag_driver.c
===================================================================
--- trunk/src/jtag/jtag_driver.c	2009-06-05 00:43:23 UTC (rev 2067)
+++ trunk/src/jtag/jtag_driver.c	2009-06-05 00:43:32 UTC (rev 2068)
@@ -75,7 +75,7 @@
  */
 int interface_jtag_add_ir_scan(int in_num_fields, const scan_field_t *in_fields, tap_state_t state)
 {
-	size_t num_taps = jtag_NumEnabledTaps();
+	size_t num_taps = jtag_tap_count_enabled();
 
 	jtag_command_t * cmd		= cmd_queue_alloc(sizeof(jtag_command_t));
 	scan_command_t * scan		= cmd_queue_alloc(sizeof(scan_command_t));
@@ -138,7 +138,7 @@
 		field++;
 	}
 
-	assert(field == out_fields + num_taps); /* paranoia: jtag_NumEnabledTaps() and jtag_NextEnabledTap() not in sync */
+	assert(field == out_fields + num_taps); /* paranoia: jtag_tap_count_enabled() and jtag_NextEnabledTap() not in sync */
 
 	return ERROR_OK;
 }

[Openocd-svn] r2067 - trunk/src/jtag

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

Author: zwelch
Date: 2009-06-05 02:43:23 +0200 (Fri, 05 Jun 2009)
New Revision: 2067

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
Log:
Eliminate MixedCaps symbol from public JTAG TAP API:
- Purely mechanical transformations to the source files.
- Rename 'jtag_NumTotalTaps' as 'jtag_tap_count.'


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 00:43:12 UTC (rev 2066)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:43:23 UTC (rev 2067)
@@ -241,7 +241,7 @@
 	return __jtag_all_taps;
 };
 
-int jtag_NumTotalTaps(void)
+int jtag_tap_count(void)
 {
 	return jtag_num_taps;
 }
@@ -1103,7 +1103,7 @@
 	if (device_count != jtag_NumEnabledTaps())
 	{
 		LOG_ERROR("number of discovered devices in JTAG chain (%i) doesn't match (enabled) configuration (%i), total taps: %d",
-				  device_count, jtag_NumEnabledTaps(), jtag_NumTotalTaps());
+				  device_count, jtag_NumEnabledTaps(), jtag_tap_count());
 		LOG_ERROR("check the config file and ensure proper JTAG communication (connections, speed, ...)");
 		return ERROR_JTAG_INIT_FAILED;
 	}
@@ -1898,9 +1898,9 @@
 
 	newargs[0] = Jim_NewStringObj( interp, "jtag", -1   );
 	newargs[1] = Jim_NewStringObj( interp, "newtap", -1 );
-	sprintf( buf, "chip%d", jtag_NumTotalTaps() );
+	sprintf( buf, "chip%d", jtag_tap_count() );
 	newargs[2] = Jim_NewStringObj( interp, buf, -1 );
-	sprintf( buf, "tap%d", jtag_NumTotalTaps() );
+	sprintf( buf, "tap%d", jtag_tap_count() );
 	newargs[3] = Jim_NewStringObj( interp, buf, -1  );
 	newargs[4] = Jim_NewStringObj( interp, "-irlen", -1  );
 	newargs[5] = Jim_NewStringObj( interp, args[0], -1  );

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-05 00:43:12 UTC (rev 2066)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:43:23 UTC (rev 2067)
@@ -182,7 +182,7 @@
 extern jtag_tap_t* jtag_tap_by_jim_obj(Jim_Interp* interp, Jim_Obj* obj);
 extern jtag_tap_t* jtag_tap_by_abs_position(int abs_position);
 extern int jtag_NumEnabledTaps(void);
-extern int jtag_NumTotalTaps(void);
+extern int jtag_tap_count(void);
 
 static __inline__ jtag_tap_t* jtag_NextEnabledTap(jtag_tap_t* p)
 {

[Openocd-svn] r2066 - in trunk/src: jtag target

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

Author: zwelch
Date: 2009-06-05 02:43:12 +0200 (Fri, 05 Jun 2009)
New Revision: 2066

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
   trunk/src/target/target.c
Log:
Eliminate MixedCaps symbol from public JTAG TAP API:
- Purely mechanical transformations to the source files.
- Rename 'jtag_TapByJimObj' as 'jtag_tap_by_jim_obj.'


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 00:42:52 UTC (rev 2065)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:43:12 UTC (rev 2066)
@@ -300,7 +300,7 @@
 	return t;
 }
 
-jtag_tap_t * jtag_TapByJimObj( Jim_Interp *interp, Jim_Obj *o )
+jtag_tap_t * jtag_tap_by_jim_obj( Jim_Interp *interp, Jim_Obj *o )
 {
 	jtag_tap_t *t;
 	const char *cp;
@@ -1535,7 +1535,7 @@
 
 		{
 			jtag_tap_t *t;
-			t = jtag_TapByJimObj( goi.interp, goi.argv[0] );
+			t = jtag_tap_by_jim_obj( goi.interp, goi.argv[0] );
 			if( t == NULL ){
 				return JIM_ERR;
 			}
@@ -1569,7 +1569,7 @@
 			jtag_tap_t *t;
 
 			Jim_GetOpt_Obj(&goi, &o);
-			t = jtag_TapByJimObj( goi.interp, o );
+			t = jtag_tap_by_jim_obj( goi.interp, o );
 			if( t == NULL ){
 				return JIM_ERR;
 			}
@@ -1589,7 +1589,7 @@
 			jtag_tap_t *t;
 
 			Jim_GetOpt_Obj(&goi, &o);
-			t = jtag_TapByJimObj( goi.interp, o );
+			t = jtag_tap_by_jim_obj( goi.interp, o );
 			if( t == NULL ){
 				return JIM_ERR;
 			}
@@ -2434,7 +2434,7 @@
 		}
 	} /* validate args */
 
-	tap = jtag_TapByJimObj( interp, args[1] );
+	tap = jtag_tap_by_jim_obj( interp, args[1] );
 	if( tap == NULL ){
 		return JIM_ERR;
 	}

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-05 00:42:52 UTC (rev 2065)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:43:12 UTC (rev 2066)
@@ -179,7 +179,7 @@
 extern const char *jtag_tap_name(const jtag_tap_t *tap);
 extern jtag_tap_t* jtag_tap_by_position(int n);
 extern jtag_tap_t* jtag_tap_by_string(const char* dotted_name);
-extern jtag_tap_t* jtag_TapByJimObj(Jim_Interp* interp, Jim_Obj* obj);
+extern jtag_tap_t* jtag_tap_by_jim_obj(Jim_Interp* interp, Jim_Obj* obj);
 extern jtag_tap_t* jtag_tap_by_abs_position(int abs_position);
 extern int jtag_NumEnabledTaps(void);
 extern int jtag_NumTotalTaps(void);

Modified: trunk/src/target/target.c
===================================================================
--- trunk/src/target/target.c	2009-06-05 00:42:52 UTC (rev 2065)
+++ trunk/src/target/target.c	2009-06-05 00:43:12 UTC (rev 2066)
@@ -3450,7 +3450,7 @@
 				if( e != JIM_OK ){
 					return e;
 				}
-				tap = jtag_TapByJimObj( goi->interp, o );
+				tap = jtag_tap_by_jim_obj( goi->interp, o );
 				if( tap == NULL ){
 					return JIM_ERR;
 				}

[Openocd-svn] r2065 - in trunk/src: jtag pld target xsvf

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

Author: zwelch
Date: 2009-06-05 02:42:52 +0200 (Fri, 05 Jun 2009)
New Revision: 2065

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
   trunk/src/pld/virtex2.c
   trunk/src/target/arm11.c
   trunk/src/target/etb.c
   trunk/src/xsvf/xsvf.c
Log:
Eliminate MixedCaps symbol from public JTAG TAP API:
- Purely mechanical transformations to the source files.
- Rename 'jtag_TapByString' as 'jtag_tap_by_string.'


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 00:42:39 UTC (rev 2064)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:42:52 UTC (rev 2065)
@@ -273,7 +273,7 @@
 	*tap = t;
 }
 
-jtag_tap_t *jtag_TapByString( const char *s )
+jtag_tap_t *jtag_tap_by_string( const char *s )
 {
 	jtag_tap_t *t;
 	char *cp;
@@ -310,7 +310,7 @@
 		cp = "(unknown)";
 		t = NULL;
 	}  else {
-		t = jtag_TapByString( cp );
+		t = jtag_tap_by_string( cp );
 	}
 	if( t == NULL ){
 		Jim_SetResult_sprintf(interp,"Tap: %s is unknown", cp );
@@ -2326,7 +2326,7 @@
 
 	for (i = 0; i < num_fields; i++)
 	{
-		tap = jtag_TapByString( args[i*2] );
+		tap = jtag_tap_by_string( args[i*2] );
 		if (tap==NULL)
 		{
 			command_print( cmd_ctx, "Tap: %s unknown", args[i*2] );

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-05 00:42:39 UTC (rev 2064)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:42:52 UTC (rev 2065)
@@ -178,7 +178,7 @@
 extern jtag_tap_t* jtag_all_taps(void);
 extern const char *jtag_tap_name(const jtag_tap_t *tap);
 extern jtag_tap_t* jtag_tap_by_position(int n);
-extern jtag_tap_t* jtag_TapByString(const char* dotted_name);
+extern jtag_tap_t* jtag_tap_by_string(const char* dotted_name);
 extern jtag_tap_t* jtag_TapByJimObj(Jim_Interp* interp, Jim_Obj* obj);
 extern jtag_tap_t* jtag_tap_by_abs_position(int abs_position);
 extern int jtag_NumEnabledTaps(void);

Modified: trunk/src/pld/virtex2.c
===================================================================
--- trunk/src/pld/virtex2.c	2009-06-05 00:42:39 UTC (rev 2064)
+++ trunk/src/pld/virtex2.c	2009-06-05 00:42:52 UTC (rev 2065)
@@ -247,7 +247,7 @@
 		return ERROR_PLD_DEVICE_INVALID;
 	}
 
-	tap = jtag_TapByString( args[1] );
+	tap = jtag_tap_by_string( args[1] );
 	if( tap == NULL ){
 		command_print( cmd_ctx, "Tap: %s does not exist", args[1] );
 		return ERROR_OK;

Modified: trunk/src/target/arm11.c
===================================================================
--- trunk/src/target/arm11.c	2009-06-05 00:42:39 UTC (rev 2064)
+++ trunk/src/target/arm11.c	2009-06-05 00:42:52 UTC (rev 2065)
@@ -1837,7 +1837,7 @@
 	jtag_tap_t *	tap;
 	target_t *		t;
 
-	tap = jtag_TapByString(arg);
+	tap = jtag_tap_by_string(arg);
 
 	if (!tap)
 		return 0;

Modified: trunk/src/target/etb.c
===================================================================
--- trunk/src/target/etb.c	2009-06-05 00:42:39 UTC (rev 2064)
+++ trunk/src/target/etb.c	2009-06-05 00:42:52 UTC (rev 2065)
@@ -386,7 +386,7 @@
 		return ERROR_FAIL;
 	}
 
-	tap = jtag_TapByString( args[1] );
+	tap = jtag_tap_by_string( args[1] );
 	if (tap == NULL)
 	{
 		command_print(cmd_ctx, "Tap: %s does not exist", args[1] );

Modified: trunk/src/xsvf/xsvf.c
===================================================================
--- trunk/src/xsvf/xsvf.c	2009-06-05 00:42:39 UTC (rev 2064)
+++ trunk/src/xsvf/xsvf.c	2009-06-05 00:42:52 UTC (rev 2065)
@@ -232,7 +232,7 @@
 
 	if (strcmp(args[0], "plain") != 0)
 	{
-		tap = jtag_TapByString( args[0] );
+		tap = jtag_tap_by_string( args[0] );
 		if (!tap )
 		{
 			command_print( cmd_ctx, "Tap: %s unknown", args[0] );

[Openocd-svn] r2064 - in trunk/src: flash jtag

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

Author: zwelch
Date: 2009-06-05 02:42:39 +0200 (Fri, 05 Jun 2009)
New Revision: 2064

Modified:
   trunk/src/flash/str9xpec.c
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
Log:
Eliminate MixedCaps symbol from public JTAG TAP API:
- Purely mechanical transformations to the source files.
- Rename 'jtag_TapByAbsPosition' as 'jtag_tap_by_abs_position.'


Modified: trunk/src/flash/str9xpec.c
===================================================================
--- trunk/src/flash/str9xpec.c	2009-06-05 00:42:32 UTC (rev 2063)
+++ trunk/src/flash/str9xpec.c	2009-06-05 00:42:39 UTC (rev 2064)
@@ -325,7 +325,7 @@
 	arm7_9 = armv4_5->arch_info;
 	jtag_info = &arm7_9->jtag_info;
 
-	str9xpec_info->tap = jtag_TapByAbsPosition( jtag_info->tap->abs_chain_position - 1);
+	str9xpec_info->tap = jtag_tap_by_abs_position( jtag_info->tap->abs_chain_position - 1);
 	str9xpec_info->isc_enable = 0;
 
 	str9xpec_build_block_list(bank);

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 00:42:32 UTC (rev 2063)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:42:39 UTC (rev 2064)
@@ -294,7 +294,7 @@
 		n = strtol( s, &cp, 0 );
 		if( (s != cp) && (*cp == 0) ){
 			/* Then it is... */
-			t = jtag_TapByAbsPosition(n);
+			t = jtag_tap_by_abs_position(n);
 		}
 	}
 	return t;
@@ -319,7 +319,7 @@
 }
 
 /* returns a pointer to the n-th device in the scan chain */
-jtag_tap_t * jtag_TapByAbsPosition( int n )
+jtag_tap_t * jtag_tap_by_abs_position( int n )
 {
 	int orig_n;
 	jtag_tap_t *t;

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-05 00:42:32 UTC (rev 2063)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:42:39 UTC (rev 2064)
@@ -180,7 +180,7 @@
 extern jtag_tap_t* jtag_tap_by_position(int n);
 extern jtag_tap_t* jtag_TapByString(const char* dotted_name);
 extern jtag_tap_t* jtag_TapByJimObj(Jim_Interp* interp, Jim_Obj* obj);
-extern jtag_tap_t* jtag_TapByAbsPosition(int abs_position);
+extern jtag_tap_t* jtag_tap_by_abs_position(int abs_position);
 extern int jtag_NumEnabledTaps(void);
 extern int jtag_NumTotalTaps(void);
 

[Openocd-svn] r2063 - trunk/src/jtag

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

Author: zwelch
Date: 2009-06-05 02:42:32 +0200 (Fri, 05 Jun 2009)
New Revision: 2063

Modified:
   trunk/src/jtag/jtag.h
Log:
Eliminate MixedCaps symbol from public JTAG TAP API:
- Purely mechanical transformations to the source files.
- Rename 'jtag_TapByPosition' as 'jtag_tap_by_position.'


Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-05 00:42:25 UTC (rev 2062)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:42:32 UTC (rev 2063)
@@ -177,7 +177,7 @@
 };
 extern jtag_tap_t* jtag_all_taps(void);
 extern const char *jtag_tap_name(const jtag_tap_t *tap);
-extern jtag_tap_t* jtag_TapByPosition(int n);
+extern jtag_tap_t* jtag_tap_by_position(int n);
 extern jtag_tap_t* jtag_TapByString(const char* dotted_name);
 extern jtag_tap_t* jtag_TapByJimObj(Jim_Interp* interp, Jim_Obj* obj);
 extern jtag_tap_t* jtag_TapByAbsPosition(int abs_position);

[Openocd-svn] r2062 - trunk/src/jtag

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

Author: zwelch
Date: 2009-06-05 02:42:25 +0200 (Fri, 05 Jun 2009)
New Revision: 2062

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
Log:
Eliminate MixedCaps symbol from public JTAG TAP API:
- Purely mechanical transformations to the source files.
- Rename 'jtag_AllTaps' as 'jtag_all_taps.'


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 00:42:17 UTC (rev 2061)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:42:25 UTC (rev 2062)
@@ -236,7 +236,7 @@
 static int handle_verify_jtag_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 static int handle_tms_sequence_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 
-jtag_tap_t *jtag_AllTaps(void)
+jtag_tap_t *jtag_all_taps(void)
 {
 	return __jtag_all_taps;
 };
@@ -252,7 +252,7 @@
 	int n;
 
 	n = 0;
-	t = jtag_AllTaps();
+	t = jtag_all_taps();
 	while(t){
 		if( t->enabled ){
 			n++;
@@ -278,7 +278,7 @@
 	jtag_tap_t *t;
 	char *cp;
 
-	t = jtag_AllTaps();
+	t = jtag_all_taps();
 	/* try name first */
 	while(t){
 		if( 0 == strcmp( t->dotted_name, s ) ){
@@ -325,7 +325,7 @@
 	jtag_tap_t *t;
 
 	orig_n = n;
-	t = jtag_AllTaps();
+	t = jtag_all_taps();
 
 	while( t && (n > 0)) {
 		n--;
@@ -1933,7 +1933,7 @@
 {
 	jtag_tap_t *tap;
 
-	tap = jtag_AllTaps();
+	tap = jtag_all_taps();
 	command_print(cmd_ctx, "     TapName            | Enabled |   IdCode      Expected    IrLen IrCap  IrMask Instr     ");
 	command_print(cmd_ctx, "---|--------------------|---------|------------|------------|------|------|------|---------");
 

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-05 00:42:17 UTC (rev 2061)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:42:25 UTC (rev 2062)
@@ -175,7 +175,7 @@
 
 	jtag_tap_t* next_tap;
 };
-extern jtag_tap_t* jtag_AllTaps(void);
+extern jtag_tap_t* jtag_all_taps(void);
 extern const char *jtag_tap_name(const jtag_tap_t *tap);
 extern jtag_tap_t* jtag_TapByPosition(int n);
 extern jtag_tap_t* jtag_TapByString(const char* dotted_name);
@@ -189,7 +189,7 @@
 	if (p == NULL)
 	{
 		/* start at the head of list */
-		p = jtag_AllTaps();
+		p = jtag_all_taps();
 	}
 	else
 	{

[Openocd-svn] r2061 - trunk/src/jtag

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

Author: zwelch
Date: 2009-06-05 02:42:17 +0200 (Fri, 05 Jun 2009)
New Revision: 2061

Modified:
   trunk/src/jtag/jtag.c
Log:
Eliminate MixedCaps symbol from public JTAG TAP API:
- Purely mechanical transformations to the source files.
- Rename 'jtag_all_taps' as '__jtag_all_taps.'
- Frees original symbol name to rename the accessor function.


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 00:06:34 UTC (rev 2060)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:42:17 UTC (rev 2061)
@@ -66,9 +66,9 @@
 /**
  * List all TAPs that have been created.
  */
-static jtag_tap_t *jtag_all_taps = NULL;
+static jtag_tap_t *__jtag_all_taps = NULL;
 /**
- * The number of TAPs in the jtag_all_taps list, used to track the
+ * The number of TAPs in the __jtag_all_taps list, used to track the
  * assigned chain position to new TAPs
  */
 static int jtag_num_taps = 0;
@@ -238,7 +238,7 @@
 
 jtag_tap_t *jtag_AllTaps(void)
 {
-	return jtag_all_taps;
+	return __jtag_all_taps;
 };
 
 int jtag_NumTotalTaps(void)
@@ -267,7 +267,7 @@
 {
 	t->abs_chain_position = jtag_num_taps++;
 
-	jtag_tap_t **tap = &jtag_all_taps;
+	jtag_tap_t **tap = &__jtag_all_taps;
 	while(*tap != NULL)
 		tap = &(*tap)->next_tap;
 	*tap = t;

[Openocd-svn] r2060 - trunk/src/jtag

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

Author: zwelch
Date: 2009-06-05 02:06:34 +0200 (Fri, 05 Jun 2009)
New Revision: 2060

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
Log:
Add accessors for jtag_verify; use them in jim command handler.

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 00:04:12 UTC (rev 2059)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:06:34 UTC (rev 2060)
@@ -2524,27 +2524,33 @@
 	return ERROR_OK;
 }
 
+void jtag_set_verify(bool enable)
+{
+	jtag_verify = enable;
+}
+
+bool jtag_will_verify()
+{
+	return jtag_verify;
+}
+
 static int handle_verify_jtag_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
+	if (argc > 1)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
 	if (argc == 1)
 	{
 		if (strcmp(args[0], "enable") == 0)
-		{
-			jtag_verify = 1;
-		}
+			jtag_set_verify(true);
 		else if (strcmp(args[0], "disable") == 0)
-		{
-			jtag_verify = 0;
-		} else
-		{
+			jtag_set_verify(false);
+		else
 			return ERROR_COMMAND_SYNTAX_ERROR;
-		}
-	} else if (argc != 0)
-	{
-		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	command_print(cmd_ctx, "verify jtag capture is %s", (jtag_verify) ? "enabled": "disabled");
+	const char *status = jtag_will_verify() ? "enabled": "disabled";
+	command_print(cmd_ctx, "verify jtag capture is %s", status);
 
 	return ERROR_OK;
 }

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-05 00:04:12 UTC (rev 2059)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:06:34 UTC (rev 2060)
@@ -640,11 +640,15 @@
  */
 extern int jtag_add_statemove(tap_state_t goal_state);
 
+
+
 /// @returns the number of times the scan queue has been flushed
 int jtag_get_flush_queue_count(void);
 void jtag_set_nsrst_delay(unsigned delay);
 void jtag_set_ntrst_delay(unsigned delay);
 void jtag_set_speed_khz(unsigned speed);
 unsigned jtag_get_speed_khz(void);
+void jtag_set_verify(bool enable);
+bool jtag_will_verify(void);
 
 #endif /* JTAG_H */

[Openocd-svn] r2059 - trunk/src/jtag

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

Author: zwelch
Date: 2009-06-05 02:04:12 +0200 (Fri, 05 Jun 2009)
New Revision: 2059

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
Log:
Add accessors for reset delays; use them in jim command handlers.

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 00:02:00 UTC (rev 2058)
+++ trunk/src/jtag/jtag.c	2009-06-05 00:04:12 UTC (rev 2059)
@@ -2085,7 +2085,7 @@
 	}
 	else
 	{
-		jtag_nsrst_delay = strtoul(args[0], NULL, 0);
+		jtag_set_nsrst_delay(strtoul(args[0], NULL, 0));
 	}
 
 	return ERROR_OK;
@@ -2100,12 +2100,13 @@
 	}
 	else
 	{
-		jtag_ntrst_delay = strtoul(args[0], NULL, 0);
+		jtag_set_ntrst_delay(strtoul(args[0], NULL, 0));
 	}
 
 	return ERROR_OK;
 }
 
+
 static int handle_jtag_speed_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
 	int retval=ERROR_OK;
@@ -2699,3 +2700,13 @@
 	return retval;
 }
 
+void jtag_set_nsrst_delay(unsigned delay)
+{
+	jtag_nsrst_delay = delay;
+}
+void jtag_set_ntrst_delay(unsigned delay)
+{
+	jtag_ntrst_delay = delay;
+}
+
+

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-05 00:02:00 UTC (rev 2058)
+++ trunk/src/jtag/jtag.h	2009-06-05 00:04:12 UTC (rev 2059)
@@ -642,6 +642,8 @@
 
 /// @returns the number of times the scan queue has been flushed
 int jtag_get_flush_queue_count(void);
+void jtag_set_nsrst_delay(unsigned delay);
+void jtag_set_ntrst_delay(unsigned delay);
 void jtag_set_speed_khz(unsigned speed);
 unsigned jtag_get_speed_khz(void);