Matt Hsu <matt@0xlab.org> and Holger Hans Peter Freyther <zecke@selfish.org> cortex...

[openocd] / src / jtag / driver.c

diff --git a/src/jtag/driver.c b/src/jtag/driver.c
index d14a1c2c8df119cb94e41de56732fc053f3458a5..14ae163e71646d3ad6e959d6692871174cd80c3d 100644 (file)
--- 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,25 +465,25 @@ 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;
        }
 }
 
@@ -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);
 }