openocd-commit — OpenOCD commit maling list - read only

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

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

Author: oharboe
Date: 2009-05-07 08:51:27 +0200 (Thu, 07 May 2009)
New Revision: 1631

Modified:
   trunk/src/target/arm7tdmi.c
Log:
slightly increase readability of code

Modified: trunk/src/target/arm7tdmi.c
===================================================================
--- trunk/src/target/arm7tdmi.c	2009-05-07 06:47:09 UTC (rev 1630)
+++ trunk/src/target/arm7tdmi.c	2009-05-07 06:51:27 UTC (rev 1631)
@@ -265,28 +265,29 @@
 
 	jtag_add_dr_scan_now(2, fields, TAP_INVALID);
 
+	u32 readback=flip_u32(le_to_h_u32(tmp), 32);
 	switch (size)
 	{
 		case 4:
 			if (be)
 			{
-				h_u32_to_be(((u8*)in), flip_u32(le_to_h_u32(tmp), 32));
+				h_u32_to_be(((u8*)in), readback);
 			} else
 			{
-				 h_u32_to_le(((u8*)in), flip_u32(le_to_h_u32(tmp), 32));
+				 h_u32_to_le(((u8*)in), readback);
 			}
 			break;
 		case 2:
 			if (be)
 			{
-				h_u16_to_be(((u8*)in), flip_u32(le_to_h_u32(tmp), 32) & 0xffff);
+				h_u16_to_be(((u8*)in), readback & 0xffff);
 			} else
 			{
-				h_u16_to_le(((u8*)in), flip_u32(le_to_h_u32(tmp), 32) & 0xffff);
+				h_u16_to_le(((u8*)in), readback & 0xffff);
 			}
 			break;
 		case 1:
-			*((u8 *)in)= flip_u32(le_to_h_u32(tmp), 32) & 0xff;
+			*((u8 *)in)= readback & 0xff;
 			break;
 	}
 

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

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

Author: oharboe
Date: 2009-05-07 08:47:09 +0200 (Thu, 07 May 2009)
New Revision: 1630

Modified:
   trunk/src/target/arm7tdmi.c
Log:
another example of removing in_handler usage

Modified: trunk/src/target/arm7tdmi.c
===================================================================
--- trunk/src/target/arm7tdmi.c	2009-05-07 06:29:08 UTC (rev 1629)
+++ trunk/src/target/arm7tdmi.c	2009-05-07 06:47:09 UTC (rev 1630)
@@ -256,29 +256,40 @@
 	fields[0].in_value = NULL;
 	fields[0].in_handler = NULL;
 
-
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = NULL;
-	fields[1].in_value = NULL;
+	u8 tmp[4];
+	fields[1].in_value = tmp;
+	fields[1].in_handler = NULL;
+
+	jtag_add_dr_scan_now(2, fields, TAP_INVALID);
+
 	switch (size)
 	{
 		case 4:
-			fields[1].in_handler = (be) ? arm_jtag_buf_to_be32_flip : arm_jtag_buf_to_le32_flip; /* deprecated! invoke this from user code! */
+			if (be)
+			{
+				h_u32_to_be(((u8*)in), flip_u32(le_to_h_u32(tmp), 32));
+			} else
+			{
+				 h_u32_to_le(((u8*)in), flip_u32(le_to_h_u32(tmp), 32));
+			}
 			break;
 		case 2:
-			fields[1].in_handler = (be) ? arm_jtag_buf_to_be16_flip : arm_jtag_buf_to_le16_flip; /* deprecated! invoke this from user code! */
+			if (be)
+			{
+				h_u16_to_be(((u8*)in), flip_u32(le_to_h_u32(tmp), 32) & 0xffff);
+			} else
+			{
+				h_u16_to_le(((u8*)in), flip_u32(le_to_h_u32(tmp), 32) & 0xffff);
+			}
 			break;
 		case 1:
-			fields[1].in_handler = arm_jtag_buf_to_8_flip; /* deprecated! invoke this from user code! */
+			*((u8 *)in)= flip_u32(le_to_h_u32(tmp), 32) & 0xff;
 			break;
 	}
-	fields[1].in_handler_priv = in;
 
-
-
-	jtag_add_dr_scan(2, fields, TAP_INVALID);
-
 	jtag_add_runtest(0, TAP_INVALID);
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_

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

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

Author: oharboe
Date: 2009-05-07 08:29:08 +0200 (Thu, 07 May 2009)
New Revision: 1629

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
   trunk/src/jtag/zy1000.c
   trunk/src/target/arm7tdmi.c
Log:
added template for removing in_handler 

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-05-07 01:26:56 UTC (rev 1628)
+++ trunk/src/jtag/jtag.c	2009-05-07 06:29:08 UTC (rev 1629)
@@ -42,6 +42,8 @@
 #include <strings.h>
 #endif
 
+static void jtag_execute_queue_noclear(void);
+
 /* note that this is not marked as static as it must be available from outside jtag.c for those
    that implement the jtag_xxx() minidriver layer
 */
@@ -670,6 +672,12 @@
 		jtag_error=retval;
 }
 
+void jtag_add_dr_scan_now(int num_fields, scan_field_t *fields, tap_state_t state)
+{
+	jtag_add_dr_scan(num_fields, fields, state);
+	jtag_execute_queue_noclear();
+}
+
 int MINIDRIVER(interface_jtag_add_dr_scan)(int num_fields, scan_field_t *fields, tap_state_t state)
 {
 	int j;
@@ -1438,13 +1446,21 @@
 	return retval;
 }
 
-int jtag_execute_queue(void)
+static void jtag_execute_queue_noclear(void)
 {
 	int retval=interface_jtag_execute_queue();
-	if (retval==ERROR_OK)
+	/* we keep the first error */
+	if ((jtag_error==ERROR_OK)&&(retval!=ERROR_OK))
 	{
-		retval=jtag_error;
+		jtag_error=retval;
 	}
+}
+
+int jtag_execute_queue(void)
+{
+	int retval;
+	jtag_execute_queue_noclear();
+	retval=jtag_error;
 	jtag_error=ERROR_OK;
 	return retval;
 }
@@ -1485,10 +1501,10 @@
 	field.tap = NULL;
 	field.num_bits = sizeof(idcode_buffer) * 8;
 	field.out_value = idcode_buffer;
-	
+
 	field.in_value = idcode_buffer;
-	
-	
+
+
 	field.in_handler = NULL;
 
 	for (i = 0; i < JTAG_MAX_CHAIN_SIZE; i++)
@@ -1662,10 +1678,7 @@
 	field.tap = NULL;
 	field.num_bits = total_ir_length;
 	field.out_value = ir_test;
-	
 	field.in_value = ir_test;
-	
-	
 	field.in_handler = NULL;
 
 	jtag_add_plain_ir_scan(1, &field, TAP_RESET);

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-05-07 01:26:56 UTC (rev 1628)
+++ trunk/src/jtag/jtag.h	2009-05-07 06:29:08 UTC (rev 1629)
@@ -561,6 +561,10 @@
 extern void jtag_add_ir_scan(int num_fields, scan_field_t* fields, tap_state_t endstate);
 extern int  interface_jtag_add_ir_scan(int num_fields, scan_field_t* fields, tap_state_t endstate);
 extern void jtag_add_dr_scan(int num_fields, scan_field_t* fields, tap_state_t endstate);
+/* same as jtag_add_dr_scan but the scan is executed immediately. sets jtag_error if there
+ * was a failure.
+ */
+extern void jtag_add_dr_scan_now(int num_fields, scan_field_t* fields, tap_state_t endstate);
 extern int  interface_jtag_add_dr_scan(int num_fields, scan_field_t* fields, tap_state_t endstate);
 extern void jtag_add_plain_ir_scan(int num_fields, scan_field_t* fields, tap_state_t endstate);
 extern int  interface_jtag_add_plain_ir_scan(int num_fields, scan_field_t* fields, tap_state_t endstate);
@@ -696,6 +700,16 @@
  */
 extern int            jtag_execute_queue(void);
 
+/* this flag is set when an error occurs while executing the queue. cleared
+ * by jtag_execute_queue()
+ *
+ * this flag can also be set from application code if some error happens
+ * during processing that should be reported during jtag_execute_queue().
+ */
+extern int jtag_error;
+
+
+
 /* can be implemented by hw+sw */
 extern int            interface_jtag_execute_queue(void);
 extern int            jtag_power_dropout(int* dropout);

Modified: trunk/src/jtag/zy1000.c
===================================================================
--- trunk/src/jtag/zy1000.c	2009-05-07 01:26:56 UTC (rev 1628)
+++ trunk/src/jtag/zy1000.c	2009-05-07 06:29:08 UTC (rev 1629)
@@ -39,8 +39,6 @@
 #define ZYLIN_OPENOCD_VERSION "Zylin JTAG ZY1000 " ZYLIN_VERSION " " ZYLIN_DATE " " ZYLIN_TIME
 const char *zylin_config_dir="/config/settings";
 
-extern int jtag_error;
-
 /* low level command set
  */
 int zy1000_read(void);

Modified: trunk/src/target/arm7tdmi.c
===================================================================
--- trunk/src/target/arm7tdmi.c	2009-05-07 01:26:56 UTC (rev 1628)
+++ trunk/src/target/arm7tdmi.c	2009-05-07 06:29:08 UTC (rev 1629)
@@ -5,6 +5,9 @@
  *   Copyright (C) 2008 by Spencer Oliver                                  *
  *   sp...@sp...                                                  *
  *                                                                         *
+ *   Copyright (C) 2007,2008 vind Harboe                                 *
+ *   oyv...@zy...                                               *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -111,22 +114,14 @@
 		fields[0].tap = arm7_9->jtag_info.tap;
 		fields[0].num_bits = 1;
 		fields[0].out_value = NULL;
-		
 		fields[0].in_value = &breakpoint;
-		
-		
 		fields[0].in_handler = NULL;
-		
 
 		fields[1].tap = arm7_9->jtag_info.tap;
 		fields[1].num_bits = 32;
 		fields[1].out_value = NULL;
-		
 		fields[1].in_value = databus;
-		
-		
 		fields[1].in_handler = NULL;
-		
 
 		if((retval = arm_jtag_scann(&arm7_9->jtag_info, 0x1)) != ERROR_OK)
 		{
@@ -198,25 +193,24 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 1;
 	fields[0].out_value = NULL;
-	
 	fields[0].in_value = NULL;
-	
-	
 	fields[0].in_handler = NULL;
-	
 
+
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = NULL;
-	
-	fields[1].in_value = NULL;
-	fields[1].in_handler = arm_jtag_buf_to_u32_flip; /* deprecated! invoke this from user code! */
-	fields[1].in_handler_priv = in;
-	
-	
+	u8 tmp[4];
+	fields[1].in_value = tmp;
+	fields[1].in_handler = NULL;
 
-	jtag_add_dr_scan(2, fields, TAP_INVALID);
+	jtag_add_dr_scan_now(2, fields, TAP_INVALID);
 
+	if (jtag_error==ERROR_OK)
+	{
+		*in=flip_u32(le_to_h_u32(tmp), 32);
+	}
+
 	jtag_add_runtest(0, TAP_INVALID);
 
 #ifdef _DEBUG_INSTRUCTION_EXECUTION_
@@ -259,17 +253,13 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 1;
 	fields[0].out_value = NULL;
-	
 	fields[0].in_value = NULL;
-	
-	
 	fields[0].in_handler = NULL;
-	
 
+
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = NULL;
-	
 	fields[1].in_value = NULL;
 	switch (size)
 	{
@@ -284,9 +274,9 @@
 			break;
 	}
 	fields[1].in_handler_priv = in;
-	
-	
 
+
+
 	jtag_add_dr_scan(2, fields, TAP_INVALID);
 
 	jtag_add_runtest(0, TAP_INVALID);

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

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

Author: zwelch
Date: 2009-05-07 03:26:56 +0200 (Thu, 07 May 2009)
New Revision: 1628

Modified:
   trunk/src/target/arm11.c
Log:
Fix most pointer cast alignment warnings in arm11.c; fix u16 memory reads..

Modified: trunk/src/target/arm11.c
===================================================================
--- trunk/src/target/arm11.c	2009-05-07 00:58:38 UTC (rev 1627)
+++ trunk/src/target/arm11.c	2009-05-07 01:26:56 UTC (rev 1628)
@@ -1144,10 +1144,7 @@
 		{
 			arm11->reg_list[ARM11_RC_R1].dirty = 1;
 
-			u16 * buf16 = (u16*)buffer;
-
-			{size_t i;
-			for (i = 0; i < count; i++)
+			for (size_t i = 0; i < count; i++)
 			{
 				/* ldrh    r1, [r0], #2 */
 				arm11_run_instr_no_data1(arm11,
@@ -1158,20 +1155,24 @@
 				/* MCR p14,0,R1,c0,c5,0 */
 				arm11_run_instr_data_from_core(arm11, 0xEE001E15, &res, 1);
 
-				*buf16++ = res;
-			}}
+				u16 svalue = res;
+				memcpy(buffer + count * sizeof(u16), &svalue, sizeof(u16));
+			}
 
 			break;
 		}
 
 	case 4:
+		{
+		u32 instr = !arm11_config_memrw_no_increment ? 0xecb05e01 : 0xed905e00;
+		/** \todo TODO: buffer cast to u32* causes alignment warnings */
+		u32 *words = (u32 *)buffer;
 
 		/* LDC p14,c5,[R0],#4 */
 		/* LDC p14,c5,[R0] */
-		arm11_run_instr_data_from_core(arm11,
-			(!arm11_config_memrw_no_increment ? 0xecb05e01 : 0xed905e00),
-			(u32 *)buffer, count);
+		arm11_run_instr_data_from_core(arm11, instr, words, count);
 		break;
+		}
 	}
 
 	arm11_run_instr_data_finish(arm11);
@@ -1223,45 +1224,45 @@
 		{
 			arm11->reg_list[ARM11_RC_R1].dirty = 1;
 
-			u16 * buf16 = (u16*)buffer;
+			for (size_t i = 0; i < count; i++)
+			{
+				u16 value;
+				memcpy(&value, buffer + count * sizeof(u16), sizeof(u16));
 
-			{size_t i;
-			for (i = 0; i < count; i++)
-			{
 				/* MRC p14,0,r1,c0,c5,0 */
-				arm11_run_instr_data_to_core1(arm11, 0xee101e15, *buf16++);
+				arm11_run_instr_data_to_core1(arm11, 0xee101e15, value);
 
 				/* strh    r1, [r0], #2 */
 				/* strh    r1, [r0] */
 				arm11_run_instr_no_data1(arm11,
 					!arm11_config_memrw_no_increment ? 0xe0c010b2 : 0xe1c010b0);
-			}}
+			}
 
 			break;
 		}
 
-	case 4:
-		/** \todo TODO: check if buffer cast to u32* might cause alignment problems */
+	case 4: {
+		u32 instr = !arm11_config_memrw_no_increment ? 0xeca05e01 : 0xed805e00;
 
+		/** \todo TODO: buffer cast to u32* causes alignment warnings */
+		u32 *words = (u32*)buffer;
+
 		if (!arm11_config_memwrite_burst)
 		{
 			/* STC p14,c5,[R0],#4 */
 			/* STC p14,c5,[R0]*/
-			arm11_run_instr_data_to_core(arm11,
-				(!arm11_config_memrw_no_increment ? 0xeca05e01 : 0xed805e00),
-				(u32 *)buffer, count);
+			arm11_run_instr_data_to_core(arm11, instr, words, count);
 		}
 		else
 		{
 			/* STC p14,c5,[R0],#4 */
 			/* STC p14,c5,[R0]*/
-			arm11_run_instr_data_to_core_noack(arm11,
-				(!arm11_config_memrw_no_increment ? 0xeca05e01 : 0xed805e00),
-				(u32 *)buffer, count);
+			arm11_run_instr_data_to_core_noack(arm11, instr, words, count);
 		}
 
 		break;
 	}
+	}
 
 #if 1
 	/* r0 verification */

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

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

Author: zwelch
Date: 2009-05-07 02:58:38 +0200 (Thu, 07 May 2009)
New Revision: 1627

Modified:
   trunk/src/target/arm_adi_v5.c
Log:
Fix pointer cast alignment warnings in arm_adi_v5.c

Modified: trunk/src/target/arm_adi_v5.c
===================================================================
--- trunk/src/target/arm_adi_v5.c	2009-05-07 00:21:59 UTC (rev 1626)
+++ trunk/src/target/arm_adi_v5.c	2009-05-07 00:58:38 UTC (rev 1627)
@@ -45,6 +45,7 @@
 #include "log.h"
 #include "time_support.h"
 #include <stdlib.h>
+#include <string.h>
 
 /*
  * Transaction Mode:
@@ -448,7 +449,6 @@
 *****************************************************************************/
 int mem_ap_write_buf_u32(swjdp_common_t *swjdp, u8 *buffer, int count, u32 address)
 {
-	u32 outvalue;
 	int wcount, blocksize, writecount, errorcount = 0, retval = ERROR_OK;
 	u32 adr = address;
 	u8* pBuffer = buffer;
@@ -464,7 +464,8 @@
 		for (writecount = 0; writecount < count; writecount++)
 		{
 			int i;
-			outvalue = *((u32*)pBuffer);
+			u32 outvalue;
+			memcpy(&outvalue, pBuffer, sizeof(u32));
 
 			for (i = 0; i < 4; i++ )
 			{
@@ -472,7 +473,7 @@
 				outvalue >>= 8;
 				adr++;
 			}
-			pBuffer += 4;
+			pBuffer += sizeof(u32);
 		}
 	}
 
@@ -517,7 +518,6 @@
 
 int mem_ap_write_buf_packed_u16(swjdp_common_t *swjdp, u8 *buffer, int count, u32 address)
 {
-	u32 outvalue;
 	int retval = ERROR_OK;
 	int wcount, blocksize, writecount, i;
 
@@ -558,7 +558,8 @@
 			}
 			else
 			{
-				outvalue = *((u32*)buffer);
+				u32 outvalue;
+				memcpy(&outvalue, buffer, sizeof(u32));
 
 				for (i = 0; i < nbytes; i++ )
 				{
@@ -567,7 +568,7 @@
 					address++;
 				}
 
-				outvalue = *((u32*)buffer);
+				memcpy(&outvalue, buffer, sizeof(u32));
 				dap_ap_write_reg_u32(swjdp, AP_REG_DRW, outvalue);
 				if (swjdp_transaction_endcheck(swjdp) != ERROR_OK)
 				{
@@ -588,7 +589,6 @@
 
 int mem_ap_write_buf_u16(swjdp_common_t *swjdp, u8 *buffer, int count, u32 address)
 {
-	u32 outvalue;
 	int retval = ERROR_OK;
 
 	if (count >= 4)
@@ -599,7 +599,9 @@
 	while (count > 0)
 	{
 		dap_setup_accessport(swjdp, CSW_16BIT | CSW_ADDRINC_SINGLE, address);
-		outvalue = *((u16*)buffer) << 8 * (address & 0x3);
+		u16 svalue;
+		memcpy(&svalue, buffer, sizeof(u16));
+		u32 outvalue = (u32)svalue << 8 * (address & 0x3);
 		dap_ap_write_reg_u32(swjdp, AP_REG_DRW, outvalue );
 		retval = swjdp_transaction_endcheck(swjdp);
 		count -= 2;
@@ -612,7 +614,6 @@
 
 int mem_ap_write_buf_packed_u8(swjdp_common_t *swjdp, u8 *buffer, int count, u32 address)
 {
-	u32 outvalue;
 	int retval = ERROR_OK;
 	int wcount, blocksize, writecount, i;
 
@@ -649,7 +650,8 @@
 			}
 			else
 			{
-				outvalue = *((u32*)buffer);
+				u32 outvalue;
+				memcpy(&outvalue, buffer, sizeof(u32));
 
 				for (i = 0; i < nbytes; i++ )
 				{
@@ -658,7 +660,7 @@
 					address++;
 				}
 
-				outvalue = *((u32*)buffer);
+				memcpy(&outvalue, buffer, sizeof(u32));
 				dap_ap_write_reg_u32(swjdp, AP_REG_DRW, outvalue);
 				if (swjdp_transaction_endcheck(swjdp) != ERROR_OK)
 				{
@@ -679,7 +681,6 @@
 
 int mem_ap_write_buf_u8(swjdp_common_t *swjdp, u8 *buffer, int count, u32 address)
 {
-	u32 outvalue;
 	int retval = ERROR_OK;
 
 	if (count >= 4)
@@ -690,7 +691,7 @@
 	while (count > 0)
 	{
 		dap_setup_accessport(swjdp, CSW_8BIT | CSW_ADDRINC_SINGLE, address);
-		outvalue = *((u8*)buffer) << 8 * (address & 0x3);
+		u32 outvalue = (u32)*buffer << 8 * (address & 0x3);
 		dap_ap_write_reg_u32(swjdp, AP_REG_DRW, outvalue );
 		retval = swjdp_transaction_endcheck(swjdp);
 		count--;
@@ -766,7 +767,8 @@
 		for (readcount = 0; readcount < count; readcount++)
 		{
 			int i;
-			u32 data = *((u32*)pBuffer);
+			u32 data;
+			memcpy(&data, pBuffer, sizeof(u32));
 
 			for (i = 0; i < 4; i++ )
 			{
@@ -858,7 +860,8 @@
 		}
 		else
 		{
-			*((u16*)buffer) = (invalue >> 8 * (address & 0x3));
+			u16 svalue = (invalue >> 8 * (address & 0x3));
+			memcpy(buffer, &svalue, sizeof(u16));
 			address += 2;
 			buffer += 2;
 		}

[Openocd-svn] r1626 - trunk/src/flash

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

Author: zwelch
Date: 2009-05-07 02:21:59 +0200 (Thu, 07 May 2009)
New Revision: 1626

Modified:
   trunk/src/flash/pic32mx.c
   trunk/src/flash/stm32x.c
Log:
Fix stm32x and pic32mx flash pointer cast alignment warnings, simplify their last word handling.

Modified: trunk/src/flash/pic32mx.c
===================================================================
--- trunk/src/flash/pic32mx.c	2009-05-06 23:31:50 UTC (rev 1625)
+++ trunk/src/flash/pic32mx.c	2009-05-07 00:21:59 UTC (rev 1626)
@@ -463,9 +463,10 @@
 
 	while(count > 0)
 	{
-		u32 status;
+		u32 value;
+		memcpy(&value, buffer, sizeof(u32));
 
-		status = pic32mx_write_word(bank, address, *(u32*)buffer);
+		u32 status = pic32mx_write_word(bank, address, value);
 		if( status & NVMCON_NVMERR ) {
 			LOG_ERROR("Flash write error NVMERR (status=0x%08x)", status);
 			retval = ERROR_FLASH_OPERATION_FAILED;
@@ -568,8 +569,10 @@
 
 	while (words_remaining > 0)
 	{
-		status = pic32mx_write_word(bank, address, *(u32*)(buffer + bytes_written));
+		u32 value;
+		memcpy(&value, buffer + bytes_written, sizeof(u32));
 
+		status = pic32mx_write_word(bank, address, value);
 		if( status & NVMCON_NVMERR )
 			return ERROR_FLASH_OPERATION_FAILED;
 		if( status & NVMCON_LVDERR )
@@ -582,19 +585,10 @@
 
 	if (bytes_remaining)
 	{
-		u8 last_word[4] = {0xff, 0xff, 0xff, 0xff};
-		int i = 0;
+		u32 value = 0xffffffff;
+		memcpy(&value, buffer + bytes_written, bytes_remaining);
 
-		while(bytes_remaining > 0)
-		{
-			/* Assumes little endian */
-			last_word[i++] = *(buffer + bytes_written);
-			bytes_remaining--;
-			bytes_written++;
-		}
-
-		status = pic32mx_write_word(bank, address, *(u32*)last_word);
-
+		status = pic32mx_write_word(bank, address, value);
 		if( status & NVMCON_NVMERR )
 			return ERROR_FLASH_OPERATION_FAILED;
 		if( status & NVMCON_LVDERR )

Modified: trunk/src/flash/stm32x.c
===================================================================
--- trunk/src/flash/stm32x.c	2009-05-06 23:31:50 UTC (rev 1625)
+++ trunk/src/flash/stm32x.c	2009-05-07 00:21:59 UTC (rev 1626)
@@ -658,8 +658,11 @@
 
 	while (words_remaining > 0)
 	{
+		u16 value;
+		memcpy(&value, buffer + bytes_written, sizeof(u16));
+
 		target_write_u32(target, STM32_FLASH_CR, FLASH_PG);
-		target_write_u16(target, address, *(u16*)(buffer + bytes_written));
+		target_write_u16(target, address, value);
 		
 		status = stm32x_wait_status_busy(bank, 5);
 		
@@ -681,18 +684,11 @@
 	
 	if (bytes_remaining)
 	{
-		u8 last_halfword[2] = {0xff, 0xff};
-		int i = 0;
-				
-		while(bytes_remaining > 0)
-		{
-			last_halfword[i++] = *(buffer + bytes_written); 
-			bytes_remaining--;
-			bytes_written++;
-		}
-		
+		u16 value = 0xffff;
+		memcpy(&value, buffer + bytes_written, bytes_remaining);
+
 		target_write_u32(target, STM32_FLASH_CR, FLASH_PG);
-		target_write_u16(target, address, *(u16*)last_halfword);
+		target_write_u16(target, address, value);
 		
 		status = stm32x_wait_status_busy(bank, 5);
 		

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

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

Author: zwelch
Date: 2009-05-07 01:31:50 +0200 (Thu, 07 May 2009)
New Revision: 1625

Modified:
   trunk/src/target/xscale.c
Log:
Fix pointer cast alignment warning in XScale miniIC loader parity calc.

Modified: trunk/src/target/xscale.c
===================================================================
--- trunk/src/target/xscale.c	2009-05-06 23:28:38 UTC (rev 1624)
+++ trunk/src/target/xscale.c	2009-05-06 23:31:50 UTC (rev 1625)
@@ -833,7 +833,11 @@
 	for (word = 0; word < 8; word++)
 	{
 		buf_set_u32(packet, 0, 32, buffer[word]);
-		cmd = parity(*((u32*)packet));
+
+		u32 value;
+		memcpy(&value, packet, sizeof(u32));
+		cmd = parity(value);
+
 		jtag_add_dr_scan(2, fields, TAP_INVALID);
 	}
 

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

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

Author: zwelch
Date: 2009-05-07 01:28:38 +0200 (Thu, 07 May 2009)
New Revision: 1624

Modified:
   trunk/src/target/image.c
Log:
Fix pointer cast alignment warnings in target/image.c.

Modified: trunk/src/target/image.c
===================================================================
--- trunk/src/target/image.c	2009-05-06 23:25:27 UTC (rev 1623)
+++ trunk/src/target/image.c	2009-05-06 23:28:38 UTC (rev 1624)
@@ -217,7 +217,9 @@
 
 			while (count-- > 0)
 			{
-				sscanf(&lpszLine[bytes_read], "%2x", (u32*)&ihex->buffer[cooked_bytes]);
+				unsigned value;
+				sscanf(&lpszLine[bytes_read], "%2x", &value);
+				ihex->buffer[cooked_bytes] = (u8)value;
 				cal_checksum += (u8)ihex->buffer[cooked_bytes];
 				bytes_read += 2;
 				cooked_bytes += 1;
@@ -594,7 +596,9 @@
 
 			while (count-- > 0)
 			{
-				sscanf(&lpszLine[bytes_read], "%2x", (u32*)&mot->buffer[cooked_bytes]);
+				unsigned value;
+				sscanf(&lpszLine[bytes_read], "%2x", &value);
+				mot->buffer[cooked_bytes] = (u8)value;
 				cal_checksum += (u8)mot->buffer[cooked_bytes];
 				bytes_read += 2;
 				cooked_bytes += 1;

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

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

Author: zwelch
Date: 2009-05-07 01:25:27 +0200 (Thu, 07 May 2009)
New Revision: 1623

Modified:
   trunk/src/target/armv7m.c
   trunk/src/target/register.h
Log:
Change reg_s value field from u8 * to void *; it must always be cast.

Modified: trunk/src/target/armv7m.c
===================================================================
--- trunk/src/target/armv7m.c	2009-05-06 23:05:57 UTC (rev 1622)
+++ trunk/src/target/armv7m.c	2009-05-06 23:25:27 UTC (rev 1623)
@@ -289,7 +289,7 @@
 
 	/* ARMV7M is always in thumb mode, try to make GDB understand this
 	 * if it does not support this arch */
-	armv7m->core_cache->reg_list[15].value[0] |= 1;
+	*((char*)armv7m->core_cache->reg_list[15].value) |= 1;
 #else
 	(*reg_list)[25] = &armv7m->core_cache->reg_list[ARMV7M_xPSR];
 #endif

Modified: trunk/src/target/register.h
===================================================================
--- trunk/src/target/register.h	2009-05-06 23:05:57 UTC (rev 1622)
+++ trunk/src/target/register.h	2009-05-06 23:25:27 UTC (rev 1623)
@@ -37,7 +37,7 @@
 typedef struct reg_s
 {
 	char *name;
-	u8 *value;
+	void *value;
 	int dirty;
 	int valid;
 	u32 size;

[Openocd-svn] r1622 - trunk/src/svf

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

Author: zwelch
Date: 2009-05-07 01:05:57 +0200 (Thu, 07 May 2009)
New Revision: 1622

Modified:
   trunk/src/svf/svf.c
Log:
Fix pointer cast alignment issues in svf.c

Modified: trunk/src/svf/svf.c
===================================================================
--- trunk/src/svf/svf.c	2009-05-06 21:48:39 UTC (rev 1621)
+++ trunk/src/svf/svf.c	2009-05-06 23:05:57 UTC (rev 1622)
@@ -653,11 +653,17 @@
 			{
 				if ((svf_tdi_buffer[index + j] & svf_mask_buffer[index + j]) != svf_tdo_buffer[index + j])
 				{
-					LOG_ERROR("tdo check error at line %d, read = 0x%X, want = 0x%X, mask = 0x%X",
+					unsigned bitmask = (1 << svf_check_tdo_para[i].bit_len) - 1;
+					unsigned received, expected, tapmask;
+					memcpy(&received, svf_tdi_buffer + index, sizeof(unsigned));
+					memcpy(&expected, svf_tdo_buffer + index, sizeof(unsigned));
+					memcpy(&tapmask, svf_mask_buffer + index, sizeof(unsigned));
+					LOG_ERROR("tdo check error at line %d, "
+						"read = 0x%X, want = 0x%X, mask = 0x%X",
 								svf_check_tdo_para[i].line_num,
-								(*(int*)(svf_tdi_buffer + index)) & ((1 << svf_check_tdo_para[i].bit_len) - 1),
-								(*(int*)(svf_tdo_buffer + index)) & ((1 << svf_check_tdo_para[i].bit_len) - 1),
-								(*(int*)(svf_mask_buffer + index)) & ((1 << svf_check_tdo_para[i].bit_len) - 1));
+								received & bitmask,
+								expected & bitmask,
+								tapmask & bitmask);
 					return ERROR_FAIL;
 				}
 			}
@@ -1381,8 +1387,11 @@
 			// output debug info
 			if ((SIR == command) || (SDR == command))
 			{
+				int read_value;
+				memcpy(&read_value, svf_tdi_buffer, sizeof(int));
 				// in debug mode, data is from index 0
-				LOG_DEBUG("\tTDO read = 0x%X", (*(int*)svf_tdi_buffer) & ((1 << (svf_check_tdo_para[0].bit_len)) - 1));
+				int read_mask = (1 << (svf_check_tdo_para[0].bit_len)) - 1;
+				LOG_DEBUG("\tTDO read = 0x%X", read_value & read_mask);
 			}
 		}
 	}

[Openocd-svn] r1621 - trunk

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

Author: zwelch
Date: 2009-05-06 23:48:39 +0200 (Wed, 06 May 2009)
New Revision: 1621

Modified:
   trunk/configure.in
Log:
Add configure script check to enable C99 build option.

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2009-05-06 21:21:18 UTC (rev 1620)
+++ trunk/configure.in	2009-05-06 21:48:39 UTC (rev 1621)
@@ -781,6 +781,7 @@
 
 AC_LANG_C
 AC_PROG_CC
+AC_PROG_CC_C99
 AM_PROG_CC_C_O
 AC_PROG_RANLIB
 

[Openocd-svn] r1620 - trunk/src/helper

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

Author: zwelch
Date: 2009-05-06 23:21:18 +0200 (Wed, 06 May 2009)
New Revision: 1620

Modified:
   trunk/src/helper/jim.c
Log:
Fix pointer cast alignment warnings in jim.c.

Modified: trunk/src/helper/jim.c
===================================================================
--- trunk/src/helper/jim.c	2009-05-06 18:47:15 UTC (rev 1619)
+++ trunk/src/helper/jim.c	2009-05-06 21:21:18 UTC (rev 1620)
@@ -7650,6 +7650,8 @@
                 scanned += 1;
                 break;
             case 'd': case 'o': case 'x': case 'u': case 'i': {
+                jim_wide jwvalue;
+                long lvalue;
                 char *endp;  /* Position where the number finished */
                 int base = descr->type == 'o' ? 8
                     : descr->type == 'x' ? 16
@@ -7659,16 +7661,22 @@
                 do {
                     /* Try to scan a number with the given base */
                     if (descr->modifier == 'l')
+                    {
 #ifdef HAVE_LONG_LONG
-                      *(jim_wide*)value = JimStrtoll(tok, &endp, base);
+                        jwvalue = JimStrtoll(tok, &endp, base),
 #else
-                      *(jim_wide*)value = strtol(tok, &endp, base);
+                        jwvalue = strtol(tok, &endp, base),
 #endif
+                        memcpy(value, &jwvalue, sizeof(jim_wide));
+                    }
                     else
+                    {
                       if (descr->type == 'u')
-                        *(long*)value = strtoul(tok, &endp, base);
+                        lvalue = strtoul(tok, &endp, base);
                       else
-                        *(long*)value = strtol(tok, &endp, base);
+                        lvalue = strtol(tok, &endp, base);
+                      memcpy(value, &lvalue, sizeof(lvalue));
+                    }
                     /* If scanning failed, and base was undetermined, simply
                      * put it to 10 and try once more. This should catch the
                      * case where %i begin to parse a number prefix (e.g. 
@@ -7680,9 +7688,9 @@
                 if (endp != tok) {
                     /* There was some number sucessfully scanned! */
                     if (descr->modifier == 'l')
-                        *valObjPtr = Jim_NewIntObj(interp, *(jim_wide*)value);
+                        *valObjPtr = Jim_NewIntObj(interp, jwvalue);
                     else
-                        *valObjPtr = Jim_NewIntObj(interp, *(long*)value);
+                        *valObjPtr = Jim_NewIntObj(interp, lvalue);
                     /* Adjust the number-of-chars scanned so far */
                     scanned += endp - tok;
                 } else {
@@ -7701,10 +7709,11 @@
             case 'e': case 'f': case 'g': {
                 char *endp;
 
-                *(double*)value = strtod(tok, &endp);
+                double dvalue = strtod(tok, &endp);
+                memcpy(value, &dvalue, sizeof(double));
                 if (endp != tok) {
                     /* There was some number sucessfully scanned! */
-                    *valObjPtr = Jim_NewDoubleObj(interp, *(double*)value);
+                    *valObjPtr = Jim_NewDoubleObj(interp, dvalue);
                     /* Adjust the number-of-chars scanned so far */
                     scanned += endp - tok;
                 } else {

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

[<ml...@ma...>]

Author: mlu
Date: 2009-05-06 20:47:15 +0200 (Wed, 06 May 2009)
New Revision: 1619

Modified:
   trunk/src/jtag/jtag.c
Log:
Added  (BUILD_JLINK==1) condition to us new tables with JLink


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-05-06 18:24:24 UTC (rev 1618)
+++ trunk/src/jtag/jtag.c	2009-05-06 18:47:15 UTC (rev 1619)
@@ -3116,7 +3116,7 @@
 
 #define B8(bits,count)		{ ((u8)B8__(HEX__(bits))), (count) }
 
-#if 0 && ((BUILD_FT2232_FTD2XX==1) || (BUILD_FT2232_LIBFTDI==1))
+#if 0 && ((BUILD_FT2232_FTD2XX==1) || (BUILD_FT2232_LIBFTDI==1) || (BUILD_JLINK==1))
 	/* 	this is the table submitted by Jeff Williams on 3/30/2009 with this comment:
 
 		OK, I added Peter's version of the state table, and it works OK for

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

[<oh...@ma...>]

Author: oharboe
Date: 2009-05-06 20:24:24 +0200 (Wed, 06 May 2009)
New Revision: 1618

Modified:
   trunk/src/jtag/jtag.c
Log:
Dick Hollenbeck <di...@so...> comments & 7 clock TMS reset for good measure

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-05-06 18:18:00 UTC (rev 1617)
+++ trunk/src/jtag/jtag.c	2009-05-06 18:24:24 UTC (rev 1618)
@@ -579,7 +579,7 @@
 			{
 				found = 1;
 				(*last_cmd)->cmd.scan->fields[nth_tap].out_value = buf_cpy(fields[j].out_value, cmd_queue_alloc(CEIL(scan_size, 8)), scan_size);
-				
+
 				if (jtag_verify_capture_ir)
 				{
 					if (fields[j].in_handler==NULL)
@@ -938,7 +938,7 @@
 
 void jtag_add_pathmove(int num_states, tap_state_t *path)
 {
-	tap_state_t cur_state=cmd_queue_cur_state;
+	tap_state_t cur_state = cmd_queue_cur_state;
 	int i;
 	int retval;
 
@@ -956,6 +956,7 @@
 			LOG_ERROR("BUG: TAP_RESET is not a valid state for pathmove sequences");
 			exit(-1);
 		}
+
 		if ( tap_state_transition(cur_state, true)  != path[i]
 		  && tap_state_transition(cur_state, false) != path[i])
 		{
@@ -967,7 +968,7 @@
 
 	jtag_prelude1();
 
-	retval=interface_jtag_add_pathmove(num_states, path);
+	retval = interface_jtag_add_pathmove(num_states, path);
 	cmd_queue_cur_state = path[num_states - 1];
 	if (retval!=ERROR_OK)
 		jtag_error=retval;
@@ -1489,7 +1490,6 @@
 	
 	
 	field.in_handler = NULL;
-	
 
 	for (i = 0; i < JTAG_MAX_CHAIN_SIZE; i++)
 	{
@@ -1667,7 +1667,6 @@
 	
 	
 	field.in_handler = NULL;
-	
 
 	jtag_add_plain_ir_scan(1, &field, TAP_RESET);
 	jtag_execute_queue();
@@ -3127,29 +3126,40 @@
 		some long-standing problems.
 		Jeff
 
-		I added the bit count into the table
+		I added the bit count into the table, reduced RESET column to 7 bits from 8.
 		Dick
+
+		state specific comments:
+		------------------------
+		*->RESET		   tried the 5 bit reset and it gave me problems, 7 bits seems to
+					   work better on ARM9 with ft2232 driver.  (Dick)
+
+		RESET->DRSHIFT add 1 extra clock cycles in the RESET state before advancing.
+						needed on ARM9 with ft2232 driver.  (Dick)
+
+		RESET->IRSHIFT add 1 extra clock cycles in the RESET state before advancing.
+						needed on ARM9 with ft2232 driver.  (Dick)
 	*/
 
 	/* to state: */
-	/*	RESET			IDLE				DRSHIFT			DRPAUSE			IRSHIFT	  		IRPAUSE */		/* from state: */
-	{	B8(11111,5),		B8(0,1),			B8(0010,4), 		B8(01010,5),		B8(00110,5), 	B8(010110,6) },	/* RESET */
-	{	B8(11111,5),		B8(0,1),			B8(001,3),  		B8(0101,4),		B8(0011,4),  	B8(01011,5) },	/* IDLE */
-	{	B8(11111,5),		B8(011,3),		B8(00111,5),		B8(01,2),		B8(001111,6),	B8(0101111,7) },	/* DRSHIFT */
-	{	B8(11111,5),		B8(011,3),		B8(01,2),   		B8(0,1),			B8(001111,6),	B8(0101111,7) },	/* DRPAUSE */
-	{	B8(11111,5),		B8(011,3),		B8(00111,5),		B8(010111,6), 	B8(001111,6),	B8(01,2) },		/* IRSHIFT */
-	{	B8(11111,5),		B8(011,3),		B8(00111,5),		B8(010111,6),	B8(01,2),   		B8(0,1) } 		/* IRPAUSE */
+	/*	RESET			IDLE				DRSHIFT			DRPAUSE			IRSHIFT	  		IRPAUSE */			/* from state: */
+	{	B8(1111111,7),	B8(0,1),			B8(00101,5), 	B8(01010,5),		B8(001101,6), 	B8(010110,6) },		/* RESET */
+	{	B8(1111111,7),	B8(0,1),			B8(001,3),		B8(0101,4),		B8(0011,4),  	B8(01011,5) },		/* IDLE */
+	{	B8(1111111,7),	B8(011,3),		B8(00111,5),		B8(01,2),		B8(001111,6),	B8(0101111,7) },		/* DRSHIFT */
+	{	B8(1111111,7),	B8(011,3),		B8(01,2),   		B8(0,1),			B8(001111,6),	B8(0101111,7) },		/* DRPAUSE */
+	{	B8(1111111,7),	B8(011,3),		B8(00111,5),		B8(010111,6), 	B8(001111,6),	B8(01,2) },			/* IRSHIFT */
+	{	B8(1111111,7),	B8(011,3),		B8(00111,5),		B8(010111,6),	B8(01,2),		B8(0,1) } 			/* IRPAUSE */
 
 #else	/* this is the old table, converted from hex and with the bit_count set to 7 for each combo, like before */
 
 	/* to state: */
-	/*	RESET			IDLE			DRSHIFT			DRPAUSE			IRSHIFT			IRPAUSE 	*/		/* from state: */
-	{	B8(1111111,7),	B8(0000000,7),	B8(0010111,7),	B8(0001010,7),	B8(0011011,7),	B8(0010110,7) },	/* RESET */
-	{	B8(1111111,7),	B8(0000000,7),	B8(0100101,7),	B8(0000101,7),	B8(0101011,7),	B8(0001011,7) },	/* IDLE */
-	{	B8(1111111,7),	B8(0110001,7),	B8(0000000,7),	B8(0000001,7),	B8(0001111,7),	B8(0101111,7) },	/* DRSHIFT */
-	{	B8(1111111,7),	B8(0110000,7),	B8(0100000,7),	B8(0010111,7),	B8(0011110,7),	B8(0101111,7) },	/* DRPAUSE */
-	{	B8(1111111,7),	B8(0110001,7),	B8(0000111,7),	B8(0010111,7),	B8(0000000,7),	B8(0000001,7) },	/* IRSHIFT */
-	{	B8(1111111,7),	B8(0110000,7),	B8(0011100,7),	B8(0010111,7),	B8(0100000,7),	B8(0101111,7) },	/* IRPAUSE */
+	/*	RESET			IDLE				DRSHIFT			DRPAUSE			IRSHIFT	  		IRPAUSE */			/* from state: */
+	{	B8(1111111,7),	B8(0000000,7),	B8(0010111,7), 	B8(0001010,7),	B8(0011011,7), 	B8(0010110,7) },		/* RESET */
+	{	B8(1111111,7),	B8(0000000,7),	B8(0100101,7),	B8(0000101,7),	B8(0101011,7),	B8(0001011,7) },		/* IDLE */
+	{	B8(1111111,7),	B8(0110001,7),	B8(0000000,7),	B8(0000001,7),	B8(0001111,7),	B8(0101111,7) },		/* DRSHIFT */
+	{	B8(1111111,7),	B8(0110000,7),	B8(0100000,7),	B8(0010111,7),	B8(0011110,7),	B8(0101111,7) },		/* DRPAUSE */
+	{	B8(1111111,7),	B8(0110001,7),	B8(0000111,7),	B8(0010111,7), 	B8(0000000,7),	B8(0000001,7) },		/* IRSHIFT */
+	{	B8(1111111,7),	B8(0110000,7),	B8(0011100,7),	B8(0010111,7),	B8(0100000,7),	B8(0101111,7) } 		/* IRPAUSE */
 
 #endif
 

[Openocd-svn] r1617 - trunk/src/xsvf

[<oh...@ma...>]

Author: oharboe
Date: 2009-05-06 20:18:00 +0200 (Wed, 06 May 2009)
New Revision: 1617

Modified:
   trunk/src/xsvf/xsvf.c
Log:
Dick Hollenbeck <di...@so...> part deux of previous changes just committed.

Modified: trunk/src/xsvf/xsvf.c
===================================================================
--- trunk/src/xsvf/xsvf.c	2009-05-06 17:28:39 UTC (rev 1616)
+++ trunk/src/xsvf/xsvf.c	2009-05-06 18:18:00 UTC (rev 1617)
@@ -177,13 +177,13 @@
 /**
  * Function xsvf_add_statemove
  * moves from the current state to the goal \a state. This needs
- * to be handled according to the xsvf spec, which has nothing
- * to do with the JTAG spec or OpenOCD as such.
- *
- * Implemented via jtag_add_pathmove().
+ * to be handled according to the xsvf spec, see the XSTATE command
+ * description.
  */
-static void xsvf_add_statemove(tap_state_t goal_state)
+static int xsvf_add_statemove(tap_state_t goal_state)
 {
+	int retval = ERROR_OK;
+
 	tap_state_t moves[8];
 	tap_state_t cur_state = cmd_queue_cur_state;
 	int i;
@@ -194,29 +194,69 @@
 		tap_state_name(cur_state),
 		tap_state_name(goal_state) );
 
+
+	/*	From the XSVF spec, pertaining to XSTATE:
+
+		For special states known as stable states (Test-Logic-Reset,
+		Run-Test/Idle, Pause-DR, Pause- IR), an XSVF interpreter follows
+		predefined TAP state paths when the starting state is a stable state and
+		when the XSTATE specifies a new stable state (see the STATE command in
+		the [Ref 5] for the TAP state paths between stable states). For
+		non-stable states, XSTATE should specify a state that is only one TAP
+		state transition distance from the current TAP state to avoid undefined
+		TAP state paths. A sequence of multiple XSTATE commands can be issued to
+		transition the TAP through a specific state path.
+	*/
+
 	if (goal_state==cur_state )
-		return;
+		;	/* nothing to do */
 
-	if( goal_state==TAP_RESET )
+	else if( goal_state==TAP_RESET )
 	{
 		jtag_add_tlr();
-		return;
 	}
 
-	tms_bits  = tap_get_tms_path(cur_state, goal_state);
-	tms_count = tap_get_tms_path_len(cur_state, goal_state);
+	else if( tap_is_state_stable(cur_state) && tap_is_state_stable(goal_state) )
+	{
+		/* 	note: unless tms_bits holds a path that agrees with [Ref 5] in above
+			spec, then this code is not fully conformant to the xsvf spec.  This
+			puts a burden on tap_get_tms_path() function from the xsvf spec.
+			If in doubt, you should confirm that that burden is being met.
+		*/
 
-	assert( (unsigned) tms_count < DIM(moves) );
+		tms_bits  = tap_get_tms_path(cur_state, goal_state);
+		tms_count = tap_get_tms_path_len(cur_state, goal_state);
 
-	for (i=0;   i<tms_count;   i++, tms_bits>>=1)
+		assert( (unsigned) tms_count < DIM(moves) );
+
+		for (i=0;   i<tms_count;   i++, tms_bits>>=1)
+		{
+			bool bit = tms_bits & 1;
+
+			cur_state = tap_state_transition(cur_state, bit);
+			moves[i] = cur_state;
+		}
+
+		jtag_add_pathmove(tms_count, moves);
+	}
+
+	/* 	else state must be immediately reachable in one clock cycle, and does not
+		need to be a stable state.
+	*/
+	else if( tap_state_transition(cur_state, true)  == goal_state
+		||   tap_state_transition(cur_state, false) == goal_state )
 	{
-		bool bit = tms_bits & 1;
+		/* move a single state */
+		moves[0] = goal_state;
+		jtag_add_pathmove( 1, moves );
+	}
 
-		cur_state = tap_state_transition(cur_state, bit);
-		moves[i] = cur_state;
+	else
+	{
+		retval = ERROR_FAIL;
 	}
 
-	jtag_add_pathmove(tms_count, moves);
+	return retval;
 }
 
 
@@ -557,7 +597,32 @@
 
 				LOG_DEBUG("XSTATE 0x%02X %s", uc, tap_state_name(mystate) );
 
-				xsvf_add_statemove( mystate );
+				/* 	there is no need for the lookahead code that was here since we
+					queue up the jtag commands anyway.  This is a simple way to handle
+					the XSTATE.
+				*/
+
+				if( xsvf_add_statemove( mystate ) != ERROR_OK )
+				{
+					/*	For special states known as stable states
+						(Test-Logic-Reset, Run-Test/Idle, Pause-DR, Pause- IR),
+						an XSVF interpreter follows predefined TAP state paths
+						when the starting state is a stable state and when the
+						XSTATE specifies a new stable state (see the STATE
+						command in the [Ref 5] for the TAP state paths between
+						stable states). For non-stable states, XSTATE should
+						specify a state that is only one TAP state transition
+						distance from the current TAP state to avoid undefined
+						TAP state paths. A sequence of multiple XSTATE commands
+						can be issued to transition the TAP through a specific
+						state path.
+					*/
+
+					LOG_ERROR("XSTATE %s is not reachable from current state %s in one clock cycle",
+						tap_state_name(mystate),
+						tap_state_name(cmd_queue_cur_state)
+						);
+				}
 			}
 			break;
 
@@ -703,7 +768,7 @@
 
 				comment[sizeof(comment)-1] = 0;		/* regardless, terminate */
 				if (verbose)
-					LOG_USER("\"# %s\"", comment);
+					LOG_USER("# %s", comment);
 			}
 			break;
 

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

[<ml...@ma...>]

Author: mlu
Date: 2009-05-06 19:28:39 +0200 (Wed, 06 May 2009)
New Revision: 1616

Modified:
   trunk/src/jtag/jlink.c
Log:
Small changes that might improve stability.
Implemented new jtag sequences tap_get_tms_path and tap_get_tms_path_len

Modified: trunk/src/jtag/jlink.c
===================================================================
--- trunk/src/jtag/jlink.c	2009-05-06 17:25:14 UTC (rev 1615)
+++ trunk/src/jtag/jlink.c	2009-05-06 17:28:39 UTC (rev 1616)
@@ -57,8 +57,11 @@
 #define EMU_CMD_VERSION     		0x01
 #define EMU_CMD_SET_SPEED   		0x05
 #define EMU_CMD_GET_STATE   		0x07
+#define EMU_CMD_HW_CLOCK			0xc8
+#define EMU_CMD_HW_TMS0 			0xc9
+#define EMU_CMD_HW_TMS1 			0xca
 #define EMU_CMD_HW_JTAG3    		0xcf
-#define EMU_CMD_GET_MAX_MEM_BLOCK   0xd4
+#define EMU_CMD_GET_MAX_MEM_BLOCK	0xd4
 #define EMU_CMD_HW_RESET0   		0xdc
 #define EMU_CMD_HW_RESET1   		0xdd
 #define EMU_CMD_HW_TRST0    		0xde
@@ -183,7 +186,7 @@
 	enum scan_type type;
 	u8 *buffer;
 
-	DEBUG_JTAG_IO("scan end in %i", cmd->cmd.scan->end_state);
+	DEBUG_JTAG_IO("scan end in %s", tap_state_name(cmd->cmd.scan->end_state));
 
 	if (cmd->cmd.scan->end_state != TAP_INVALID)
 		jlink_end_state(cmd->cmd.scan->end_state);
@@ -206,10 +209,13 @@
 
 	jlink_tap_execute();
 
-	if (cmd->cmd.reset->trst == 1)
+	if ( (cmd->cmd.reset->trst == 1) || ( cmd->cmd.reset->srst && (jtag_reset_config & RESET_SRST_PULLS_TRST) ) )
+	{
 		tap_set_state(TAP_RESET);
+	}
 
 	jlink_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
+	jlink_tap_execute();
 }
 
 static void jlink_execute_sleep(jtag_command_t *cmd)
@@ -333,6 +339,7 @@
 	LOG_INFO("J-Link JTAG Interface ready");
 
 	jlink_reset(0, 0);
+	jtag_sleep(3000);
 	jlink_tap_init();
 	jlink_speed(jtag_speed);
 
@@ -367,8 +374,9 @@
 	int i;
 	int tms = 0;
 	u8 tms_scan = tap_get_tms_path(tap_get_state(), tap_get_end_state());
+	u8 tms_scan_bits = tap_get_tms_path_len(tap_get_state(), tap_get_end_state());
 
-	for (i = 0; i < 7; i++)
+	for (i = 0; i < tms_scan_bits; i++)
 	{
 		tms = (tms_scan >> i) & 1;
 		jlink_tap_append_step(tms, 0);
@@ -414,6 +422,7 @@
 	{
 		jlink_end_state(TAP_IDLE);
 		jlink_state_move();
+//		num_cycles--;
 	}
 
 	/* execute num_cycles */
@@ -469,24 +478,23 @@
 	if (srst == 0)
 	{
 		jlink_simple_command(EMU_CMD_HW_RESET1);
-		jlink_end_state(TAP_RESET);
-		jlink_state_move();
 	}
-	else if (srst == 1)
+	if (srst == 1)
 	{
 		jlink_simple_command(EMU_CMD_HW_RESET0);
 	}
 
+	if (trst == 1)
+	{
+		jlink_simple_command(EMU_CMD_HW_TRST0);
+	}
 	if (trst == 0)
 	{
 		jlink_simple_command(EMU_CMD_HW_TRST1);
+		jtag_sleep(5000);
 		jlink_end_state(TAP_RESET);
 		jlink_state_move();
 	}
-	else if (trst == 1)
-	{
-		jlink_simple_command(EMU_CMD_HW_TRST0);
-	}
 }
 
 static void jlink_simple_command(u8 command)
@@ -602,9 +610,9 @@
 /* J-Link tap functions */
 
 /* 2048 is the max value we can use here */
-#define JLINK_TAP_BUFFER_SIZE 2048
+#define JLINK_TAP_BUFFER_SIZE 1024
 
-static unsigned tap_length;
+static unsigned tap_length=0;
 static u8 tms_buffer[JLINK_TAP_BUFFER_SIZE];
 static u8 tdi_buffer[JLINK_TAP_BUFFER_SIZE];
 static u8 tdo_buffer[JLINK_TAP_BUFFER_SIZE];
@@ -631,7 +639,7 @@
 static void jlink_tap_ensure_space(int scans, int bits)
 {
 	int available_scans = MAX_PENDING_SCAN_RESULTS - pending_scan_results_length;
-	int available_bits = JLINK_TAP_BUFFER_SIZE * 8 - tap_length;
+	int available_bits = JLINK_TAP_BUFFER_SIZE * 8 - tap_length - 64;
 
 	if (scans > available_scans || bits > available_bits)
 	{
@@ -654,7 +662,9 @@
 
 	// we do not pad TMS, so be sure to initialize all bits
 	if (0 == bit_index)
+	{
 		tms_buffer[index] = tdi_buffer[index] = 0;
+	}
 
 	if (tms)
 		tms_buffer[index] |= bit;
@@ -682,8 +692,8 @@
 
 	for (i = 0; i < length; i++)
 	{
-		int tms = i < length - 1 ? 0 : 1;
-		int tdi = buffer[i / 8] & (1 << (i % 8));
+		int tms = (i < (length - 1)) ? 0 : 1;
+		int tdi = (buffer[i / 8] & (1 << (i % 8)))!=0;
 		jlink_tap_append_step(tms, tdi);
 	}
 	pending_scan_results_length++;
@@ -700,6 +710,13 @@
 	if (!tap_length)
 		return ERROR_OK;
 
+	/* JLink returns an extra NULL in packet when size of in message is a multiple of 64, creates problems with usb comms */
+	/* WARNING This will interfere with tap state counting */
+	while ((TAP_SCAN_BYTES(tap_length)%64)==0)
+	{
+		jlink_tap_append_step((tap_get_state() == TAP_RESET)?1:0, 0);
+	}
+
 	// number of full bytes (plus one if some would be left over)
 	byte_length = TAP_SCAN_BYTES(tap_length);
 
@@ -839,9 +856,15 @@
 		result2 = jlink_usb_read_emu_result(jlink_jtag);
 		if (1 != result2)
 		{
-			LOG_ERROR("jlink_usb_read_emu_result failed "
-				"(requested=1, result=%d)", result2);
-			return ERROR_JTAG_DEVICE_ERROR;
+			LOG_ERROR("jlink_usb_read_emu_result retried requested=1, result=%d, in_length=%i", result2,in_length);
+			/* Try again once, should only happen if (in_length%64==0) */
+			result2 = jlink_usb_read_emu_result(jlink_jtag);
+			if (1 != result2)
+			{
+				LOG_ERROR("jlink_usb_read_emu_result failed "
+					"(requested=1, result=%d)", result2);
+				return ERROR_JTAG_DEVICE_ERROR;
+			}
 		}
 
 		/* Check the result itself */
@@ -975,3 +998,4 @@
 	}
 }
 #endif
+

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

[<oh...@ma...>]

Author: oharboe
Date: 2009-05-06 19:25:14 +0200 (Wed, 06 May 2009)
New Revision: 1615

Modified:
   trunk/src/jtag/bitbang.c
Log:
transition more directly to the end state + reuse more of the state move code/paths

Modified: trunk/src/jtag/bitbang.c
===================================================================
--- trunk/src/jtag/bitbang.c	2009-05-06 13:32:43 UTC (rev 1614)
+++ trunk/src/jtag/bitbang.c	2009-05-06 17:25:14 UTC (rev 1615)
@@ -84,12 +84,12 @@
 	}
 }
 
-static void bitbang_state_move(void)
+static void bitbang_state_move(int skip)
 {
 	int i=0, tms=0;
 	u8 tms_scan = tap_get_tms_path(tap_get_state(), tap_get_end_state());
 
-	for (i = 0; i < 7; i++)
+	for (i = skip; i < 7; i++)
 	{
 		tms = (tms_scan >> i) & 1;
 		bitbang_interface->write(0, tms, 0);
@@ -146,7 +146,7 @@
 	if (tap_get_state() != TAP_IDLE)
 	{
 		bitbang_end_state(TAP_IDLE);
-		bitbang_state_move();
+		bitbang_state_move(0);
 	}
 
 	/* execute num_cycles */
@@ -160,7 +160,7 @@
 	/* finish in end_state */
 	bitbang_end_state(saved_end_state);
 	if (tap_get_state() != tap_get_end_state())
-		bitbang_state_move();
+		bitbang_state_move(0);
 }
 
 
@@ -191,7 +191,7 @@
 		else
 			bitbang_end_state(TAP_DRSHIFT);
 
-		bitbang_state_move();
+		bitbang_state_move(0);
 		bitbang_end_state(saved_end_state);
 	}
 
@@ -227,22 +227,14 @@
 		}
 	}
 
-	/* TAP_DRSHIFT & TAP_IRSHIFT are illegal end states, so we always transition to the pause
-	 * state which is a legal stable state from which statemove will work.
-	 *
-	 * Exit1 -> Pause
-	 */
-	bitbang_interface->write(0, 0, 0);
-	bitbang_interface->write(1, 0, 0);
-	bitbang_interface->write(CLOCK_IDLE(), 0, 0);
-
-	if (ir_scan)
-		tap_set_state(TAP_IRPAUSE);
-	else
-		tap_set_state(TAP_DRPAUSE);
-
 	if (tap_get_state() != tap_get_end_state())
-		bitbang_state_move();
+	{
+		/* we *KNOW* the above loop transitioned out of
+		 * the shift state, so we skip the first state
+		 * and move directly to the end state.
+		 */
+		bitbang_state_move(1);
+	}
 }
 
 int bitbang_execute_queue(void)
@@ -310,7 +302,7 @@
 #endif
 				if (cmd->cmd.statemove->end_state != TAP_INVALID)
 					bitbang_end_state(cmd->cmd.statemove->end_state);
-				bitbang_state_move();
+				bitbang_state_move(0);
 				break;
 			case JTAG_PATHMOVE:
 #ifdef _DEBUG_JTAG_IO_

[Openocd-svn] r1614 - trunk/src/xsvf

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

Author: oharboe
Date: 2009-05-06 15:32:43 +0200 (Wed, 06 May 2009)
New Revision: 1614

Modified:
   trunk/src/xsvf/xsvf.c
Log:
Dick Hollenbeck <di...@so...> simplifies XSTATE handling, and protects against illegal state
transitions that might be in an SVF file.

Modified: trunk/src/xsvf/xsvf.c
===================================================================
--- trunk/src/xsvf/xsvf.c	2009-05-06 11:22:30 UTC (rev 1613)
+++ trunk/src/xsvf/xsvf.c	2009-05-06 13:32:43 UTC (rev 1614)
@@ -53,6 +53,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
+#include <assert.h>
 
 #include <sys/time.h>
 #include <time.h>
@@ -173,46 +174,52 @@
 }
 
 
-/* xsvf has it's own definition of a statemove. This needs
+/**
+ * Function xsvf_add_statemove
+ * moves from the current state to the goal \a state. This needs
  * to be handled according to the xsvf spec, which has nothing
  * to do with the JTAG spec or OpenOCD as such.
  *
  * Implemented via jtag_add_pathmove().
  */
-static void xsvf_add_statemove(tap_state_t state)
+static void xsvf_add_statemove(tap_state_t goal_state)
 {
-	tap_state_t moves[7]; 	/* max # of transitions */
-	tap_state_t curstate = cmd_queue_cur_state;
+	tap_state_t moves[8];
+	tap_state_t cur_state = cmd_queue_cur_state;
 	int i;
+	int tms_bits;
+	int	tms_count;
 
-	u8 move = tap_get_tms_path(cmd_queue_cur_state, state);
+	LOG_DEBUG( "cur_state=%s goal_state=%s",
+		tap_state_name(cur_state),
+		tap_state_name(goal_state) );
 
-	if (state != TAP_RESET  &&  state==cmd_queue_cur_state)
+	if (goal_state==cur_state )
 		return;
 
-	if(state==TAP_RESET)
+	if( goal_state==TAP_RESET )
 	{
 		jtag_add_tlr();
 		return;
 	}
 
-	for (i=0; i<7; i++)
+	tms_bits  = tap_get_tms_path(cur_state, goal_state);
+	tms_count = tap_get_tms_path_len(cur_state, goal_state);
+
+	assert( (unsigned) tms_count < DIM(moves) );
+
+	for (i=0;   i<tms_count;   i++, tms_bits>>=1)
 	{
-		int j = (move >> i) & 1;
-		if (j)
-		{
-			curstate = tap_state_transition(curstate, true);
-		}
-		else
-		{
-			curstate = tap_state_transition(curstate, false);
-		}
-		moves[i] = curstate;
+		bool bit = tms_bits & 1;
+
+		cur_state = tap_state_transition(cur_state, bit);
+		moves[i] = cur_state;
 	}
 
-	jtag_add_pathmove(7, moves);
+	jtag_add_pathmove(tms_count, moves);
 }
 
+
 int xsvf_register_commands(struct command_context_s *cmd_ctx)
 {
 	register_command(cmd_ctx, NULL, "xsvf", handle_xsvf_command,
@@ -236,38 +243,6 @@
 }
 
 
-static int xsvf_read_xstates(int fd, tap_state_t *path, int max_path, int *path_len)
-{
-	char c;
-	u8   uc;
-
-	while ((read(fd, &c, 1) > 0) && (c == XSTATE))
-	{
-		tap_state_t	mystate;
-
-		if (*path_len > max_path)
-		{
-			LOG_WARNING("XSTATE path longer than max_path");
-			break;
-		}
-		if (read(fd, &uc, 1) < 0)
-		{
-			return ERROR_XSVF_EOF;
-		}
-
-		mystate = xsvf_to_tap(uc);
-
-		LOG_DEBUG("XSTATE %02X %s", uc, tap_state_name(mystate) );
-
-		path[(*path_len)++] = mystate;
-	}
-
-	lseek(fd, -1, SEEK_CUR);
-
-	return ERROR_OK;
-}
-
-
 static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
 	u8 *dr_out_buf = NULL; 				/* from host to device (TDI) */
@@ -477,7 +452,7 @@
 							TAP_IDLE,
 						};
 
-						jtag_add_pathmove( sizeof(exception_path)/sizeof(exception_path[0]), exception_path);
+						jtag_add_pathmove( DIM(exception_path), exception_path );
 
 						if (verbose)
 							LOG_USER("%s mismatch, xsdrsize=%d retry=%d", op_name, xsdrsize, attempt);
@@ -570,8 +545,7 @@
 		case XSTATE:
 			{
 				tap_state_t	mystate;
-				tap_state_t*	path;
-				int 			path_len;
+				u8			uc;
 
 				if (read(xsvf_fd, &uc, 1) < 0)
 				{
@@ -583,38 +557,7 @@
 
 				LOG_DEBUG("XSTATE 0x%02X %s", uc, tap_state_name(mystate) );
 
-				path = calloc(XSTATE_MAX_PATH, 4);
-				path_len = 1;
-
-				path[0] = mystate;
-				if (xsvf_read_xstates(xsvf_fd, path, XSTATE_MAX_PATH, &path_len) != ERROR_OK)
-					do_abort = 1;
-				else
-				{
-					int i,lasti;
-
-					/* here the trick is that jtag_add_pathmove() must end in a stable
-					 * state, so we must only invoke jtag_add_tlr() when we absolutely
-					 * have to
-					 */
-					for(i=0,lasti=0;  i<path_len;  i++)
-					{
-						if(path[i]==TAP_RESET)
-						{
-							if(i>lasti)
-							{
-								jtag_add_pathmove(i-lasti,path+lasti);
-							}
-							lasti=i+1;
-							jtag_add_tlr();
-						}
-					}
-					if(i>=lasti)
-					{
-						jtag_add_pathmove(i-lasti, path+lasti);
-					}
-				}
-				free(path);
+				xsvf_add_statemove( mystate );
 			}
 			break;
 
@@ -710,7 +653,6 @@
 					
 					
 					field.in_handler = NULL;
-					
 
 					if (tap == NULL)
 						jtag_add_plain_ir_scan(1, &field, my_end_state);
@@ -761,7 +703,7 @@
 
 				comment[sizeof(comment)-1] = 0;		/* regardless, terminate */
 				if (verbose)
-					LOG_USER("%s", comment);
+					LOG_USER("\"# %s\"", comment);
 			}
 			break;
 

[Openocd-svn] r1613 - trunk/src/jtag zy1000/trunk/build zy1000/trunk/build/menu zy1000/trunk/build/tcl

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

Author: oharboe
Date: 2009-05-06 13:22:30 +0200 (Wed, 06 May 2009)
New Revision: 1613

Modified:
   trunk/src/jtag/zy1000.c
   zy1000/trunk/build/menu/zy1000menu.xml
   zy1000/trunk/build/menu/zy1000menu.xsl
   zy1000/trunk/build/tcl/browsemem.tcl
   zy1000/trunk/build/tcl/downloadmem.tcl
   zy1000/trunk/build/tcl/editconfigs.tcl
   zy1000/trunk/build/tcl/editfile.tcl
   zy1000/trunk/build/tcl/erase.tcl
   zy1000/trunk/build/tcl/flash.tcl
   zy1000/trunk/build/tcl/flashinfo.tcl
   zy1000/trunk/build/tcl/guiupload.tcl
   zy1000/trunk/build/tcl/index.tcl
   zy1000/trunk/build/tcl/log.tcl
   zy1000/trunk/build/tcl/openocd.tcl
   zy1000/trunk/build/tcl/preconfig.tcl
   zy1000/trunk/build/tcl/production.tcl
   zy1000/trunk/build/tcl/reload.tcl
   zy1000/trunk/build/tcl/run.tcl
   zy1000/trunk/build/tcl/support.tcl
   zy1000/trunk/build/tcl/targets.tcl
   zy1000/trunk/build/tcl/terminal.tcl
   zy1000/trunk/build/tcl/upgrade.tcl
   zy1000/trunk/build/tcl/zy1000.tcl
   zy1000/trunk/build/testhttpd.tcl
Log:
log noise reduction

Modified: trunk/src/jtag/zy1000.c
===================================================================
--- trunk/src/jtag/zy1000.c	2009-05-06 08:30:50 UTC (rev 1612)
+++ trunk/src/jtag/zy1000.c	2009-05-06 11:22:30 UTC (rev 1613)
@@ -285,37 +285,43 @@
 
 
 /* Give TELNET a way to find out what version this is */
-int handle_zy1000_version_command(struct command_context_s *cmd_ctx, char *cmd,
-		char **args, int argc)
+static int jim_zy1000_version(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
-	if (argc > 1)
+	if ((argc < 1) || (argc > 2))
+		return JIM_ERR;
+	char buff[128];
+	const char *version_str=NULL;
+
+	if (argc == 1)
 	{
-		return ERROR_COMMAND_SYNTAX_ERROR;
-	}
-	if (argc == 0)
+		version_str=ZYLIN_OPENOCD_VERSION;
+	} else
 	{
-		command_print(cmd_ctx, ZYLIN_OPENOCD_VERSION);
+		const char *str = Jim_GetString(argv[1], NULL);
+		if (strcmp("openocd", str) == 0)
+		{
+			int revision;
+			revision = atol(ZYLIN_OPENOCD+strlen("XRevision: "));
+			sprintf(buff, "%d", revision);
+			version_str=buff;
+		}
+		else if (strcmp("zy1000", str) == 0)
+		{
+			version_str=ZYLIN_VERSION;
+		}
+		else if (strcmp("date", str) == 0)
+		{
+			version_str=ZYLIN_DATE;
+		}
+		else
+		{
+			return JIM_ERR;
+		}
 	}
-	else if (strcmp("openocd", args[0]) == 0)
-	{
-		int revision;
-		revision = atol(ZYLIN_OPENOCD+strlen("XRevision: "));
-		command_print(cmd_ctx, "%d", revision);
-	}
-	else if (strcmp("zy1000", args[0]) == 0)
-	{
-		command_print(cmd_ctx, "%s", ZYLIN_VERSION);
-	}
-	else if (strcmp("date", args[0]) == 0)
-	{
-		command_print(cmd_ctx, "%s", ZYLIN_DATE);
-	}
-	else
-	{
-		return ERROR_COMMAND_SYNTAX_ERROR;
-	}
 
-	return ERROR_OK;
+	Jim_SetResult(interp, Jim_NewStringObj(interp, version_str, -1));
+
+	return JIM_OK;
 }
 
 
@@ -342,9 +348,10 @@
 {
 	register_command(cmd_ctx, NULL, "power", handle_power_command, COMMAND_ANY,
 			"power <on/off> - turn power switch to target on/off. No arguments - print status.");
-	register_command(cmd_ctx, NULL, "zy1000_version", handle_zy1000_version_command,
-			COMMAND_EXEC, "show zy1000 version numbers");
 
+	Jim_CreateCommand(interp, "zy1000_version", jim_zy1000_version, NULL, NULL);
+
+
 	Jim_CreateCommand(interp, "powerstatus", zylinjtag_Jim_Command_powerstatus, NULL, NULL);
 
 	return ERROR_OK;

Modified: zy1000/trunk/build/menu/zy1000menu.xml
===================================================================
--- zy1000/trunk/build/menu/zy1000menu.xml	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/menu/zy1000menu.xml	2009-05-06 11:22:30 UTC (rev 1613)
@@ -62,9 +62,9 @@
 							append buffer [ocd_jtag_khz]
 						</tcl>
 						<br>
-						<tcl>append buffer [capture {zy1000_version zy1000}]</tcl><br>
-						<tcl>append buffer [capture {zy1000_version openocd}]</tcl><br>
-						<tcl>append buffer [capture {zy1000_version date}]</tcl><br>
+						<tcl>append buffer [zy1000_version zy1000]</tcl><br>
+						<tcl>append buffer [zy1000_version openocd]</tcl><br>
+						<tcl>append buffer [zy1000_version date]</tcl><br>
 						<tcl>append buffer [ip]</tcl><br>
 						<tcl>append buffer [ocd_gdb_port]</tcl>
 					</td>
@@ -1556,9 +1556,9 @@
 			set form_config [load_config "[load_target]"]
 			set support_id [string range [rand] 0 7]
 			set form_log ""
-			append form_log "Version: [capture "zy1000_version zy1000"]"
-			append form_log "OpenOCD version: [capture "zy1000_version openocd"]"
-			append form_log "Version date: [capture "zy1000_version date"]"
+			append form_log "Version: [zy1000_version zy1000]"
+			append form_log "OpenOCD version: [zy1000_version openocd]"
+			append form_log "Version date: [zy1000_version date]"
 			append form_log [log]
 			</tcl>
 

Modified: zy1000/trunk/build/menu/zy1000menu.xsl
===================================================================
--- zy1000/trunk/build/menu/zy1000menu.xsl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/menu/zy1000menu.xsl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -36,7 +36,7 @@
 					</div>
 					<div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 						<div class="textlight" style="position:relative;left:15px;top:4px;">
-							<tcl>append buffer [capture zy1000_version]</tcl>
+							<tcl>append buffer [zy1000_version]</tcl>
 						</div>
 					</div>
 				</div>

Modified: zy1000/trunk/build/tcl/browsemem.tcl
===================================================================
--- zy1000/trunk/build/tcl/browsemem.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/tcl/browsemem.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -54,7 +54,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>

Modified: zy1000/trunk/build/tcl/downloadmem.tcl
===================================================================
--- zy1000/trunk/build/tcl/downloadmem.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/tcl/downloadmem.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -59,7 +59,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>

Modified: zy1000/trunk/build/tcl/editconfigs.tcl
===================================================================
--- zy1000/trunk/build/tcl/editconfigs.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/tcl/editconfigs.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -27,7 +27,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>

Modified: zy1000/trunk/build/tcl/editfile.tcl
===================================================================
--- zy1000/trunk/build/tcl/editfile.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/tcl/editfile.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -75,7 +75,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>

Modified: zy1000/trunk/build/tcl/erase.tcl
===================================================================
--- zy1000/trunk/build/tcl/erase.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/tcl/erase.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -48,7 +48,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>

Modified: zy1000/trunk/build/tcl/flash.tcl
===================================================================
--- zy1000/trunk/build/tcl/flash.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/tcl/flash.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -39,7 +39,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>

Modified: zy1000/trunk/build/tcl/flashinfo.tcl
===================================================================
--- zy1000/trunk/build/tcl/flashinfo.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/tcl/flashinfo.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -37,7 +37,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>

Modified: zy1000/trunk/build/tcl/guiupload.tcl
===================================================================
--- zy1000/trunk/build/tcl/guiupload.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/tcl/guiupload.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -69,7 +69,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>

Modified: zy1000/trunk/build/tcl/index.tcl
===================================================================
--- zy1000/trunk/build/tcl/index.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/tcl/index.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -21,7 +21,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>
@@ -164,9 +164,9 @@
 							append buffer [ocd_jtag_khz]
 						</tcl>
 						<br>
-						<tcl>append buffer [capture {zy1000_version zy1000}]</tcl><br>
-						<tcl>append buffer [capture {zy1000_version openocd}]</tcl><br>
-						<tcl>append buffer [capture {zy1000_version date}]</tcl><br>
+						<tcl>append buffer [zy1000_version zy1000]</tcl><br>
+						<tcl>append buffer [zy1000_version openocd]</tcl><br>
+						<tcl>append buffer [zy1000_version date]</tcl><br>
 						<tcl>append buffer [ip]</tcl><br>
 						<tcl>append buffer [ocd_gdb_port]</tcl>
 					</td>

Modified: zy1000/trunk/build/tcl/log.tcl
===================================================================
--- zy1000/trunk/build/tcl/log.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/tcl/log.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -66,7 +66,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>

Modified: zy1000/trunk/build/tcl/openocd.tcl
===================================================================
--- zy1000/trunk/build/tcl/openocd.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/tcl/openocd.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -63,7 +63,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>

Modified: zy1000/trunk/build/tcl/preconfig.tcl
===================================================================
--- zy1000/trunk/build/tcl/preconfig.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/tcl/preconfig.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -24,7 +24,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>

Modified: zy1000/trunk/build/tcl/production.tcl
===================================================================
--- zy1000/trunk/build/tcl/production.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/tcl/production.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -44,7 +44,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>

Modified: zy1000/trunk/build/tcl/reload.tcl
===================================================================
--- zy1000/trunk/build/tcl/reload.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/tcl/reload.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -34,7 +34,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>

Modified: zy1000/trunk/build/tcl/run.tcl
===================================================================
--- zy1000/trunk/build/tcl/run.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/tcl/run.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -51,7 +51,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>

Modified: zy1000/trunk/build/tcl/support.tcl
===================================================================
--- zy1000/trunk/build/tcl/support.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/tcl/support.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -85,7 +85,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>
@@ -202,9 +202,9 @@
 			set form_config [load_config "[load_target]"]
 			set support_id [string range [rand] 0 7]
 			set form_log ""
-			append form_log "Version: [capture "zy1000_version zy1000"]"
-			append form_log "OpenOCD version: [capture "zy1000_version openocd"]"
-			append form_log "Version date: [capture "zy1000_version date"]"
+			append form_log "Version: [zy1000_version zy1000]"
+			append form_log "OpenOCD version: [zy1000_version openocd]"
+			append form_log "Version date: [zy1000_version date]"
 			append form_log [log]
 			</tcl>
 

Modified: zy1000/trunk/build/tcl/targets.tcl
===================================================================
--- zy1000/trunk/build/tcl/targets.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/tcl/targets.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -30,7 +30,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>
@@ -325,7 +325,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>

Modified: zy1000/trunk/build/tcl/terminal.tcl
===================================================================
--- zy1000/trunk/build/tcl/terminal.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/tcl/terminal.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -89,7 +89,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>

Modified: zy1000/trunk/build/tcl/upgrade.tcl
===================================================================
--- zy1000/trunk/build/tcl/upgrade.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/tcl/upgrade.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -72,7 +72,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>

Modified: zy1000/trunk/build/tcl/zy1000.tcl
===================================================================
--- zy1000/trunk/build/tcl/zy1000.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/tcl/zy1000.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -82,7 +82,7 @@
 </div>
 <div style="float:left;position:relative;height:26px; width:278px;left:122px;background-image:url('/rom/menu_cuts/top_right.png');">
 <div style="position:relative;left:15px;top:4px;" class="textlight">
-<tcl>append buffer [capture zy1000_version]</tcl>
+<tcl>append buffer [zy1000_version]</tcl>
 </div>
 </div>
 </div>

Modified: zy1000/trunk/build/testhttpd.tcl
===================================================================
--- zy1000/trunk/build/testhttpd.tcl	2009-05-06 08:30:50 UTC (rev 1612)
+++ zy1000/trunk/build/testhttpd.tcl	2009-05-06 11:22:30 UTC (rev 1613)
@@ -1,8 +1,5 @@
 # some dummy proc's to get things going for test purposes
 
-proc zy1000_version {args} {
-return abc
-}
 
 script ../zy1000/linux_zy1000/build/tcl/openocd.cfg 
 

[Openocd-svn] r1612 - trunk

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

Author: zwelch
Date: 2009-05-06 10:30:50 +0200 (Wed, 06 May 2009)
New Revision: 1612

Modified:
   trunk/configure.in
Log:
Fix enviorn configure test failure message (thanks to Anders Montonen).

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2009-05-06 07:21:46 UTC (rev 1611)
+++ trunk/configure.in	2009-05-06 08:30:50 UTC (rev 1612)
@@ -811,7 +811,7 @@
   ])
 
 if test "${has_environ}" != "yes" ; then
-     AC_MSG_FAILURE([Could find 'environ' in unistd.h or available libraries.]) 
+     AC_MSG_FAILURE([Could not find 'environ' in unistd.h or available libraries.]) 
 fi
 
 

[Openocd-svn] r1611 - in trunk/src: flash jtag pld svf target xsvf

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

Author: oharboe
Date: 2009-05-06 09:21:46 +0200 (Wed, 06 May 2009)
New Revision: 1611

Modified:
   trunk/src/flash/str9xpec.c
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
   trunk/src/pld/virtex2.c
   trunk/src/svf/svf.c
   trunk/src/target/arm720t.c
   trunk/src/target/arm7tdmi.c
   trunk/src/target/arm920t.c
   trunk/src/target/arm926ejs.c
   trunk/src/target/arm966e.c
   trunk/src/target/arm9tdmi.c
   trunk/src/target/arm_adi_v5.c
   trunk/src/target/arm_jtag.c
   trunk/src/target/embeddedice.c
   trunk/src/target/etb.c
   trunk/src/target/etm.c
   trunk/src/target/feroceon.c
   trunk/src/target/mips_ejtag.c
   trunk/src/target/xscale.c
   trunk/src/xsvf/xsvf.c
Log:
remove unecessary setting of deprecated fields to NULL

Modified: trunk/src/flash/str9xpec.c
===================================================================
--- trunk/src/flash/str9xpec.c	2009-05-06 07:17:57 UTC (rev 1610)
+++ trunk/src/flash/str9xpec.c	2009-05-06 07:21:46 UTC (rev 1611)
@@ -127,10 +127,10 @@
 		buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
 		
 		field.in_value = NULL;
-		field.in_check_value = NULL;
-		field.in_check_mask = NULL;
+		
+		
 		field.in_handler = NULL;
-		field.in_handler_priv = NULL;
+		
 
 		jtag_add_ir_scan(1, &field, end_state);
 
@@ -153,10 +153,10 @@
 	field.out_value = NULL;
 	
 	field.in_value = &status;
-	field.in_check_value = NULL;
-	field.in_check_mask = NULL;
+	
+	
 	field.in_handler = NULL;
-	field.in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(1, &field, TAP_IDLE);
 	jtag_execute_queue();
@@ -245,10 +245,10 @@
 	field.out_value = NULL;
 	
 	field.in_value = str9xpec_info->options;
-	field.in_check_value = NULL;
-	field.in_check_mask = NULL;
+	
+	
 	field.in_handler = NULL;
-	field.in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(1, &field, TAP_IDLE);
 	jtag_execute_queue();
@@ -397,10 +397,10 @@
 	field.out_value = buffer;
 	
 	field.in_value = NULL;
-	field.in_check_value = NULL;
-	field.in_check_mask = NULL;
+	
+	
 	field.in_handler = NULL;
-	field.in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(1, &field, TAP_IDLE);
 	jtag_add_sleep(40000);
@@ -411,10 +411,10 @@
 	field.out_value = NULL;
 	
 	field.in_value = buffer;
-	field.in_check_value = NULL;
-	field.in_check_mask = NULL;
+	
+	
 	field.in_handler = NULL;
-	field.in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(1, &field, TAP_IRPAUSE);
 	jtag_execute_queue();
@@ -513,10 +513,10 @@
 	field.out_value = buffer;
 	
 	field.in_value = NULL;
-	field.in_check_value = NULL;
-	field.in_check_mask = NULL;
+	
+	
 	field.in_handler = NULL;
-	field.in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(1, &field, TAP_IDLE);
 	jtag_execute_queue();
@@ -579,10 +579,10 @@
 		field.out_value = NULL;
 		
 		field.in_value = &status;
-		field.in_check_value = NULL;
-		field.in_check_mask = NULL;
+		
+		
 		field.in_handler = NULL;
-		field.in_handler_priv = NULL;
+		
 
 		jtag_add_dr_scan(1, &field, -1);
 		jtag_execute_queue();
@@ -665,10 +665,10 @@
 	field.out_value = &sector;
 	
 	field.in_value = NULL;
-	field.in_check_value = NULL;
-	field.in_check_mask = NULL;
+	
+	
 	field.in_handler = NULL;
-	field.in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(1, &field, -1);
 
@@ -754,10 +754,10 @@
 			field.out_value = (buffer + bytes_written);
 			
 			field.in_value = NULL;
-			field.in_check_value = NULL;
-			field.in_check_mask = NULL;
+			
+			
 			field.in_handler = NULL;
-			field.in_handler_priv = NULL;
+			
 
 			jtag_add_dr_scan(1, &field, TAP_IDLE);
 
@@ -772,10 +772,10 @@
 				field.out_value = NULL;
 				
 				field.in_value = scanbuf;
-				field.in_check_value = NULL;
-				field.in_check_mask = NULL;
+				
+				
 				field.in_handler = NULL;
-				field.in_handler_priv = NULL;
+				
 
 				jtag_add_dr_scan(1, &field, -1);
 				jtag_execute_queue();
@@ -814,10 +814,10 @@
 		field.out_value = last_dword;
 		
 		field.in_value = NULL;
-		field.in_check_value = NULL;
-		field.in_check_mask = NULL;
+		
+		
 		field.in_handler = NULL;
-		field.in_handler_priv = NULL;
+		
 
 		jtag_add_dr_scan(1, &field, TAP_IDLE);
 
@@ -832,10 +832,10 @@
 			field.out_value = NULL;
 			
 			field.in_value = scanbuf;
-			field.in_check_value = NULL;
-			field.in_check_mask = NULL;
+			
+			
 			field.in_handler = NULL;
-			field.in_handler_priv = NULL;
+			
 
 			jtag_add_dr_scan(1, &field, -1);
 			jtag_execute_queue();
@@ -896,10 +896,10 @@
 	field.out_value = NULL;
 	
 	field.in_value = buffer;
-	field.in_check_value = NULL;
-	field.in_check_mask = NULL;
+	
+	
 	field.in_handler = NULL;
-	field.in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(1, &field, TAP_IDLE);
 	jtag_execute_queue();
@@ -1021,10 +1021,10 @@
 	field.out_value = str9xpec_info->options;
 	
 	field.in_value = NULL;
-	field.in_check_value = NULL;
-	field.in_check_mask = NULL;
+	
+	
 	field.in_handler = NULL;
-	field.in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(1, &field, TAP_IDLE);
 
@@ -1039,10 +1039,10 @@
 		field.out_value = NULL;
 		
 		field.in_value = &status;
-		field.in_check_value = NULL;
-		field.in_check_mask = NULL;
+		
+		
 		field.in_handler = NULL;
-		field.in_handler_priv = NULL;
+		
 
 		jtag_add_dr_scan(1, &field, -1);
 		jtag_execute_queue();

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-05-06 07:17:57 UTC (rev 1610)
+++ trunk/src/jtag/jtag.c	2009-05-06 07:21:46 UTC (rev 1611)
@@ -1486,10 +1486,10 @@
 	field.out_value = idcode_buffer;
 	
 	field.in_value = idcode_buffer;
-	field.in_check_value = NULL;
-	field.in_check_mask = NULL;
+	
+	
 	field.in_handler = NULL;
-	field.in_handler_priv = NULL;
+	
 
 	for (i = 0; i < JTAG_MAX_CHAIN_SIZE; i++)
 	{
@@ -1664,10 +1664,10 @@
 	field.out_value = ir_test;
 	
 	field.in_value = ir_test;
-	field.in_check_value = NULL;
-	field.in_check_mask = NULL;
+	
+	
 	field.in_handler = NULL;
-	field.in_handler_priv = NULL;
+	
 
 	jtag_add_plain_ir_scan(1, &field, TAP_RESET);
 	jtag_execute_queue();

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-05-06 07:17:57 UTC (rev 1610)
+++ trunk/src/jtag/jtag.h	2009-05-06 07:21:46 UTC (rev 1611)
@@ -275,8 +275,8 @@
 	/* in_check_value/mask, in_handler_error_handler, in_handler_priv can be used by the in handler, otherwise they contain garbage  */
 	u8*          in_check_value;    /* deprecated! only used from jtag_set_check_value. used to validate scan results */
 	u8*          in_check_mask;     /* deprecated! only used from jtag_set_check_value.  check specified bits against check_value */
-	in_handler_t in_handler;        /* deprecated! DO NOT USE! process received buffer using this handler */
-	void*        in_handler_priv;   /* additional information for the in_handler */
+	in_handler_t in_handler;        /* deprecated! SET TO NULL. DO NOT USE! process received buffer using this handler */
+	void*        in_handler_priv;   /* deprecated! only used by obsolete in_handler implementations */
 } scan_field_t;
 
 enum scan_type {

Modified: trunk/src/pld/virtex2.c
===================================================================
--- trunk/src/pld/virtex2.c	2009-05-06 07:17:57 UTC (rev 1610)
+++ trunk/src/pld/virtex2.c	2009-05-06 07:21:46 UTC (rev 1611)
@@ -56,13 +56,13 @@
 		field.num_bits = tap->ir_length;
 		field.out_value = calloc(CEIL(field.num_bits, 8), 1);
 		buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
-		
+
 		field.in_value = NULL;
-		field.in_check_value = NULL;
-		field.in_check_mask = NULL;
+
+
 		field.in_handler = NULL;
-		field.in_handler_priv = NULL;
 
+
 		jtag_add_ir_scan(1, &field, TAP_IDLE);
 
 		free(field.out_value);
@@ -84,10 +84,7 @@
 	scan_field.num_bits = num_words * 32;
 	scan_field.out_value = values;
 	scan_field.in_value = NULL;
-	scan_field.in_check_value = NULL;
-	scan_field.in_check_mask = NULL;
 	scan_field.in_handler = NULL;
-	scan_field.in_handler_priv = NULL;
 
 	for (i = 0; i < num_words; i++)
 		buf_set_u32(values + 4 * i, 0, 32, flip_u32(*words++, 32));
@@ -117,8 +114,6 @@
 	scan_field.num_bits = 32;
 	scan_field.out_value = NULL;
 	scan_field.in_value = NULL;
-	scan_field.in_check_value = NULL;
-	scan_field.in_check_mask = NULL;
 	scan_field.in_handler = virtex2_jtag_buf_to_u32; /* deprecated! invoke this from user code! */
 
 	virtex2_set_instr(virtex2_info->tap, 0x4); /* CFG_OUT */
@@ -164,13 +159,13 @@
 	scan_field_t field;
 
 	field.tap = virtex2_info->tap;
-	
+
 	field.in_value = NULL;
-	field.in_check_value = NULL;
-	field.in_check_mask = NULL;
+
+
 	field.in_handler = NULL;
-	field.in_handler_priv = NULL;
 
+
 	if ((retval = xilinx_read_bit_file(&bit_file, filename)) != ERROR_OK)
 		return retval;
 

Modified: trunk/src/svf/svf.c
===================================================================
--- trunk/src/svf/svf.c	2009-05-06 07:17:57 UTC (rev 1610)
+++ trunk/src/svf/svf.c	2009-05-06 07:21:46 UTC (rev 1611)
@@ -977,10 +977,10 @@
 			field.out_value = &svf_tdi_buffer[svf_buffer_index];
 			
 			field.in_value = &svf_tdi_buffer[svf_buffer_index];
-			field.in_check_value = NULL;
-			field.in_check_mask = NULL;
+			
+			
 			field.in_handler = NULL;
-			field.in_handler_priv = NULL;
+			
 			jtag_add_plain_dr_scan(1, &field, svf_para.dr_end_state);
 
 			svf_buffer_index += (i + 7) >> 3;
@@ -1078,10 +1078,10 @@
 			field.out_value = &svf_tdi_buffer[svf_buffer_index];
 			
 			field.in_value = &svf_tdi_buffer[svf_buffer_index];
-			field.in_check_value = NULL;
-			field.in_check_mask = NULL;
+			
+			
 			field.in_handler = NULL;
-			field.in_handler_priv = NULL;
+			
 			jtag_add_plain_ir_scan(1, &field, svf_para.ir_end_state);
 
 			svf_buffer_index += (i + 7) >> 3;

Modified: trunk/src/target/arm720t.c
===================================================================
--- trunk/src/target/arm720t.c	2009-05-06 07:17:57 UTC (rev 1610)
+++ trunk/src/target/arm720t.c	2009-05-06 07:21:46 UTC (rev 1611)
@@ -114,10 +114,10 @@
 	fields[0].out_value = &instruction_buf;
 	
 	fields[0].in_value = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
@@ -131,10 +131,10 @@
 	} else
 	{
 		fields[1].in_handler = NULL;
-		fields[1].in_handler_priv = NULL;
+		
 	}
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 
 	jtag_add_dr_scan(2, fields, TAP_INVALID);
 

Modified: trunk/src/target/arm7tdmi.c
===================================================================
--- trunk/src/target/arm7tdmi.c	2009-05-06 07:17:57 UTC (rev 1610)
+++ trunk/src/target/arm7tdmi.c	2009-05-06 07:21:46 UTC (rev 1611)
@@ -113,20 +113,20 @@
 		fields[0].out_value = NULL;
 		
 		fields[0].in_value = &breakpoint;
-		fields[0].in_check_value = NULL;
-		fields[0].in_check_mask = NULL;
+		
+		
 		fields[0].in_handler = NULL;
-		fields[0].in_handler_priv = NULL;
+		
 
 		fields[1].tap = arm7_9->jtag_info.tap;
 		fields[1].num_bits = 32;
 		fields[1].out_value = NULL;
 		
 		fields[1].in_value = databus;
-		fields[1].in_check_value = NULL;
-		fields[1].in_check_mask = NULL;
+		
+		
 		fields[1].in_handler = NULL;
-		fields[1].in_handler_priv = NULL;
+		
 
 		if((retval = arm_jtag_scann(&arm7_9->jtag_info, 0x1)) != ERROR_OK)
 		{
@@ -200,10 +200,10 @@
 	fields[0].out_value = NULL;
 	
 	fields[0].in_value = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
@@ -212,8 +212,8 @@
 	fields[1].in_value = NULL;
 	fields[1].in_handler = arm_jtag_buf_to_u32_flip; /* deprecated! invoke this from user code! */
 	fields[1].in_handler_priv = in;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 
 	jtag_add_dr_scan(2, fields, TAP_INVALID);
 
@@ -261,10 +261,10 @@
 	fields[0].out_value = NULL;
 	
 	fields[0].in_value = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
@@ -284,8 +284,8 @@
 			break;
 	}
 	fields[1].in_handler_priv = in;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 
 	jtag_add_dr_scan(2, fields, TAP_INVALID);
 

Modified: trunk/src/target/arm920t.c
===================================================================
--- trunk/src/target/arm920t.c	2009-05-06 07:17:57 UTC (rev 1610)
+++ trunk/src/target/arm920t.c	2009-05-06 07:21:46 UTC (rev 1611)
@@ -115,40 +115,40 @@
 	fields[0].out_value = &access_type_buf;
 	
 	fields[0].in_value = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = NULL;
 	
 	fields[1].in_value = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
+	
 
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 6;
 	fields[2].out_value = &reg_addr_buf;
 	
 	fields[2].in_value = NULL;
-	fields[2].in_check_value = NULL;
-	fields[2].in_check_mask = NULL;
+	
+	
 	fields[2].in_handler = NULL;
-	fields[2].in_handler_priv = NULL;
+	
 
 	fields[3].tap = jtag_info->tap;
 	fields[3].num_bits = 1;
 	fields[3].out_value = &nr_w_buf;
 	
 	fields[3].in_value = NULL;
-	fields[3].in_check_value = NULL;
-	fields[3].in_check_mask = NULL;
+	
+	
 	fields[3].in_handler = NULL;
-	fields[3].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(4, fields, TAP_INVALID);
 
@@ -187,40 +187,40 @@
 	fields[0].out_value = &access_type_buf;
 	
 	fields[0].in_value = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = value_buf;
 	
 	fields[1].in_value = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
+	
 
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 6;
 	fields[2].out_value = &reg_addr_buf;
 	
 	fields[2].in_value = NULL;
-	fields[2].in_check_value = NULL;
-	fields[2].in_check_mask = NULL;
+	
+	
 	fields[2].in_handler = NULL;
-	fields[2].in_handler_priv = NULL;
+	
 
 	fields[3].tap = jtag_info->tap;
 	fields[3].num_bits = 1;
 	fields[3].out_value = &nr_w_buf;
 	
 	fields[3].in_value = NULL;
-	fields[3].in_check_value = NULL;
-	fields[3].in_check_mask = NULL;
+	
+	
 	fields[3].in_handler = NULL;
-	fields[3].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(4, fields, TAP_INVALID);
 
@@ -254,40 +254,40 @@
 	fields[0].out_value = &access_type_buf;
 	
 	fields[0].in_value = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = cp15_opcode_buf;
 	
 	fields[1].in_value = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
+	
 
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 6;
 	fields[2].out_value = &reg_addr_buf;
 	
 	fields[2].in_value = NULL;
-	fields[2].in_check_value = NULL;
-	fields[2].in_check_mask = NULL;
+	
+	
 	fields[2].in_handler = NULL;
-	fields[2].in_handler_priv = NULL;
+	
 
 	fields[3].tap = jtag_info->tap;
 	fields[3].num_bits = 1;
 	fields[3].out_value = &nr_w_buf;
 	
 	fields[3].in_value = NULL;
-	fields[3].in_check_value = NULL;
-	fields[3].in_check_mask = NULL;
+	
+	
 	fields[3].in_handler = NULL;
-	fields[3].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(4, fields, TAP_INVALID);
 

Modified: trunk/src/target/arm926ejs.c
===================================================================
--- trunk/src/target/arm926ejs.c	2009-05-06 07:17:57 UTC (rev 1610)
+++ trunk/src/target/arm926ejs.c	2009-05-06 07:21:46 UTC (rev 1611)
@@ -139,40 +139,40 @@
 	fields[0].out_value = NULL;
 	
 	fields[0].in_value = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 1;
 	fields[1].out_value = &access;
 	
 	fields[1].in_value = &access;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
+	
 
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 14;
 	fields[2].out_value = address_buf;
 	
 	fields[2].in_value = NULL;
-	fields[2].in_check_value = NULL;
-	fields[2].in_check_mask = NULL;
+	
+	
 	fields[2].in_handler = NULL;
-	fields[2].in_handler_priv = NULL;
+	
 
 	fields[3].tap = jtag_info->tap;
 	fields[3].num_bits = 1;
 	fields[3].out_value = &nr_w_buf;
 	
 	fields[3].in_value = NULL;
-	fields[3].in_check_value = NULL;
-	fields[3].in_check_mask = NULL;
+	
+	
 	fields[3].in_handler = NULL;
-	fields[3].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(4, fields, TAP_INVALID);
 
@@ -229,40 +229,40 @@
 	fields[0].out_value = value_buf;
 	
 	fields[0].in_value = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 1;
 	fields[1].out_value = &access;
 	
 	fields[1].in_value = &access;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
+	
 
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 14;
 	fields[2].out_value = address_buf;
 	
 	fields[2].in_value = NULL;
-	fields[2].in_check_value = NULL;
-	fields[2].in_check_mask = NULL;
+	
+	
 	fields[2].in_handler = NULL;
-	fields[2].in_handler_priv = NULL;
+	
 
 	fields[3].tap = jtag_info->tap;
 	fields[3].num_bits = 1;
 	fields[3].out_value = &nr_w_buf;
 	
 	fields[3].in_value = NULL;
-	fields[3].in_check_value = NULL;
-	fields[3].in_check_mask = NULL;
+	
+	
 	fields[3].in_handler = NULL;
-	fields[3].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(4, fields, TAP_INVALID);
 	/*TODO: add timeout*/

Modified: trunk/src/target/arm966e.c
===================================================================
--- trunk/src/target/arm966e.c	2009-05-06 07:17:57 UTC (rev 1610)
+++ trunk/src/target/arm966e.c	2009-05-06 07:21:46 UTC (rev 1611)
@@ -189,30 +189,30 @@
 	fields[0].out_value = NULL;
 	
 	fields[0].in_value = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 6;
 	fields[1].out_value = &reg_addr_buf;
 	
 	fields[1].in_value = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
+	
 
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 1;
 	fields[2].out_value = &nr_w_buf;
 	
 	fields[2].in_value = NULL;
-	fields[2].in_check_value = NULL;
-	fields[2].in_check_mask = NULL;
+	
+	
 	fields[2].in_handler = NULL;
-	fields[2].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 
@@ -257,30 +257,30 @@
 	fields[0].out_value = value_buf;
 	
 	fields[0].in_value = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 6;
 	fields[1].out_value = &reg_addr_buf;
 	
 	fields[1].in_value = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
+	
 
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 1;
 	fields[2].out_value = &nr_w_buf;
 	
 	fields[2].in_value = NULL;
-	fields[2].in_check_value = NULL;
-	fields[2].in_check_mask = NULL;
+	
+	
 	fields[2].in_handler = NULL;
-	fields[2].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 

Modified: trunk/src/target/arm9tdmi.c
===================================================================
--- trunk/src/target/arm9tdmi.c	2009-05-06 07:17:57 UTC (rev 1610)
+++ trunk/src/target/arm9tdmi.c	2009-05-06 07:21:46 UTC (rev 1611)
@@ -130,30 +130,30 @@
 		fields[0].out_value = NULL;
 		
 		fields[0].in_value = databus;
-		fields[0].in_check_value = NULL;
-		fields[0].in_check_mask = NULL;
+		
+		
 		fields[0].in_handler = NULL;
-		fields[0].in_handler_priv = NULL;
+		
 
 		fields[1].tap = arm7_9->jtag_info.tap;
 		fields[1].num_bits = 3;
 		fields[1].out_value = NULL;
 		
 		fields[1].in_value = &debug_reason;
-		fields[1].in_check_value = NULL;
-		fields[1].in_check_mask = NULL;
+		
+		
 		fields[1].in_handler = NULL;
-		fields[1].in_handler_priv = NULL;
+		
 
 		fields[2].tap = arm7_9->jtag_info.tap;
 		fields[2].num_bits = 32;
 		fields[2].out_value = NULL;
 		
 		fields[2].in_value = instructionbus;
-		fields[2].in_check_value = NULL;
-		fields[2].in_check_mask = NULL;
+		
+		
 		fields[2].in_handler = NULL;
-		fields[2].in_handler_priv = NULL;
+		
 
 		if((retval = arm_jtag_scann(&arm7_9->jtag_info, 0x1)) != ERROR_OK)
 		{
@@ -226,30 +226,30 @@
 	else
 	{
 		fields[0].in_handler = NULL;
-		fields[0].in_handler_priv = NULL;
+		
 	}
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 3;
 	fields[1].out_value = &sysspeed_buf;
 	
 	fields[1].in_value = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
+	
 
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 32;
 	fields[2].out_value = instr_buf;
 	
 	fields[2].in_value = NULL;
-	fields[2].in_check_value = NULL;
-	fields[2].in_check_mask = NULL;
+	
+	
 	fields[2].in_handler = NULL;
-	fields[2].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 
@@ -295,8 +295,8 @@
 	fields[0].in_value = NULL;
 	fields[0].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */
 	fields[0].in_handler_priv = in;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 3;
@@ -304,19 +304,19 @@
 	
 	fields[1].in_value = NULL;
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
+	
 
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 32;
 	fields[2].out_value = NULL;
 	
 	fields[2].in_value = NULL;
-	fields[2].in_check_value = NULL;
-	fields[2].in_check_mask = NULL;
+	
+	
 	fields[2].in_handler = NULL;
-	fields[2].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 
@@ -378,8 +378,8 @@
 			break;
 	}
 	fields[0].in_handler_priv = in;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 3;
@@ -387,19 +387,19 @@
 	
 	fields[1].in_value = NULL;
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
+	
 
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 32;
 	fields[2].out_value = NULL;
 	
 	fields[2].in_value = NULL;
-	fields[2].in_check_value = NULL;
-	fields[2].in_check_mask = NULL;
+	
+	
 	fields[2].in_handler = NULL;
-	fields[2].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 

Modified: trunk/src/target/arm_adi_v5.c
===================================================================
--- trunk/src/target/arm_adi_v5.c	2009-05-06 07:17:57 UTC (rev 1610)
+++ trunk/src/target/arm_adi_v5.c	2009-05-06 07:21:46 UTC (rev 1611)
@@ -78,10 +78,10 @@
 	fields[0].out_value = &out_addr_buf;
 	
 	fields[0].in_value = ack;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
@@ -89,9 +89,9 @@
 	
 	fields[1].in_value = invalue;
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
+	
 
 	jtag_add_dr_scan(2, fields, TAP_INVALID);
 
@@ -114,10 +114,10 @@
 	fields[0].out_value = &out_addr_buf;
 	
 	fields[0].in_value = ack;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
@@ -133,10 +133,10 @@
 	else
 	{
 		fields[1].in_handler = NULL;
-		fields[1].in_handler_priv = NULL;
+		
 	}
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 
 	jtag_add_dr_scan(2, fields, TAP_INVALID);
 

Modified: trunk/src/target/arm_jtag.c
===================================================================
--- trunk/src/target/arm_jtag.c	2009-05-06 07:17:57 UTC (rev 1610)
+++ trunk/src/target/arm_jtag.c	2009-05-06 07:21:46 UTC (rev 1611)
@@ -54,10 +54,10 @@
 		buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
 		
 		field.in_value = NULL;
-		field.in_check_value = NULL;
-		field.in_check_mask = NULL;
+		
+		
 		field.in_handler = handler;
-		field.in_handler_priv = NULL;
+		
 		jtag_add_ir_scan(1, &field, TAP_INVALID);
 	}
 

Modified: trunk/src/target/embeddedice.c
===================================================================
--- trunk/src/target/embeddedice.c	2009-05-06 07:17:57 UTC (rev 1610)
+++ trunk/src/target/embeddedice.c	2009-05-06 07:21:46 UTC (rev 1611)
@@ -253,10 +253,10 @@
 	fields[0].out_value = reg->value;
 	
 	fields[0].in_value = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = ice_reg->jtag_info->tap;
 	fields[1].num_bits = 5;
@@ -264,10 +264,10 @@
 	buf_set_u32(fields[1].out_value, 0, 5, reg_addr);
 	
 	fields[1].in_value = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
+	
 
 	fields[2].tap = ice_reg->jtag_info->tap;
 	fields[2].num_bits = 1;
@@ -275,10 +275,10 @@
 	buf_set_u32(fields[2].out_value, 0, 1, 0);
 	
 	fields[2].in_value = NULL;
-	fields[2].in_check_value = NULL;
-	fields[2].in_check_mask = NULL;
+	
+	
 	fields[2].in_handler = NULL;
-	fields[2].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 
@@ -315,10 +315,10 @@
 	fields[0].out_value = NULL;
 	
 	fields[0].in_value = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 5;
@@ -326,10 +326,10 @@
 	buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_DATA]);
 	
 	fields[1].in_value = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
+	
 
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 1;
@@ -337,10 +337,10 @@
 	buf_set_u32(fields[2].out_value, 0, 1, 0);
 	
 	fields[2].in_value = NULL;
-	fields[2].in_check_value = NULL;
-	fields[2].in_check_mask = NULL;
+	
+	
 	fields[2].in_handler = NULL;
-	fields[2].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 
@@ -432,10 +432,10 @@
 	fields[0].out_value = field0_out;
 	
 	fields[0].in_value = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 5;
@@ -443,10 +443,10 @@
 	buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_DATA]);
 	
 	fields[1].in_value = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
+	
 
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 1;
@@ -454,10 +454,10 @@
 	buf_set_u32(fields[2].out_value, 0, 1, 1);
 	
 	fields[2].in_value = NULL;
-	fields[2].in_check_value = NULL;
-	fields[2].in_check_mask = NULL;
+	
+	
 	fields[2].in_handler = NULL;
-	fields[2].in_handler_priv = NULL;
+	
 
 	while (size > 0)
 	{
@@ -501,10 +501,10 @@
 	fields[0].out_value = NULL;
 	
 	fields[0].in_value = field0_in;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 5;
@@ -512,10 +512,10 @@
 	buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_CTRL]);
 	
 	fields[1].in_value = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
+	
 
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 1;
@@ -523,10 +523,10 @@
 	buf_set_u32(fields[2].out_value, 0, 1, 0);
 	
 	fields[2].in_value = NULL;
-	fields[2].in_check_value = NULL;
-	fields[2].in_check_mask = NULL;
+	
+	
 	fields[2].in_handler = NULL;
-	fields[2].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 	gettimeofday(&lap, NULL);

Modified: trunk/src/target/etb.c
===================================================================
--- trunk/src/target/etb.c	2009-05-06 07:17:57 UTC (rev 1610)
+++ trunk/src/target/etb.c	2009-05-06 07:21:46 UTC (rev 1611)
@@ -72,10 +72,10 @@
 		buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
 		
 		field.in_value = NULL;
-		field.in_check_value = NULL;
-		field.in_check_mask = NULL;
+		
+		
 		field.in_handler = NULL;
-		field.in_handler_priv = NULL;
+		
 
 		jtag_add_ir_scan(1, &field, TAP_INVALID);
 
@@ -97,10 +97,10 @@
 		buf_set_u32(field.out_value, 0, field.num_bits, new_scan_chain);
 		
 		field.in_value = NULL;
-		field.in_check_value = NULL;
-		field.in_check_mask = NULL;
+		
+		
 		field.in_handler = NULL;
-		field.in_handler_priv = NULL;
+		
 
 		/* select INTEST instruction */
 		etb_set_instr(etb, 0x2);
@@ -188,10 +188,10 @@
 	fields[0].out_value = NULL;
 	
 	fields[0].in_value = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = etb->tap;
 	fields[1].num_bits = 7;
@@ -199,10 +199,10 @@
 	buf_set_u32(fields[1].out_value, 0, 7, 4);
 	
 	fields[1].in_value = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
+	
 
 	fields[2].tap = etb->tap;
 	fields[2].num_bits = 1;
@@ -210,10 +210,10 @@
 	buf_set_u32(fields[2].out_value, 0, 1, 0);
 	
 	fields[2].in_value = NULL;
-	fields[2].in_check_value = NULL;
-	fields[2].in_check_mask = NULL;
+	
+	
 	fields[2].in_handler = NULL;
-	fields[2].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 
@@ -259,10 +259,10 @@
 	fields[0].out_value = reg->value;
 	
 	fields[0].in_value = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = etb_reg->etb->tap;
 	fields[1].num_bits = 7;
@@ -270,10 +270,10 @@
 	buf_set_u32(fields[1].out_value, 0, 7, reg_addr);
 	
 	fields[1].in_value = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
+	
 
 	fields[2].tap = etb_reg->etb->tap;
 	fields[2].num_bits = 1;
@@ -281,10 +281,10 @@
 	buf_set_u32(fields[2].out_value, 0, 1, 0);
 	
 	fields[2].in_value = NULL;
-	fields[2].in_check_value = NULL;
-	fields[2].in_check_mask = NULL;
+	
+	
 	fields[2].in_handler = NULL;
-	fields[2].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 
@@ -356,10 +356,10 @@
 	buf_set_u32(fields[0].out_value, 0, 32, value);
 	
 	fields[0].in_value = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = etb_reg->etb->tap;
 	fields[1].num_bits = 7;
@@ -367,10 +367,10 @@
 	buf_set_u32(fields[1].out_value, 0, 7, reg_addr);
 	
 	fields[1].in_value = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
+	
 
 	fields[2].tap = etb_reg->etb->tap;
 	fields[2].num_bits = 1;
@@ -378,10 +378,10 @@
 	buf_set_u32(fields[2].out_value, 0, 1, 1);
 	
 	fields[2].in_value = NULL;
-	fields[2].in_check_value = NULL;
-	fields[2].in_check_mask = NULL;
+	
+	
 	fields[2].in_handler = NULL;
-	fields[2].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 

Modified: trunk/src/target/etm.c
===================================================================
--- trunk/src/target/etm.c	2009-05-06 07:17:57 UTC (rev 1610)
+++ trunk/src/target/etm.c	2009-05-06 07:21:46 UTC (rev 1611)
@@ -341,10 +341,10 @@
 	fields[0].out_value = reg->value;
 	
 	fields[0].in_value = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = etm_reg->jtag_info->tap;
 	fields[1].num_bits = 7;
@@ -352,10 +352,10 @@
 	buf_set_u32(fields[1].out_value, 0, 7, reg_addr);
 	
 	fields[1].in_value = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
+	
 
 	fields[2].tap = etm_reg->jtag_info->tap;
 	fields[2].num_bits = 1;
@@ -363,10 +363,10 @@
 	buf_set_u32(fields[2].out_value, 0, 1, 0);
 	
 	fields[2].in_value = NULL;
-	fields[2].in_check_value = NULL;
-	fields[2].in_check_mask = NULL;
+	
+	
 	fields[2].in_handler = NULL;
-	fields[2].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 
@@ -433,10 +433,10 @@
 	buf_set_u32(fields[0].out_value, 0, 32, value);
 	
 	fields[0].in_value = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = etm_reg->jtag_info->tap;
 	fields[1].num_bits = 7;
@@ -444,10 +444,10 @@
 	buf_set_u32(fields[1].out_value, 0, 7, reg_addr);
 	
 	fields[1].in_value = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
+	
 
 	fields[2].tap = etm_reg->jtag_info->tap;
 	fields[2].num_bits = 1;
@@ -455,10 +455,10 @@
 	buf_set_u32(fields[2].out_value, 0, 1, 1);
 	
 	fields[2].in_value = NULL;
-	fields[2].in_check_value = NULL;
-	fields[2].in_check_mask = NULL;
+	
+	
 	fields[2].in_handler = NULL;
-	fields[2].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 

Modified: trunk/src/target/feroceon.c
===================================================================
--- trunk/src/target/feroceon.c	2009-05-06 07:17:57 UTC (rev 1610)
+++ trunk/src/target/feroceon.c	2009-05-06 07:21:46 UTC (rev 1611)
@@ -138,29 +138,29 @@
 	
 	fields[0].in_value = NULL;
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
+	
 
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 3;
 	fields[1].out_value = &sysspeed_buf;
 	
 	fields[1].in_value = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
+	
 
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 32;
 	fields[2].out_value = instr_buf;
 	
 	fields[2].in_value = NULL;
-	fields[2].in_check_value = NULL;
-	fields[2].in_check_mask = NULL;
+	
+	
 	fields[2].in_handler = NULL;
-	fields[2].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 

Modified: trunk/src/target/mips_ejtag.c
===================================================================
--- trunk/src/target/mips_ejtag.c	2009-05-06 07:17:57 UTC (rev 1610)
+++ trunk/src/target/mips_ejtag.c	2009-05-06 07:21:46 UTC (rev 1611)
@@ -51,10 +51,10 @@
 		buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
 
 		field.in_value = NULL;
-		field.in_check_value = NULL;
-		field.in_check_mask = NULL;
+		
+		
 		field.in_handler = NULL;
-		field.in_handler_priv = NULL;
+		
 		jtag_add_ir_scan(1, &field, TAP_INVALID);
 	}
 
@@ -74,10 +74,10 @@
 	field.out_value = NULL;
 
 	field.in_value = (void*)idcode;
-	field.in_check_value = NULL;
-	field.in_check_mask = NULL;
+	
+	
 	field.in_handler = NULL;
-	field.in_handler_priv = NULL;
+	
 	jtag_add_dr_scan(1, &field, TAP_INVALID);
 
 	if (jtag_execute_queue() != ERROR_OK)
@@ -101,10 +101,10 @@
 	field.out_value = NULL;
 
 	field.in_value = (void*)impcode;
-	field.in_check_value = NULL;
-	field.in_check_mask = NULL;
+	
+	
 	field.in_handler = NULL;
-	field.in_handler_priv = NULL;
+	
 	jtag_add_dr_scan(1, &field, TAP_INVALID);
 
 	if (jtag_execute_queue() != ERROR_OK)
@@ -132,10 +132,10 @@
 	buf_set_u32(field.out_value, 0, field.num_bits, *data);
 
 	field.in_value = (u8*)data;
-	field.in_check_value = NULL;
-	field.in_check_mask = NULL;
+	
+	
 	field.in_handler = NULL;
-	field.in_handler_priv = NULL;
+	
 	jtag_add_dr_scan(1, &field, TAP_INVALID);
 
 	if ((retval = jtag_execute_queue()) != ERROR_OK)

Modified: trunk/src/target/xscale.c
===================================================================
--- trunk/src/target/xscale.c	2009-05-06 07:17:57 UTC (rev 1610)
+++ trunk/src/target/xscale.c	2009-05-06 07:21:46 UTC (rev 1611)
@@ -271,9 +271,9 @@
 	
 	fields[1].in_value = xscale->reg_cache->reg_list[XSCALE_DCSR].value;
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
+	
 
 	fields[2].tap = xscale->jtag_info.tap;
 	fields[2].num_bits = 1;
@@ -349,9 +349,9 @@
 	
 	fields[1].in_value = NULL;
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
+	
 
 	fields[2].tap = xscale->jtag_info.tap;
 	fields[2].num_bits = 1;
@@ -468,9 +468,9 @@
 	
 	fields[1].in_value = xscale->reg_cache->reg_list[XSCALE_TX].value;
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
+	
 
 	fields[2].tap = xscale->jtag_info.tap;
 	fields[2].num_bits = 1;
@@ -564,9 +564,9 @@
 	
 	fields[1].in_value = NULL;
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
+	
 
 	fields[2].tap = xscale->jtag_info.tap;
 	fields[2].num_bits = 1;
@@ -739,9 +739,9 @@
 	
 	fields[1].in_value = NULL;
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
+	
 
 	fields[2].tap = xscale->jtag_info.tap;
 	fields[2].num_bits = 1;
@@ -807,20 +807,20 @@
 	fields[0].out_value = &cmd;
 	
 	fields[0].in_value = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = xscale->jtag_info.tap;
 	fields[1].num_bits = 27;
 	fields[1].out_value = packet;
 	
 	fields[1].in_value = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(2, fields, TAP_INVALID);
 
@@ -865,20 +865,20 @@
 	fields[0].out_value = &cmd;
 	
 	fields[0].in_value = NULL;
-	fields[0].in_check_value = NULL;
-	fields[0].in_check_mask = NULL;
+	
+	
 	fields[0].in_handler = NULL;
-	fields[0].in_handler_priv = NULL;
+	
 
 	fields[1].tap = xscale->jtag_info.tap;
 	fields[1].num_bits = 27;
 	fields[1].out_value = packet;
 	
 	fields[1].in_value = NULL;
-	fields[1].in_check_value = NULL;
-	fields[1].in_check_mask = NULL;
+	
+	
 	fields[1].in_handler = NULL;
-	fields[1].in_handler_priv = NULL;
+	
 
 	jtag_add_dr_scan(2, fields, TAP_INVALID);
 

Modified: trunk/src/xsvf/xsvf.c
===================================================================
--- trunk/src/xsvf/xsvf.c	2009-05-06 07:17:57 UTC (rev 1610)
+++ trunk/src/xsvf/xsvf.c	2009-05-06 07:21:46 UTC (rev 1611)
@@ -707,10 +707,10 @@
 					field.out_value = ir_buf;
 					
 					field.in_value = NULL;
-					field.in_check_value = NULL;
-					field.in_check_mask = NULL;
+					
+					
 					field.in_handler = NULL;
-					field.in_handler_priv = NULL;
+					
 
 					if (tap == NULL)
 						jtag_add_plain_ir_scan(1, &field, my_end_state);

[Openocd-svn] r1610 - in trunk: . src/helper

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

Author: zwelch
Date: 2009-05-06 09:17:57 +0200 (Wed, 06 May 2009)
New Revision: 1610

Modified:
   trunk/configure.in
   trunk/src/helper/jim.c
Log:
Add autoconf check to determine where environ should be declared.

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2009-05-06 06:40:56 UTC (rev 1609)
+++ trunk/configure.in	2009-05-06 07:17:57 UTC (rev 1610)
@@ -784,6 +784,37 @@
 AM_PROG_CC_C_O
 AC_PROG_RANLIB
 
+# Look for environ alternatives.  Possibility #1: is environ in unistd.h?
+AC_MSG_CHECKING([for environ in unistd.h])
+AC_COMPILE_IFELSE([
+#define _GNU_SOURCE
+#include <unistd.h>
+int main(int argc, char **argv) { char **ep = environ; }
+  ], [
+    AC_MSG_RESULT([yes])
+    has_environ=yes
+  ], [
+    AC_MSG_RESULT([no])
+
+    # Possibility #2: can environ be found in an available library?
+    AC_MSG_CHECKING([for extern environ])
+    AC_LINK_IFELSE([
+extern char **environ;
+int main(int argc, char **argv) { char **ep = environ; }
+      ], [
+        AC_DEFINE(NEED_ENVIRON_EXTERN, [1], [Must declare 'environ' to use it.])
+        has_environ=yes
+      ], [
+        has_environ=no
+      ])
+    AC_MSG_RESULT([${has_environ}])
+  ])
+
+if test "${has_environ}" != "yes" ; then
+     AC_MSG_FAILURE([Could find 'environ' in unistd.h or available libraries.]) 
+fi
+
+
 # set default gcc warnings
 GCC_WARNINGS="-Wall -Wstrict-prototypes -Wformat-security"
 if test "${gcc_wextra}" = yes; then

Modified: trunk/src/helper/jim.c
===================================================================
--- trunk/src/helper/jim.c	2009-05-06 06:40:56 UTC (rev 1609)
+++ trunk/src/helper/jim.c	2009-05-06 07:17:57 UTC (rev 1610)
@@ -11984,7 +11984,7 @@
 
     if (argc == 1) {
 
-#if !defined(HAVE_UNISTD_H) || !defined(__GNU_LIBRARY__)
+#ifdef NEED_ENVIRON_EXTERN
         extern char **environ;
 #endif
 

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

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

Author: oharboe
Date: 2009-05-06 08:40:56 +0200 (Wed, 06 May 2009)
New Revision: 1609

Modified:
   trunk/src/jtag/jtag.h
   trunk/src/target/mips_ejtag.c
   trunk/src/target/mips_ejtag.h
Log:
add warnings about not using in_handler

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-05-06 06:20:52 UTC (rev 1608)
+++ trunk/src/jtag/jtag.h	2009-05-06 06:40:56 UTC (rev 1609)
@@ -273,9 +273,9 @@
 	u8*         out_value;          /* value to be scanned into the device */
 	u8*         in_value;           /* pointer to a 32-bit memory location to take data scanned out */
 	/* in_check_value/mask, in_handler_error_handler, in_handler_priv can be used by the in handler, otherwise they contain garbage  */
-	u8*          in_check_value;    /* used to validate scan results */
-	u8*          in_check_mask;     /* check specified bits against check_value */
-	in_handler_t in_handler;        /* process received buffer using this handler */
+	u8*          in_check_value;    /* deprecated! only used from jtag_set_check_value. used to validate scan results */
+	u8*          in_check_mask;     /* deprecated! only used from jtag_set_check_value.  check specified bits against check_value */
+	in_handler_t in_handler;        /* deprecated! DO NOT USE! process received buffer using this handler */
 	void*        in_handler_priv;   /* additional information for the in_handler */
 } scan_field_t;
 
@@ -580,10 +580,10 @@
  * of the same interface over time. Even if the OpenOCD code
  * is unchanged, the actual path taken may vary over time
  * and versions of interface firmware or PCB revisions.
- * 
+ *
  * Use jtag_add_pathmove() when specific transition sequences
  * are required.
- * 
+ *
  * Do not use jtag_add_pathmove() unless you need to, but do use it
  * if you have to.
  *

Modified: trunk/src/target/mips_ejtag.c
===================================================================
--- trunk/src/target/mips_ejtag.c	2009-05-06 06:20:52 UTC (rev 1608)
+++ trunk/src/target/mips_ejtag.c	2009-05-06 06:40:56 UTC (rev 1609)
@@ -32,7 +32,7 @@
 
 #include <stdlib.h>
 
-int mips_ejtag_set_instr(mips_ejtag_t *ejtag_info, int new_instr, in_handler_t handler)
+int mips_ejtag_set_instr(mips_ejtag_t *ejtag_info, int new_instr, void *delete_me_and_submit_patch)
 {
 	jtag_tap_t *tap;
 
@@ -49,11 +49,11 @@
 		field.num_bits = tap->ir_length;
 		field.out_value = t;
 		buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
-		
+
 		field.in_value = NULL;
 		field.in_check_value = NULL;
 		field.in_check_mask = NULL;
-		field.in_handler = handler;
+		field.in_handler = NULL;
 		field.in_handler_priv = NULL;
 		jtag_add_ir_scan(1, &field, TAP_INVALID);
 	}
@@ -72,7 +72,7 @@
 	field.tap = ejtag_info->tap;
 	field.num_bits = 32;
 	field.out_value = NULL;
-	
+
 	field.in_value = (void*)idcode;
 	field.in_check_value = NULL;
 	field.in_check_mask = NULL;
@@ -99,7 +99,7 @@
 	field.tap = ejtag_info->tap;
 	field.num_bits = 32;
 	field.out_value = NULL;
-	
+
 	field.in_value = (void*)impcode;
 	field.in_check_value = NULL;
 	field.in_check_mask = NULL;
@@ -130,7 +130,7 @@
 	field.num_bits = 32;
 	field.out_value = t;
 	buf_set_u32(field.out_value, 0, field.num_bits, *data);
-	
+
 	field.in_value = (u8*)data;
 	field.in_check_value = NULL;
 	field.in_check_mask = NULL;

Modified: trunk/src/target/mips_ejtag.h
===================================================================
--- trunk/src/target/mips_ejtag.h	2009-05-06 06:20:52 UTC (rev 1608)
+++ trunk/src/target/mips_ejtag.h	2009-05-06 06:40:56 UTC (rev 1609)
@@ -107,7 +107,7 @@
 	u32 ejtag_ctrl;
 } mips_ejtag_t;
 
-extern int mips_ejtag_set_instr(mips_ejtag_t *ejtag_info, int new_instr, in_handler_t handler);
+extern int mips_ejtag_set_instr(mips_ejtag_t *ejtag_info, int new_instr, void *delete_me_and_submit_patch);
 extern int mips_ejtag_enter_debug(mips_ejtag_t *ejtag_info);
 extern int mips_ejtag_exit_debug(mips_ejtag_t *ejtag_info, int enable_interrupts);
 extern int mips_ejtag_get_impcode(mips_ejtag_t *ejtag_info, u32 *impcode, in_handler_t handler);

[Openocd-svn] r1608 - in trunk: . src/flash src/helper src/jtag src/pld src/svf src/target src/xsvf

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

Author: oharboe
Date: 2009-05-06 08:20:52 +0200 (Wed, 06 May 2009)
New Revision: 1608

Modified:
   trunk/
   trunk/src/flash/str9xpec.c
   trunk/src/helper/tclapi.c
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
   trunk/src/jtag/zy1000.c
   trunk/src/pld/virtex2.c
   trunk/src/svf/svf.c
   trunk/src/target/arm11_dbgtap.c
   trunk/src/target/arm720t.c
   trunk/src/target/arm7tdmi.c
   trunk/src/target/arm920t.c
   trunk/src/target/arm926ejs.c
   trunk/src/target/arm966e.c
   trunk/src/target/arm9tdmi.c
   trunk/src/target/arm_adi_v5.c
   trunk/src/target/arm_jtag.c
   trunk/src/target/avrt.c
   trunk/src/target/embeddedice.c
   trunk/src/target/etb.c
   trunk/src/target/etm.c
   trunk/src/target/feroceon.c
   trunk/src/target/mips_ejtag.c
   trunk/src/target/xscale.c
   trunk/src/xsvf/xsvf.c
Log:
retire out_mask - not used anywhere


Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
   - autom4te.cache
.project
aclocal.m4
config.guess
config.h.in
config.sub
configure
depcomp
install-sh
Makefile.in
missing

   + autom4te.cache
.project
aclocal.m4
config.guess
config.h.in
config.sub
configure
depcomp
install-sh
Makefile.in
missing
compile


Modified: trunk/src/flash/str9xpec.c
===================================================================
--- trunk/src/flash/str9xpec.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/flash/str9xpec.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -125,7 +125,7 @@
 		field.num_bits = tap->ir_length;
 		field.out_value = calloc(CEIL(field.num_bits, 8), 1);
 		buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
-		field.out_mask = NULL;
+		
 		field.in_value = NULL;
 		field.in_check_value = NULL;
 		field.in_check_mask = NULL;
@@ -151,7 +151,7 @@
 	field.tap = tap;
 	field.num_bits = 8;
 	field.out_value = NULL;
-	field.out_mask = NULL;
+	
 	field.in_value = &status;
 	field.in_check_value = NULL;
 	field.in_check_mask = NULL;
@@ -243,7 +243,7 @@
 	field.tap = tap;
 	field.num_bits = 64;
 	field.out_value = NULL;
-	field.out_mask = NULL;
+	
 	field.in_value = str9xpec_info->options;
 	field.in_check_value = NULL;
 	field.in_check_mask = NULL;
@@ -395,7 +395,7 @@
 	field.tap = tap;
 	field.num_bits = 64;
 	field.out_value = buffer;
-	field.out_mask = NULL;
+	
 	field.in_value = NULL;
 	field.in_check_value = NULL;
 	field.in_check_mask = NULL;
@@ -409,7 +409,7 @@
 	field.tap = tap;
 	field.num_bits = 64;
 	field.out_value = NULL;
-	field.out_mask = NULL;
+	
 	field.in_value = buffer;
 	field.in_check_value = NULL;
 	field.in_check_mask = NULL;
@@ -511,7 +511,7 @@
 	field.tap = tap;
 	field.num_bits = 64;
 	field.out_value = buffer;
-	field.out_mask = NULL;
+	
 	field.in_value = NULL;
 	field.in_check_value = NULL;
 	field.in_check_mask = NULL;
@@ -577,7 +577,7 @@
 		field.tap = tap;
 		field.num_bits = 8;
 		field.out_value = NULL;
-		field.out_mask = NULL;
+		
 		field.in_value = &status;
 		field.in_check_value = NULL;
 		field.in_check_mask = NULL;
@@ -663,7 +663,7 @@
 	field.tap = tap;
 	field.num_bits = 8;
 	field.out_value = &sector;
-	field.out_mask = NULL;
+	
 	field.in_value = NULL;
 	field.in_check_value = NULL;
 	field.in_check_mask = NULL;
@@ -752,7 +752,7 @@
 			field.tap = tap;
 			field.num_bits = 64;
 			field.out_value = (buffer + bytes_written);
-			field.out_mask = NULL;
+			
 			field.in_value = NULL;
 			field.in_check_value = NULL;
 			field.in_check_mask = NULL;
@@ -770,7 +770,7 @@
 				field.tap = tap;
 				field.num_bits = 8;
 				field.out_value = NULL;
-				field.out_mask = NULL;
+				
 				field.in_value = scanbuf;
 				field.in_check_value = NULL;
 				field.in_check_mask = NULL;
@@ -812,7 +812,7 @@
 		field.tap = tap;
 		field.num_bits = 64;
 		field.out_value = last_dword;
-		field.out_mask = NULL;
+		
 		field.in_value = NULL;
 		field.in_check_value = NULL;
 		field.in_check_mask = NULL;
@@ -830,7 +830,7 @@
 			field.tap = tap;
 			field.num_bits = 8;
 			field.out_value = NULL;
-			field.out_mask = NULL;
+			
 			field.in_value = scanbuf;
 			field.in_check_value = NULL;
 			field.in_check_mask = NULL;
@@ -894,7 +894,7 @@
 	field.tap = tap;
 	field.num_bits = 32;
 	field.out_value = NULL;
-	field.out_mask = NULL;
+	
 	field.in_value = buffer;
 	field.in_check_value = NULL;
 	field.in_check_mask = NULL;
@@ -1019,7 +1019,7 @@
 	field.tap = tap;
 	field.num_bits = 64;
 	field.out_value = str9xpec_info->options;
-	field.out_mask = NULL;
+	
 	field.in_value = NULL;
 	field.in_check_value = NULL;
 	field.in_check_mask = NULL;
@@ -1037,7 +1037,7 @@
 		field.tap = tap;
 		field.num_bits = 8;
 		field.out_value = NULL;
-		field.out_mask = NULL;
+		
 		field.in_value = &status;
 		field.in_check_value = NULL;
 		field.in_check_mask = NULL;

Modified: trunk/src/helper/tclapi.c
===================================================================
--- trunk/src/helper/tclapi.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/helper/tclapi.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -447,7 +447,6 @@
 		fields[field_count].num_bits = bits;
 		fields[field_count].out_value = malloc(CEIL(bits, 8));
 		str_to_buf(str, len, fields[field_count].out_value, bits, 0);
-		fields[field_count].out_mask = NULL;
 		fields[field_count].in_value = fields[field_count].out_value;
 		fields[field_count].in_check_mask = NULL;
 		fields[field_count].in_check_value = NULL;

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/jtag/jtag.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -579,8 +579,7 @@
 			{
 				found = 1;
 				(*last_cmd)->cmd.scan->fields[nth_tap].out_value = buf_cpy(fields[j].out_value, cmd_queue_alloc(CEIL(scan_size, 8)), scan_size);
-				(*last_cmd)->cmd.scan->fields[nth_tap].out_mask = buf_cpy(fields[j].out_mask, cmd_queue_alloc(CEIL(scan_size, 8)), scan_size);
-
+				
 				if (jtag_verify_capture_ir)
 				{
 					if (fields[j].in_handler==NULL)
@@ -604,7 +603,6 @@
 		{
 			/* if a tap isn't listed, set it to BYPASS */
 			(*last_cmd)->cmd.scan->fields[nth_tap].out_value = buf_set_ones(cmd_queue_alloc(CEIL(scan_size, 8)), scan_size);
-			(*last_cmd)->cmd.scan->fields[nth_tap].out_mask = NULL;
 			tap->bypass = 1;
 		}
 
@@ -652,7 +650,6 @@
 		(*last_cmd)->cmd.scan->fields[i].tap = fields[i].tap;
 		(*last_cmd)->cmd.scan->fields[i].num_bits = num_bits;
 		(*last_cmd)->cmd.scan->fields[i].out_value = buf_cpy(fields[i].out_value, cmd_queue_alloc(num_bytes), num_bits);
-		(*last_cmd)->cmd.scan->fields[i].out_mask = buf_cpy(fields[i].out_mask, cmd_queue_alloc(num_bytes), num_bits);
 		(*last_cmd)->cmd.scan->fields[i].in_value = fields[i].in_value;
 		(*last_cmd)->cmd.scan->fields[i].in_check_value = fields[i].in_check_value;
 		(*last_cmd)->cmd.scan->fields[i].in_check_mask = fields[i].in_check_mask;
@@ -729,7 +726,6 @@
 				scan_size = fields[j].num_bits;
 				(*last_cmd)->cmd.scan->fields[field_count].num_bits = scan_size;
 				(*last_cmd)->cmd.scan->fields[field_count].out_value = buf_cpy(fields[j].out_value, cmd_queue_alloc(CEIL(scan_size, 8)), scan_size);
-				(*last_cmd)->cmd.scan->fields[field_count].out_mask = buf_cpy(fields[j].out_mask, cmd_queue_alloc(CEIL(scan_size, 8)), scan_size);
 				(*last_cmd)->cmd.scan->fields[field_count].in_value = fields[j].in_value;
 				(*last_cmd)->cmd.scan->fields[field_count].in_check_value = fields[j].in_check_value;
 				(*last_cmd)->cmd.scan->fields[field_count].in_check_mask = fields[j].in_check_mask;
@@ -750,7 +746,6 @@
 			/* program the scan field to 1 bit length, and ignore it's value */
 			(*last_cmd)->cmd.scan->fields[field_count].num_bits = 1;
 			(*last_cmd)->cmd.scan->fields[field_count].out_value = NULL;
-			(*last_cmd)->cmd.scan->fields[field_count].out_mask = NULL;
 			(*last_cmd)->cmd.scan->fields[field_count].in_value = NULL;
 			(*last_cmd)->cmd.scan->fields[field_count].in_check_value = NULL;
 			(*last_cmd)->cmd.scan->fields[field_count].in_check_mask = NULL;
@@ -840,7 +835,6 @@
 				buf_set_u32(out_value, 0, scan_size, value[j]);
 				(*last_cmd)->cmd.scan->fields[field_count].num_bits = scan_size;
 				(*last_cmd)->cmd.scan->fields[field_count].out_value = buf_cpy(out_value, cmd_queue_alloc(CEIL(scan_size, 8)), scan_size);
-				(*last_cmd)->cmd.scan->fields[field_count].out_mask = NULL;
 				(*last_cmd)->cmd.scan->fields[field_count].in_value = NULL;
 				(*last_cmd)->cmd.scan->fields[field_count].in_check_value = NULL;
 				(*last_cmd)->cmd.scan->fields[field_count].in_check_mask = NULL;
@@ -860,7 +854,6 @@
 			/* program the scan field to 1 bit length, and ignore it's value */
 			(*last_cmd)->cmd.scan->fields[field_count].num_bits = 1;
 			(*last_cmd)->cmd.scan->fields[field_count].out_value = NULL;
-			(*last_cmd)->cmd.scan->fields[field_count].out_mask = NULL;
 			(*last_cmd)->cmd.scan->fields[field_count].in_value = NULL;
 			(*last_cmd)->cmd.scan->fields[field_count].in_check_value = NULL;
 			(*last_cmd)->cmd.scan->fields[field_count].in_check_mask = NULL;
@@ -906,7 +899,6 @@
 		(*last_cmd)->cmd.scan->fields[i].tap = fields[i].tap;
 		(*last_cmd)->cmd.scan->fields[i].num_bits = num_bits;
 		(*last_cmd)->cmd.scan->fields[i].out_value = buf_cpy(fields[i].out_value, cmd_queue_alloc(num_bytes), num_bits);
-		(*last_cmd)->cmd.scan->fields[i].out_mask = buf_cpy(fields[i].out_mask, cmd_queue_alloc(num_bytes), num_bits);
 		(*last_cmd)->cmd.scan->fields[i].in_value = fields[i].in_value;
 		(*last_cmd)->cmd.scan->fields[i].in_check_value = fields[i].in_check_value;
 		(*last_cmd)->cmd.scan->fields[i].in_check_mask = fields[i].in_check_mask;
@@ -1492,7 +1484,7 @@
 	field.tap = NULL;
 	field.num_bits = sizeof(idcode_buffer) * 8;
 	field.out_value = idcode_buffer;
-	field.out_mask = NULL;
+	
 	field.in_value = idcode_buffer;
 	field.in_check_value = NULL;
 	field.in_check_mask = NULL;
@@ -1670,7 +1662,7 @@
 	field.tap = NULL;
 	field.num_bits = total_ir_length;
 	field.out_value = ir_test;
-	field.out_mask = NULL;
+	
 	field.in_value = ir_test;
 	field.in_check_value = NULL;
 	field.in_check_mask = NULL;
@@ -2792,7 +2784,6 @@
 		fields[i].tap = tap;
 		fields[i].out_value = malloc(CEIL(field_size, 8));
 		buf_set_u32(fields[i].out_value, 0, field_size, strtoul(args[i*2+1], NULL, 0));
-		fields[i].out_mask = NULL;
 		fields[i].in_value = NULL;
 		fields[i].in_check_mask = NULL;
 		fields[i].in_handler = NULL;
@@ -2908,7 +2899,6 @@
 		fields[field_count].num_bits = bits;
 		fields[field_count].out_value = malloc(CEIL(bits, 8));
 		str_to_buf(str, len, fields[field_count].out_value, bits, 0);
-		fields[field_count].out_mask = NULL;
 		fields[field_count].in_value = fields[field_count].out_value;
 		fields[field_count].in_check_mask = NULL;
 		fields[field_count].in_check_value = NULL;

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/jtag/jtag.h	2009-05-06 06:20:52 UTC (rev 1608)
@@ -271,7 +271,6 @@
 	jtag_tap_t* tap;                /* tap pointer this instruction refers to */
 	int         num_bits;           /* number of bits this field specifies (up to 32) */
 	u8*         out_value;          /* value to be scanned into the device */
-	u8*         out_mask;           /* only masked bits care */
 	u8*         in_value;           /* pointer to a 32-bit memory location to take data scanned out */
 	/* in_check_value/mask, in_handler_error_handler, in_handler_priv can be used by the in handler, otherwise they contain garbage  */
 	u8*          in_check_value;    /* used to validate scan results */

Modified: trunk/src/jtag/zy1000.c
===================================================================
--- trunk/src/jtag/zy1000.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/jtag/zy1000.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -650,7 +650,6 @@
 			/* program the scan field to 1 bit length, and ignore it's value */
 			tmp.num_bits = 1;
 			tmp.out_value = NULL;
-			tmp.out_mask = NULL;
 			tmp.in_value = NULL;
 			tmp.in_check_value = NULL;
 			tmp.in_check_mask = NULL;

Modified: trunk/src/pld/virtex2.c
===================================================================
--- trunk/src/pld/virtex2.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/pld/virtex2.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -56,7 +56,7 @@
 		field.num_bits = tap->ir_length;
 		field.out_value = calloc(CEIL(field.num_bits, 8), 1);
 		buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
-		field.out_mask = NULL;
+		
 		field.in_value = NULL;
 		field.in_check_value = NULL;
 		field.in_check_mask = NULL;
@@ -83,7 +83,6 @@
 	scan_field.tap = virtex2_info->tap;
 	scan_field.num_bits = num_words * 32;
 	scan_field.out_value = values;
-	scan_field.out_mask = NULL;
 	scan_field.in_value = NULL;
 	scan_field.in_check_value = NULL;
 	scan_field.in_check_mask = NULL;
@@ -117,7 +116,6 @@
 	scan_field.tap = virtex2_info->tap;
 	scan_field.num_bits = 32;
 	scan_field.out_value = NULL;
-	scan_field.out_mask = NULL;
 	scan_field.in_value = NULL;
 	scan_field.in_check_value = NULL;
 	scan_field.in_check_mask = NULL;
@@ -166,7 +164,7 @@
 	scan_field_t field;
 
 	field.tap = virtex2_info->tap;
-	field.out_mask = NULL;
+	
 	field.in_value = NULL;
 	field.in_check_value = NULL;
 	field.in_check_mask = NULL;

Modified: trunk/src/svf/svf.c
===================================================================
--- trunk/src/svf/svf.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/svf/svf.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -975,7 +975,7 @@
 			field.tap = tap;
 			field.num_bits = i;
 			field.out_value = &svf_tdi_buffer[svf_buffer_index];
-			field.out_mask = NULL;
+			
 			field.in_value = &svf_tdi_buffer[svf_buffer_index];
 			field.in_check_value = NULL;
 			field.in_check_mask = NULL;
@@ -1076,7 +1076,7 @@
 			field.tap = tap;
 			field.num_bits = i;
 			field.out_value = &svf_tdi_buffer[svf_buffer_index];
-			field.out_mask = NULL;
+			
 			field.in_value = &svf_tdi_buffer[svf_buffer_index];
 			field.in_check_value = NULL;
 			field.in_check_mask = NULL;

Modified: trunk/src/target/arm11_dbgtap.c
===================================================================
--- trunk/src/target/arm11_dbgtap.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/target/arm11_dbgtap.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -87,7 +87,6 @@
 {
 	field->tap   			= arm11->jtag_info.tap;
 	field->num_bits			= num_bits;
-	field->out_mask			= NULL;
 	field->in_check_mask	= NULL;
 	field->in_check_value	= NULL;
 	field->in_handler		= NULL;

Modified: trunk/src/target/arm720t.c
===================================================================
--- trunk/src/target/arm720t.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/target/arm720t.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -112,7 +112,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 1;
 	fields[0].out_value = &instruction_buf;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -122,7 +122,7 @@
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = out_buf;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	if (in)
 	{

Modified: trunk/src/target/arm7tdmi.c
===================================================================
--- trunk/src/target/arm7tdmi.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/target/arm7tdmi.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -111,7 +111,7 @@
 		fields[0].tap = arm7_9->jtag_info.tap;
 		fields[0].num_bits = 1;
 		fields[0].out_value = NULL;
-		fields[0].out_mask = NULL;
+		
 		fields[0].in_value = &breakpoint;
 		fields[0].in_check_value = NULL;
 		fields[0].in_check_mask = NULL;
@@ -121,7 +121,7 @@
 		fields[1].tap = arm7_9->jtag_info.tap;
 		fields[1].num_bits = 32;
 		fields[1].out_value = NULL;
-		fields[1].out_mask = NULL;
+		
 		fields[1].in_value = databus;
 		fields[1].in_check_value = NULL;
 		fields[1].in_check_mask = NULL;
@@ -198,7 +198,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 1;
 	fields[0].out_value = NULL;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -208,7 +208,7 @@
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = NULL;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_handler = arm_jtag_buf_to_u32_flip; /* deprecated! invoke this from user code! */
 	fields[1].in_handler_priv = in;
@@ -259,7 +259,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 1;
 	fields[0].out_value = NULL;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -269,7 +269,7 @@
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = NULL;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	switch (size)
 	{

Modified: trunk/src/target/arm920t.c
===================================================================
--- trunk/src/target/arm920t.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/target/arm920t.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -113,7 +113,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 1;
 	fields[0].out_value = &access_type_buf;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -123,7 +123,7 @@
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = NULL;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;
@@ -133,7 +133,7 @@
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 6;
 	fields[2].out_value = &reg_addr_buf;
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	fields[2].in_check_value = NULL;
 	fields[2].in_check_mask = NULL;
@@ -143,7 +143,7 @@
 	fields[3].tap = jtag_info->tap;
 	fields[3].num_bits = 1;
 	fields[3].out_value = &nr_w_buf;
-	fields[3].out_mask = NULL;
+	
 	fields[3].in_value = NULL;
 	fields[3].in_check_value = NULL;
 	fields[3].in_check_mask = NULL;
@@ -185,7 +185,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 1;
 	fields[0].out_value = &access_type_buf;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -195,7 +195,7 @@
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = value_buf;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;
@@ -205,7 +205,7 @@
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 6;
 	fields[2].out_value = &reg_addr_buf;
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	fields[2].in_check_value = NULL;
 	fields[2].in_check_mask = NULL;
@@ -215,7 +215,7 @@
 	fields[3].tap = jtag_info->tap;
 	fields[3].num_bits = 1;
 	fields[3].out_value = &nr_w_buf;
-	fields[3].out_mask = NULL;
+	
 	fields[3].in_value = NULL;
 	fields[3].in_check_value = NULL;
 	fields[3].in_check_mask = NULL;
@@ -252,7 +252,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 1;
 	fields[0].out_value = &access_type_buf;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -262,7 +262,7 @@
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = cp15_opcode_buf;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;
@@ -272,7 +272,7 @@
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 6;
 	fields[2].out_value = &reg_addr_buf;
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	fields[2].in_check_value = NULL;
 	fields[2].in_check_mask = NULL;
@@ -282,7 +282,7 @@
 	fields[3].tap = jtag_info->tap;
 	fields[3].num_bits = 1;
 	fields[3].out_value = &nr_w_buf;
-	fields[3].out_mask = NULL;
+	
 	fields[3].in_value = NULL;
 	fields[3].in_check_value = NULL;
 	fields[3].in_check_mask = NULL;

Modified: trunk/src/target/arm926ejs.c
===================================================================
--- trunk/src/target/arm926ejs.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/target/arm926ejs.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -137,7 +137,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = NULL;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -147,7 +147,7 @@
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 1;
 	fields[1].out_value = &access;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = &access;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;
@@ -157,7 +157,7 @@
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 14;
 	fields[2].out_value = address_buf;
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	fields[2].in_check_value = NULL;
 	fields[2].in_check_mask = NULL;
@@ -167,7 +167,7 @@
 	fields[3].tap = jtag_info->tap;
 	fields[3].num_bits = 1;
 	fields[3].out_value = &nr_w_buf;
-	fields[3].out_mask = NULL;
+	
 	fields[3].in_value = NULL;
 	fields[3].in_check_value = NULL;
 	fields[3].in_check_mask = NULL;
@@ -227,7 +227,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = value_buf;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -237,7 +237,7 @@
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 1;
 	fields[1].out_value = &access;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = &access;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;
@@ -247,7 +247,7 @@
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 14;
 	fields[2].out_value = address_buf;
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	fields[2].in_check_value = NULL;
 	fields[2].in_check_mask = NULL;
@@ -257,7 +257,7 @@
 	fields[3].tap = jtag_info->tap;
 	fields[3].num_bits = 1;
 	fields[3].out_value = &nr_w_buf;
-	fields[3].out_mask = NULL;
+	
 	fields[3].in_value = NULL;
 	fields[3].in_check_value = NULL;
 	fields[3].in_check_mask = NULL;

Modified: trunk/src/target/arm966e.c
===================================================================
--- trunk/src/target/arm966e.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/target/arm966e.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -187,7 +187,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = NULL;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -197,7 +197,7 @@
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 6;
 	fields[1].out_value = &reg_addr_buf;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;
@@ -207,7 +207,7 @@
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 1;
 	fields[2].out_value = &nr_w_buf;
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	fields[2].in_check_value = NULL;
 	fields[2].in_check_mask = NULL;
@@ -255,7 +255,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = value_buf;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -265,7 +265,7 @@
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 6;
 	fields[1].out_value = &reg_addr_buf;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;
@@ -275,7 +275,7 @@
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 1;
 	fields[2].out_value = &nr_w_buf;
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	fields[2].in_check_value = NULL;
 	fields[2].in_check_mask = NULL;

Modified: trunk/src/target/arm9tdmi.c
===================================================================
--- trunk/src/target/arm9tdmi.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/target/arm9tdmi.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -128,7 +128,7 @@
 		fields[0].tap = arm7_9->jtag_info.tap;
 		fields[0].num_bits = 32;
 		fields[0].out_value = NULL;
-		fields[0].out_mask = NULL;
+		
 		fields[0].in_value = databus;
 		fields[0].in_check_value = NULL;
 		fields[0].in_check_mask = NULL;
@@ -138,7 +138,7 @@
 		fields[1].tap = arm7_9->jtag_info.tap;
 		fields[1].num_bits = 3;
 		fields[1].out_value = NULL;
-		fields[1].out_mask = NULL;
+		
 		fields[1].in_value = &debug_reason;
 		fields[1].in_check_value = NULL;
 		fields[1].in_check_mask = NULL;
@@ -148,7 +148,7 @@
 		fields[2].tap = arm7_9->jtag_info.tap;
 		fields[2].num_bits = 32;
 		fields[2].out_value = NULL;
-		fields[2].out_mask = NULL;
+		
 		fields[2].in_value = instructionbus;
 		fields[2].in_check_value = NULL;
 		fields[2].in_check_mask = NULL;
@@ -216,7 +216,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = out_buf;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	if (in)
 	{
@@ -234,7 +234,7 @@
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 3;
 	fields[1].out_value = &sysspeed_buf;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;
@@ -244,7 +244,7 @@
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 32;
 	fields[2].out_value = instr_buf;
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	fields[2].in_check_value = NULL;
 	fields[2].in_check_mask = NULL;
@@ -291,7 +291,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = NULL;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */
 	fields[0].in_handler_priv = in;
@@ -301,7 +301,7 @@
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 3;
 	fields[1].out_value = NULL;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_handler = NULL;
 	fields[1].in_handler_priv = NULL;
@@ -311,7 +311,7 @@
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 32;
 	fields[2].out_value = NULL;
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	fields[2].in_check_value = NULL;
 	fields[2].in_check_mask = NULL;
@@ -363,7 +363,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = NULL;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	switch (size)
 	{
@@ -384,7 +384,7 @@
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 3;
 	fields[1].out_value = NULL;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_handler = NULL;
 	fields[1].in_handler_priv = NULL;
@@ -394,7 +394,7 @@
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 32;
 	fields[2].out_value = NULL;
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	fields[2].in_check_value = NULL;
 	fields[2].in_check_mask = NULL;

Modified: trunk/src/target/arm_adi_v5.c
===================================================================
--- trunk/src/target/arm_adi_v5.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/target/arm_adi_v5.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -76,7 +76,7 @@
 	fields[0].num_bits = 3;
 	buf_set_u32(&out_addr_buf, 0, 3, ((reg_addr >> 1) & 0x6) | (RnW & 0x1));
 	fields[0].out_value = &out_addr_buf;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = ack;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -86,7 +86,7 @@
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = outvalue;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = invalue;
 	fields[1].in_handler = NULL;
 	fields[1].in_handler_priv = NULL;
@@ -112,7 +112,7 @@
 	fields[0].num_bits = 3;
 	buf_set_u32(&out_addr_buf, 0, 3, ((reg_addr >> 1) & 0x6) | (RnW & 0x1));
 	fields[0].out_value = &out_addr_buf;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = ack;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -123,7 +123,7 @@
 	fields[1].num_bits = 32;
 	buf_set_u32(out_value_buf, 0, 32, outvalue);
 	fields[1].out_value = out_value_buf;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	if (invalue)
 	{

Modified: trunk/src/target/arm_jtag.c
===================================================================
--- trunk/src/target/arm_jtag.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/target/arm_jtag.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -52,7 +52,7 @@
 		field.num_bits = tap->ir_length;
 		field.out_value = t;
 		buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
-		field.out_mask = NULL;
+		
 		field.in_value = NULL;
 		field.in_check_value = NULL;
 		field.in_check_mask = NULL;

Modified: trunk/src/target/avrt.c
===================================================================
--- trunk/src/target/avrt.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/target/avrt.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -232,7 +232,6 @@
 		field[0].tap = tap;
 		field[0].num_bits = tap->ir_length;
 		field[0].out_value = ir_out;
-		field[0].out_mask = NULL;
 		field[0].in_value = ir_in;
 		field[0].in_check_value = NULL;
 		field[0].in_check_mask = NULL;
@@ -258,7 +257,6 @@
 		field[0].tap = tap;
 		field[0].num_bits = dr_len;
 		field[0].out_value = dr_out;
-		field[0].out_mask = NULL;
 		field[0].in_value = dr_in;
 		field[0].in_check_value = NULL;
 		field[0].in_check_mask = NULL;

Modified: trunk/src/target/embeddedice.c
===================================================================
--- trunk/src/target/embeddedice.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/target/embeddedice.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -251,7 +251,7 @@
 	fields[0].tap = ice_reg->jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = reg->value;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -262,7 +262,7 @@
 	fields[1].num_bits = 5;
 	fields[1].out_value = field1_out;
 	buf_set_u32(fields[1].out_value, 0, 5, reg_addr);
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;
@@ -273,7 +273,7 @@
 	fields[2].num_bits = 1;
 	fields[2].out_value = field2_out;
 	buf_set_u32(fields[2].out_value, 0, 1, 0);
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	fields[2].in_check_value = NULL;
 	fields[2].in_check_mask = NULL;
@@ -313,7 +313,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = NULL;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -324,7 +324,7 @@
 	fields[1].num_bits = 5;
 	fields[1].out_value = field1_out;
 	buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_DATA]);
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;
@@ -335,7 +335,7 @@
 	fields[2].num_bits = 1;
 	fields[2].out_value = field2_out;
 	buf_set_u32(fields[2].out_value, 0, 1, 0);
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	fields[2].in_check_value = NULL;
 	fields[2].in_check_mask = NULL;
@@ -430,7 +430,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = field0_out;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -441,7 +441,7 @@
 	fields[1].num_bits = 5;
 	fields[1].out_value = field1_out;
 	buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_DATA]);
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;
@@ -452,7 +452,7 @@
 	fields[2].num_bits = 1;
 	fields[2].out_value = field2_out;
 	buf_set_u32(fields[2].out_value, 0, 1, 1);
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	fields[2].in_check_value = NULL;
 	fields[2].in_check_mask = NULL;
@@ -499,7 +499,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = NULL;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = field0_in;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -510,7 +510,7 @@
 	fields[1].num_bits = 5;
 	fields[1].out_value = field1_out;
 	buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_CTRL]);
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;
@@ -521,7 +521,7 @@
 	fields[2].num_bits = 1;
 	fields[2].out_value = field2_out;
 	buf_set_u32(fields[2].out_value, 0, 1, 0);
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	fields[2].in_check_value = NULL;
 	fields[2].in_check_mask = NULL;

Modified: trunk/src/target/etb.c
===================================================================
--- trunk/src/target/etb.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/target/etb.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -70,7 +70,7 @@
 		field.num_bits = tap->ir_length;
 		field.out_value = calloc(CEIL(field.num_bits, 8), 1);
 		buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
-		field.out_mask = NULL;
+		
 		field.in_value = NULL;
 		field.in_check_value = NULL;
 		field.in_check_mask = NULL;
@@ -95,7 +95,7 @@
 		field.num_bits = 5;
 		field.out_value = calloc(CEIL(field.num_bits, 8), 1);
 		buf_set_u32(field.out_value, 0, field.num_bits, new_scan_chain);
-		field.out_mask = NULL;
+		
 		field.in_value = NULL;
 		field.in_check_value = NULL;
 		field.in_check_mask = NULL;
@@ -186,7 +186,7 @@
 	fields[0].tap = etb->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = NULL;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -197,7 +197,7 @@
 	fields[1].num_bits = 7;
 	fields[1].out_value = malloc(1);
 	buf_set_u32(fields[1].out_value, 0, 7, 4);
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;
@@ -208,7 +208,7 @@
 	fields[2].num_bits = 1;
 	fields[2].out_value = malloc(1);
 	buf_set_u32(fields[2].out_value, 0, 1, 0);
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	fields[2].in_check_value = NULL;
 	fields[2].in_check_mask = NULL;
@@ -257,7 +257,7 @@
 	fields[0].tap = etb_reg->etb->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = reg->value;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -268,7 +268,7 @@
 	fields[1].num_bits = 7;
 	fields[1].out_value = malloc(1);
 	buf_set_u32(fields[1].out_value, 0, 7, reg_addr);
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;
@@ -279,7 +279,7 @@
 	fields[2].num_bits = 1;
 	fields[2].out_value = malloc(1);
 	buf_set_u32(fields[2].out_value, 0, 1, 0);
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	fields[2].in_check_value = NULL;
 	fields[2].in_check_mask = NULL;
@@ -354,7 +354,7 @@
 	fields[0].num_bits = 32;
 	fields[0].out_value = malloc(4);
 	buf_set_u32(fields[0].out_value, 0, 32, value);
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -365,7 +365,7 @@
 	fields[1].num_bits = 7;
 	fields[1].out_value = malloc(1);
 	buf_set_u32(fields[1].out_value, 0, 7, reg_addr);
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;
@@ -376,7 +376,7 @@
 	fields[2].num_bits = 1;
 	fields[2].out_value = malloc(1);
 	buf_set_u32(fields[2].out_value, 0, 1, 1);
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	fields[2].in_check_value = NULL;
 	fields[2].in_check_mask = NULL;

Modified: trunk/src/target/etm.c
===================================================================
--- trunk/src/target/etm.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/target/etm.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -339,7 +339,7 @@
 	fields[0].tap = etm_reg->jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = reg->value;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -350,7 +350,7 @@
 	fields[1].num_bits = 7;
 	fields[1].out_value = malloc(1);
 	buf_set_u32(fields[1].out_value, 0, 7, reg_addr);
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;
@@ -361,7 +361,7 @@
 	fields[2].num_bits = 1;
 	fields[2].out_value = malloc(1);
 	buf_set_u32(fields[2].out_value, 0, 1, 0);
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	fields[2].in_check_value = NULL;
 	fields[2].in_check_mask = NULL;
@@ -431,7 +431,7 @@
 	fields[0].num_bits = 32;
 	fields[0].out_value = malloc(4);
 	buf_set_u32(fields[0].out_value, 0, 32, value);
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -442,7 +442,7 @@
 	fields[1].num_bits = 7;
 	fields[1].out_value = malloc(1);
 	buf_set_u32(fields[1].out_value, 0, 7, reg_addr);
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;
@@ -453,7 +453,7 @@
 	fields[2].num_bits = 1;
 	fields[2].out_value = malloc(1);
 	buf_set_u32(fields[2].out_value, 0, 1, 1);
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	fields[2].in_check_value = NULL;
 	fields[2].in_check_mask = NULL;

Modified: trunk/src/target/feroceon.c
===================================================================
--- trunk/src/target/feroceon.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/target/feroceon.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -135,7 +135,7 @@
 	fields[0].tap = jtag_info->tap;
 	fields[0].num_bits = 32;
 	fields[0].out_value = out_buf;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_handler = NULL;
 	fields[0].in_handler_priv = NULL;
@@ -145,7 +145,7 @@
 	fields[1].tap = jtag_info->tap;
 	fields[1].num_bits = 3;
 	fields[1].out_value = &sysspeed_buf;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;
@@ -155,7 +155,7 @@
 	fields[2].tap = jtag_info->tap;
 	fields[2].num_bits = 32;
 	fields[2].out_value = instr_buf;
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	fields[2].in_check_value = NULL;
 	fields[2].in_check_mask = NULL;

Modified: trunk/src/target/mips_ejtag.c
===================================================================
--- trunk/src/target/mips_ejtag.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/target/mips_ejtag.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -49,7 +49,7 @@
 		field.num_bits = tap->ir_length;
 		field.out_value = t;
 		buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
-		field.out_mask = NULL;
+		
 		field.in_value = NULL;
 		field.in_check_value = NULL;
 		field.in_check_mask = NULL;
@@ -72,7 +72,7 @@
 	field.tap = ejtag_info->tap;
 	field.num_bits = 32;
 	field.out_value = NULL;
-	field.out_mask = NULL;
+	
 	field.in_value = (void*)idcode;
 	field.in_check_value = NULL;
 	field.in_check_mask = NULL;
@@ -99,7 +99,7 @@
 	field.tap = ejtag_info->tap;
 	field.num_bits = 32;
 	field.out_value = NULL;
-	field.out_mask = NULL;
+	
 	field.in_value = (void*)impcode;
 	field.in_check_value = NULL;
 	field.in_check_mask = NULL;
@@ -130,7 +130,7 @@
 	field.num_bits = 32;
 	field.out_value = t;
 	buf_set_u32(field.out_value, 0, field.num_bits, *data);
-	field.out_mask = NULL;
+	
 	field.in_value = (u8*)data;
 	field.in_check_value = NULL;
 	field.in_check_mask = NULL;

Modified: trunk/src/target/xscale.c
===================================================================
--- trunk/src/target/xscale.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/target/xscale.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -225,7 +225,7 @@
 		field.num_bits = tap->ir_length;
 		field.out_value = calloc(CEIL(field.num_bits, 8), 1);
 		buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
-		field.out_mask = NULL;
+		
 		field.in_value = NULL;
 		jtag_set_check_value(&field, tap->expected, tap->expected_mask, NULL);
 
@@ -261,14 +261,14 @@
 	fields[0].tap = xscale->jtag_info.tap;
 	fields[0].num_bits = 3;
 	fields[0].out_value = &field0;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	jtag_set_check_value(fields+0, &field0_check_value, &field0_check_mask, NULL);
 
 	fields[1].tap = xscale->jtag_info.tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = NULL;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = xscale->reg_cache->reg_list[XSCALE_DCSR].value;
 	fields[1].in_handler = NULL;
 	fields[1].in_handler_priv = NULL;
@@ -278,7 +278,7 @@
 	fields[2].tap = xscale->jtag_info.tap;
 	fields[2].num_bits = 1;
 	fields[2].out_value = &field2;
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	jtag_set_check_value(fields+2, &field2_check_value, &field2_check_mask, NULL);
 
@@ -339,14 +339,14 @@
 	fields[0].tap = xscale->jtag_info.tap;
 	fields[0].num_bits = 3;
 	fields[0].out_value = NULL;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	jtag_set_check_value(fields+0, &field0_check_value, &field0_check_mask, NULL);
 
 	fields[1].tap = xscale->jtag_info.tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = NULL;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_handler = NULL;
 	fields[1].in_handler_priv = NULL;
@@ -356,7 +356,7 @@
 	fields[2].tap = xscale->jtag_info.tap;
 	fields[2].num_bits = 1;
 	fields[2].out_value = NULL;
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	jtag_set_check_value(fields+2, &field2_check_value, &field2_check_mask, NULL);
 
@@ -458,14 +458,14 @@
 	fields[0].tap = xscale->jtag_info.tap;
 	fields[0].num_bits = 3;
 	fields[0].out_value = NULL;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = &field0_in;
 	jtag_set_check_value(fields+0, &field0_check_value, &field0_check_mask, NULL);
 
 	fields[1].tap = xscale->jtag_info.tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = NULL;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = xscale->reg_cache->reg_list[XSCALE_TX].value;
 	fields[1].in_handler = NULL;
 	fields[1].in_handler_priv = NULL;
@@ -475,7 +475,7 @@
 	fields[2].tap = xscale->jtag_info.tap;
 	fields[2].num_bits = 1;
 	fields[2].out_value = NULL;
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	jtag_set_check_value(fields+2, &field2_check_value, &field2_check_mask, NULL);
 
@@ -554,14 +554,14 @@
 	fields[0].tap = xscale->jtag_info.tap;
 	fields[0].num_bits = 3;
 	fields[0].out_value = &field0_out;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = &field0_in;
 	jtag_set_check_value(fields+0, &field0_check_value, &field0_check_mask, NULL);
 
 	fields[1].tap = xscale->jtag_info.tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = xscale->reg_cache->reg_list[XSCALE_RX].value;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_handler = NULL;
 	fields[1].in_handler_priv = NULL;
@@ -571,7 +571,7 @@
 	fields[2].tap = xscale->jtag_info.tap;
 	fields[2].num_bits = 1;
 	fields[2].out_value = &field2;
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	jtag_set_check_value(fields+2, &field2_check_value, &field2_check_mask, NULL);
 
@@ -729,14 +729,14 @@
 	fields[0].tap = xscale->jtag_info.tap;
 	fields[0].num_bits = 3;
 	fields[0].out_value = &field0;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	jtag_set_check_value(fields+0, &field0_check_value, &field0_check_mask, NULL);
 
 	fields[1].tap = xscale->jtag_info.tap;
 	fields[1].num_bits = 32;
 	fields[1].out_value = xscale->reg_cache->reg_list[XSCALE_DCSR].value;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_handler = NULL;
 	fields[1].in_handler_priv = NULL;
@@ -746,7 +746,7 @@
 	fields[2].tap = xscale->jtag_info.tap;
 	fields[2].num_bits = 1;
 	fields[2].out_value = &field2;
-	fields[2].out_mask = NULL;
+	
 	fields[2].in_value = NULL;
 	jtag_set_check_value(fields+2, &field2_check_value, &field2_check_mask, NULL);
 
@@ -805,7 +805,7 @@
 	fields[0].tap = xscale->jtag_info.tap;
 	fields[0].num_bits = 6;
 	fields[0].out_value = &cmd;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -815,7 +815,7 @@
 	fields[1].tap = xscale->jtag_info.tap;
 	fields[1].num_bits = 27;
 	fields[1].out_value = packet;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;
@@ -863,7 +863,7 @@
 	fields[0].tap = xscale->jtag_info.tap;
 	fields[0].num_bits = 6;
 	fields[0].out_value = &cmd;
-	fields[0].out_mask = NULL;
+	
 	fields[0].in_value = NULL;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -873,7 +873,7 @@
 	fields[1].tap = xscale->jtag_info.tap;
 	fields[1].num_bits = 27;
 	fields[1].out_value = packet;
-	fields[1].out_mask = NULL;
+	
 	fields[1].in_value = NULL;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;

Modified: trunk/src/xsvf/xsvf.c
===================================================================
--- trunk/src/xsvf/xsvf.c	2009-05-05 19:30:13 UTC (rev 1607)
+++ trunk/src/xsvf/xsvf.c	2009-05-06 06:20:52 UTC (rev 1608)
@@ -486,7 +486,7 @@
 					field.tap = tap;
 					field.num_bits = xsdrsize;
 					field.out_value = dr_out_buf;
-					field.out_mask = NULL;
+					
 					field.in_value = NULL;
 
 					jtag_set_check_value(&field, dr_in_buf, dr_in_mask, NULL);
@@ -705,7 +705,7 @@
 					field.tap = tap;
 					field.num_bits = bitcount;
 					field.out_value = ir_buf;
-					field.out_mask = NULL;
+					
 					field.in_value = NULL;
 					field.in_check_value = NULL;
 					field.in_check_mask = NULL;
@@ -937,7 +937,7 @@
 					field.tap = tap;
 					field.num_bits = xsdrsize;
 					field.out_value = dr_out_buf;
-					field.out_mask = NULL;
+					
 					field.in_value = NULL;
 
 					if (attempt > 0 && verbose)

[Openocd-svn] r1607 - in trunk/src: pld target

[<oh...@ma...>]

Author: oharboe
Date: 2009-05-05 21:30:13 +0200 (Tue, 05 May 2009)
New Revision: 1607

Modified:
   trunk/src/pld/virtex2.c
   trunk/src/target/arm11_dbgtap.c
   trunk/src/target/arm720t.c
   trunk/src/target/arm7tdmi.c
   trunk/src/target/arm920t.c
   trunk/src/target/arm926ejs.c
   trunk/src/target/arm966e.c
   trunk/src/target/arm9tdmi.c
   trunk/src/target/arm_adi_v5.c
   trunk/src/target/embeddedice.c
   trunk/src/target/etb.c
   trunk/src/target/xscale.c
Log:
mark usage of in_handler that can be converted into user code

Modified: trunk/src/pld/virtex2.c
===================================================================
--- trunk/src/pld/virtex2.c	2009-05-05 12:07:02 UTC (rev 1606)
+++ trunk/src/pld/virtex2.c	2009-05-05 19:30:13 UTC (rev 1607)
@@ -121,7 +121,7 @@
 	scan_field.in_value = NULL;
 	scan_field.in_check_value = NULL;
 	scan_field.in_check_mask = NULL;
-	scan_field.in_handler = virtex2_jtag_buf_to_u32;
+	scan_field.in_handler = virtex2_jtag_buf_to_u32; /* deprecated! invoke this from user code! */
 
 	virtex2_set_instr(virtex2_info->tap, 0x4); /* CFG_OUT */
 

Modified: trunk/src/target/arm11_dbgtap.c
===================================================================
--- trunk/src/target/arm11_dbgtap.c	2009-05-05 12:07:02 UTC (rev 1606)
+++ trunk/src/target/arm11_dbgtap.c	2009-05-05 19:30:13 UTC (rev 1607)
@@ -180,7 +180,7 @@
 
 	arm11_setup_field(arm11, 5, &chain, NULL, &field);
 
-	field.in_handler = arm11_in_handler_SCAN_N;
+	field.in_handler = arm11_in_handler_SCAN_N; /* deprecated! invoke this from user code! */
 
 	arm11_add_dr_scan_vc(1, &field, state == ARM11_TAP_DEFAULT ? TAP_DRPAUSE : state);
 }

Modified: trunk/src/target/arm720t.c
===================================================================
--- trunk/src/target/arm720t.c	2009-05-05 12:07:02 UTC (rev 1606)
+++ trunk/src/target/arm720t.c	2009-05-05 19:30:13 UTC (rev 1607)
@@ -126,7 +126,7 @@
 	fields[1].in_value = NULL;
 	if (in)
 	{
-		fields[1].in_handler = arm_jtag_buf_to_u32_flip;
+		fields[1].in_handler = arm_jtag_buf_to_u32_flip; /* deprecated! invoke this from user code! */
 		fields[1].in_handler_priv = in;
 	} else
 	{

Modified: trunk/src/target/arm7tdmi.c
===================================================================
--- trunk/src/target/arm7tdmi.c	2009-05-05 12:07:02 UTC (rev 1606)
+++ trunk/src/target/arm7tdmi.c	2009-05-05 19:30:13 UTC (rev 1607)
@@ -210,7 +210,7 @@
 	fields[1].out_value = NULL;
 	fields[1].out_mask = NULL;
 	fields[1].in_value = NULL;
-	fields[1].in_handler = arm_jtag_buf_to_u32_flip;
+	fields[1].in_handler = arm_jtag_buf_to_u32_flip; /* deprecated! invoke this from user code! */
 	fields[1].in_handler_priv = in;
 	fields[1].in_check_value = NULL;
 	fields[1].in_check_mask = NULL;
@@ -274,13 +274,13 @@
 	switch (size)
 	{
 		case 4:
-			fields[1].in_handler = (be) ? arm_jtag_buf_to_be32_flip : arm_jtag_buf_to_le32_flip;
+			fields[1].in_handler = (be) ? arm_jtag_buf_to_be32_flip : arm_jtag_buf_to_le32_flip; /* deprecated! invoke this from user code! */
 			break;
 		case 2:
-			fields[1].in_handler = (be) ? arm_jtag_buf_to_be16_flip : arm_jtag_buf_to_le16_flip;
+			fields[1].in_handler = (be) ? arm_jtag_buf_to_be16_flip : arm_jtag_buf_to_le16_flip; /* deprecated! invoke this from user code! */
 			break;
 		case 1:
-			fields[1].in_handler = arm_jtag_buf_to_8_flip;
+			fields[1].in_handler = arm_jtag_buf_to_8_flip; /* deprecated! invoke this from user code! */
 			break;
 	}
 	fields[1].in_handler_priv = in;

Modified: trunk/src/target/arm920t.c
===================================================================
--- trunk/src/target/arm920t.c	2009-05-05 12:07:02 UTC (rev 1606)
+++ trunk/src/target/arm920t.c	2009-05-05 19:30:13 UTC (rev 1607)
@@ -153,7 +153,7 @@
 	jtag_add_dr_scan(4, fields, TAP_INVALID);
 
 	fields[1].in_handler_priv = value;
-	fields[1].in_handler = arm_jtag_buf_to_u32;
+	fields[1].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */
 
 	jtag_add_dr_scan(4, fields, TAP_INVALID);
 

Modified: trunk/src/target/arm926ejs.c
===================================================================
--- trunk/src/target/arm926ejs.c	2009-05-05 12:07:02 UTC (rev 1606)
+++ trunk/src/target/arm926ejs.c	2009-05-05 19:30:13 UTC (rev 1607)
@@ -177,7 +177,7 @@
 	jtag_add_dr_scan(4, fields, TAP_INVALID);
 
 	fields[0].in_handler_priv = value;
-	fields[0].in_handler = arm_jtag_buf_to_u32;
+	fields[0].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */
 
 	/*TODO: add timeout*/
 	do

Modified: trunk/src/target/arm966e.c
===================================================================
--- trunk/src/target/arm966e.c	2009-05-05 12:07:02 UTC (rev 1606)
+++ trunk/src/target/arm966e.c	2009-05-05 19:30:13 UTC (rev 1607)
@@ -217,7 +217,7 @@
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 
 	fields[0].in_handler_priv = value;
-	fields[0].in_handler = arm_jtag_buf_to_u32;
+	fields[0].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */
 
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 

Modified: trunk/src/target/arm9tdmi.c
===================================================================
--- trunk/src/target/arm9tdmi.c	2009-05-05 12:07:02 UTC (rev 1606)
+++ trunk/src/target/arm9tdmi.c	2009-05-05 19:30:13 UTC (rev 1607)
@@ -220,7 +220,7 @@
 	fields[0].in_value = NULL;
 	if (in)
 	{
-		fields[0].in_handler = arm_jtag_buf_to_u32;
+		fields[0].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */
 		fields[0].in_handler_priv = in;
 	}
 	else
@@ -293,7 +293,7 @@
 	fields[0].out_value = NULL;
 	fields[0].out_mask = NULL;
 	fields[0].in_value = NULL;
-	fields[0].in_handler = arm_jtag_buf_to_u32;
+	fields[0].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */
 	fields[0].in_handler_priv = in;
 	fields[0].in_check_value = NULL;
 	fields[0].in_check_mask = NULL;
@@ -368,13 +368,13 @@
 	switch (size)
 	{
 		case 4:
-			fields[0].in_handler = (be) ? arm_jtag_buf_to_be32 : arm_jtag_buf_to_le32;
+			fields[0].in_handler = (be) ? arm_jtag_buf_to_be32 : arm_jtag_buf_to_le32; /* deprecated! invoke this from user code! */
 			break;
 		case 2:
-			fields[0].in_handler = (be) ? arm_jtag_buf_to_be16 : arm_jtag_buf_to_le16;
+			fields[0].in_handler = (be) ? arm_jtag_buf_to_be16 : arm_jtag_buf_to_le16; /* deprecated! invoke this from user code! */
 			break;
 		case 1:
-			fields[0].in_handler = arm_jtag_buf_to_8;
+			fields[0].in_handler = arm_jtag_buf_to_8; /* deprecated! invoke this from user code! */
 			break;
 	}
 	fields[0].in_handler_priv = in;

Modified: trunk/src/target/arm_adi_v5.c
===================================================================
--- trunk/src/target/arm_adi_v5.c	2009-05-05 12:07:02 UTC (rev 1606)
+++ trunk/src/target/arm_adi_v5.c	2009-05-05 19:30:13 UTC (rev 1607)
@@ -127,7 +127,7 @@
 	fields[1].in_value = NULL;
 	if (invalue)
 	{
-		fields[1].in_handler = arm_jtag_buf_to_u32;
+		fields[1].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */
 		fields[1].in_handler_priv = invalue;
 	}
 	else

Modified: trunk/src/target/embeddedice.c
===================================================================
--- trunk/src/target/embeddedice.c	2009-05-05 12:07:02 UTC (rev 1606)
+++ trunk/src/target/embeddedice.c	2009-05-05 19:30:13 UTC (rev 1607)
@@ -352,7 +352,7 @@
 		if (size == 1)
 			buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_CTRL]);
 
-		fields[0].in_handler = arm_jtag_buf_to_u32;
+		fields[0].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */
 		fields[0].in_handler_priv = data;
 		jtag_add_dr_scan(3, fields, TAP_INVALID);
 

Modified: trunk/src/target/etb.c
===================================================================
--- trunk/src/target/etb.c	2009-05-05 12:07:02 UTC (rev 1606)
+++ trunk/src/target/etb.c	2009-05-05 19:30:13 UTC (rev 1607)
@@ -217,7 +217,7 @@
 
 	jtag_add_dr_scan(3, fields, TAP_INVALID);
 
-	fields[0].in_handler = buf_to_u32_handler;
+	fields[0].in_handler = buf_to_u32_handler; /* deprecated! invoke this from user code! */
 
 	for (i = 0; i < num_frames; i++)
 	{

Modified: trunk/src/target/xscale.c
===================================================================
--- trunk/src/target/xscale.c	2009-05-05 12:07:02 UTC (rev 1606)
+++ trunk/src/target/xscale.c	2009-05-05 19:30:13 UTC (rev 1607)
@@ -373,8 +373,8 @@
 		for (i = words_done; i < num_words; i++)
 		{
 			fields[0].in_value = &field0[i];
-			fields[1].in_handler = buf_to_u32_handler;
-			fields[1].in_handler_priv = (u8*)&field1[i];
+			fields[1].in_handler = buf_to_u32_handler; /* deprecated! invoke this from user code! */
+			fields[1].in_handler_priv = (u8*)&field1[i]; 
 
 			jtag_add_pathmove(3, path);
 			jtag_add_dr_scan(3, fields, TAP_IDLE);