X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fjtag.h;h=84290ca7e189c0fc7288b4fb60618b209116d4db;hb=71d76b0a74bee78bd9aade2957e92c6b420372b9;hp=e0e670660b495ba71fb9b7e646098984c6018901;hpb=8c77f7c69c7c849412af0ca2ccfbdbd143f95832;p=openocd.git

diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index e0e670660b..84290ca7e1 100644
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -277,7 +277,7 @@ typedef struct scan_field_s
 	/* internal work space */
 	int			allocated;			/* in_value has been allocated for the queue */
 	int			modified;			/* did we modify the in_value? */
-	u32			intmp;				/* temporary storage for checking synchronously */
+	u8			intmp[4];			/* temporary storage for checking synchronously */
 } scan_field_t;
 
 enum scan_type {
@@ -565,12 +565,28 @@ extern void jtag_add_ir_scan_noverify(int num_fields, scan_field_t *fields, tap_
 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);
 
+/* set in_value to point to 32 bits of memory to scan into. This function
+ * is a way to handle the case of synchronous and asynchronous
+ * JTAG queues.
+ *
+ * In the event of an asynchronous queue execution the queue buffer
+ * allocation method is used, for the synchronous case the temporary 32 bits come
+ * from the input field itself.
+ */
+
+#ifndef HAVE_JTAG_MINIDRIVER_H
+extern void jtag_alloc_in_value32(scan_field_t *field);
+#else
+static __inline__ void jtag_alloc_in_value32(scan_field_t *field)
+{
+	field->in_value=field->intmp;
+}
+#endif
+
+
+
 /* This version of jtag_add_dr_scan() uses the check_value/mask fields */
 extern void jtag_add_dr_scan_check(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);
@@ -593,7 +609,7 @@ extern void jtag_add_callback(jtag_callback1_t, u8 *in);
 
 /* This type can store an integer safely by a normal cast on 64 and
  * 32 bit systems. */
-typedef void *jtag_callback_data_t;
+typedef intptr_t jtag_callback_data_t;
 
 /* The generic callback mechanism.
  *