X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdriver.c;h=14ae163e71646d3ad6e959d6692871174cd80c3d;hp=9f53f2767d5ad11e94c9ac1d1f03a50c49985003;hb=dc575dc5bf8cb597a0e9a47794744ae6b1928087;hpb=c18947b947064e7eceed8047c42d4c8dfd8ae964

diff --git a/src/jtag/driver.c b/src/jtag/driver.c
index 9f53f2767d..14ae163e71 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;
@@ -264,7 +264,7 @@ int interface_jtag_add_dr_scan(int in_num_fields, const scan_field_t *in_fields,
 void interface_jtag_add_dr_out(jtag_tap_t *target_tap,
 		int in_num_fields,
 		const int *num_bits,
-		const u32 *value,
+		const uint32_t *value,
 		tap_state_t end_state)
 {
 	/* count devices in bypass */
@@ -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));
@@ -449,7 +449,7 @@ int interface_jtag_add_reset(int req_trst, int req_srst)
 	return ERROR_OK;
 }
 
-int interface_jtag_add_sleep(u32 us)
+int interface_jtag_add_sleep(uint32_t us)
 {
 	/* allocate memory for a new list member */
 	jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
@@ -465,25 +465,25 @@ int interface_jtag_add_sleep(u32 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;
 	}
 }
 
@@ -493,10 +493,10 @@ int interface_jtag_execute_queue(void)
 	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;
 		}
 	}
@@ -507,14 +507,14 @@ int interface_jtag_execute_queue(void)
 	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);
 }