X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fdriver.c;h=3bce5d5755a183c9f59ca5fa1d94fa1b993a9ae3;hb=d70d9634bf6ab73ec4f2ac1e77012785770b460a;hp=d14a1c2c8df119cb94e41de56732fc053f3458a5;hpb=86e4324f1bd4cd8135cb857e4b940b1f2e872dc3;p=openocd.git

diff --git a/src/jtag/driver.c b/src/jtag/driver.c
index d14a1c2c8d..3bce5d5755 100644
--- a/src/jtag/driver.c
+++ b/src/jtag/driver.c
@@ -40,7 +40,7 @@ struct jtag_callback_entry
 	struct jtag_callback_entry *next;
 
 	jtag_callback_t callback;
-	uint8_t *in;
+	jtag_callback_data_t data0;
 	jtag_callback_data_t data1;
 	jtag_callback_data_t data2;
 	jtag_callback_data_t data3;
@@ -418,7 +418,7 @@ int interface_jtag_add_runtest(int num_cycles, tap_state_t state)
 	return ERROR_OK;
 }
 
-int interface_jtag_add_clocks( int num_cycles )
+int interface_jtag_add_clocks(int num_cycles)
 {
 	/* allocate memory for a new list member */
 	jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
@@ -465,38 +465,43 @@ int interface_jtag_add_sleep(uint32_t us)
 }
 
 /* add callback to end of queue */
-void interface_jtag_add_callback4(jtag_callback_t callback, uint8_t *in, jtag_callback_data_t data1, jtag_callback_data_t data2, jtag_callback_data_t data3)
+void interface_jtag_add_callback4(jtag_callback_t callback, jtag_callback_data_t data0, jtag_callback_data_t data1, jtag_callback_data_t data2, jtag_callback_data_t data3)
 {
-	struct jtag_callback_entry *entry=cmd_queue_alloc(sizeof(struct jtag_callback_entry));
+	struct jtag_callback_entry *entry = cmd_queue_alloc(sizeof(struct jtag_callback_entry));
 
-	entry->next=NULL;
-	entry->callback=callback;
-	entry->in=in;
-	entry->data1=data1;
-	entry->data2=data2;
-	entry->data3=data3;
+	entry->next = NULL;
+	entry->callback = callback;
+	entry->data0 = data0;
+	entry->data1 = data1;
+	entry->data2 = data2;
+	entry->data3 = data3;
 
-	if (jtag_callback_queue_head==NULL)
+	if (jtag_callback_queue_head == NULL)
 	{
-		jtag_callback_queue_head=entry;
-		jtag_callback_queue_tail=entry;
+		jtag_callback_queue_head = entry;
+		jtag_callback_queue_tail = entry;
 	} else
 	{
-		jtag_callback_queue_tail->next=entry;
-		jtag_callback_queue_tail=entry;
+		jtag_callback_queue_tail->next = entry;
+		jtag_callback_queue_tail = entry;
 	}
 }
 
 int interface_jtag_execute_queue(void)
 {
+	static int reentry = 0;
+
+	assert(reentry==0);
+	reentry++;
+
 	int retval = default_interface_jtag_execute_queue();
 	if (retval == ERROR_OK)
 	{
 		struct jtag_callback_entry *entry;
-		for (entry=jtag_callback_queue_head; entry!=NULL; entry=entry->next)
+		for (entry = jtag_callback_queue_head; entry != NULL; entry = entry->next)
 		{
-			retval=entry->callback(entry->in, entry->data1, entry->data2, entry->data3);
-			if (retval!=ERROR_OK)
+			retval = entry->callback(entry->data0, entry->data1, entry->data2, entry->data3);
+			if (retval != ERROR_OK)
 				break;
 		}
 	}
@@ -504,17 +509,19 @@ int interface_jtag_execute_queue(void)
 	jtag_command_queue_reset();
 	jtag_callback_queue_reset();
 
+	reentry--;
+
 	return retval;
 }
 
-static int jtag_convert_to_callback4(uint8_t *in, jtag_callback_data_t data1, jtag_callback_data_t data2, jtag_callback_data_t data3)
+static int jtag_convert_to_callback4(jtag_callback_data_t data0, jtag_callback_data_t data1, jtag_callback_data_t data2, jtag_callback_data_t data3)
 {
-	((jtag_callback1_t)data1)(in);
+	((jtag_callback1_t)data1)(data0);
 	return ERROR_OK;
 }
 
-void interface_jtag_add_callback(jtag_callback1_t callback, uint8_t *in)
+void interface_jtag_add_callback(jtag_callback1_t callback, jtag_callback_data_t data0)
 {
-	jtag_add_callback4(jtag_convert_to_callback4, in, (jtag_callback_data_t)callback, 0, 0);
+	jtag_add_callback4(jtag_convert_to_callback4, data0, (jtag_callback_data_t)callback, 0, 0);
 }