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

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

Author: zwelch
Date: 2009-06-02 10:04:21 +0200 (Tue, 02 Jun 2009)
New Revision: 1999

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
   trunk/src/jtag/jtag_driver.c
   trunk/src/jtag/zy1000.c
Log:
Move interface_jtag_add_scan_check_alloc implementations to their
respective implementation files.


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-02 07:51:16 UTC (rev 1998)
+++ trunk/src/jtag/jtag.c	2009-06-02 08:04:21 UTC (rev 1999)
@@ -594,27 +594,6 @@
 	return jtag_check_value_inner(in, (u8 *)data1, (u8 *)data2, (int)data3);
 }
 
-#ifdef HAVE_JTAG_MINIDRIVER_H
-void interface_jtag_add_scan_check_alloc(scan_field_t *field)
-{
-	/* We're executing this synchronously, so try to use local storage. */
-	if (field->num_bits > 32)
-	{
-		unsigned num_bytes = TAP_SCAN_BYTES(field->num_bits);
-		field->in_value = (u8 *)malloc(num_bytes);
-		field->allocated = 1;
-	}
-	else
-		field->in_value = field->intmp;
-}
-#else
-void interface_jtag_add_scan_check_alloc(scan_field_t *field)
-{
-	unsigned num_bytes = TAP_SCAN_BYTES(field->num_bits);
-	field->in_value = (u8 *)cmd_queue_alloc(num_bytes);
-}
-#endif
-
 static void jtag_add_scan_check(void (*jtag_add_scan)(int in_num_fields, const scan_field_t *in_fields, tap_state_t state),
 		int in_num_fields, scan_field_t *in_fields, tap_state_t state)
 {

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2009-06-02 07:51:16 UTC (rev 1998)
+++ trunk/src/jtag/jtag.h	2009-06-02 08:04:21 UTC (rev 1999)
@@ -843,6 +843,8 @@
 
 #ifdef INCLUDE_JTAG_MINIDRIVER_H
 
+extern void interface_jtag_add_scan_check_alloc(scan_field_t *field);
+
 extern int interface_jtag_add_ir_scan(
 		int num_fields, const scan_field_t* fields,
 		tap_state_t endstate);

Modified: trunk/src/jtag/jtag_driver.c
===================================================================
--- trunk/src/jtag/jtag_driver.c	2009-06-02 07:51:16 UTC (rev 1998)
+++ trunk/src/jtag/jtag_driver.c	2009-06-02 08:04:21 UTC (rev 1999)
@@ -499,6 +499,12 @@
 	jtag_add_callback4(jtag_convert_to_callback4, in, (jtag_callback_data_t)callback, 0, 0);
 }
 
+void interface_jtag_add_scan_check_alloc(scan_field_t *field)
+{
+	unsigned num_bytes = TAP_SCAN_BYTES(field->num_bits);
+	field->in_value = (u8 *)cmd_queue_alloc(num_bytes);
+}
+
 int interface_jtag_execute_queue(void)
 {
 	int retval = default_interface_jtag_execute_queue();

Modified: trunk/src/jtag/zy1000.c
===================================================================
--- trunk/src/jtag/zy1000.c	2009-06-02 07:51:16 UTC (rev 1998)
+++ trunk/src/jtag/zy1000.c	2009-06-02 08:04:21 UTC (rev 1999)
@@ -380,6 +380,18 @@
 }
 
 
+void interface_jtag_add_scan_check_alloc(scan_field_t *field)
+{
+	/* We're executing this synchronously, so try to use local storage. */
+	if (field->num_bits > 32)
+	{
+		unsigned num_bytes = TAP_SCAN_BYTES(field->num_bits);
+		field->in_value = (u8 *)malloc(num_bytes);
+		field->allocated = 1;
+	}
+	else
+		field->in_value = field->intmp;
+}
 
 
 int interface_jtag_execute_queue(void)