added jtag_add_dr_out(). Better for hw fifo, same for software fifo.

[openocd.git] / src / jtag / jtag.c

diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index 9268d3cb26428b18ed957e500ad6a40bdbd4d734..73acb6a09ecbb47a7658e77fedb5e0d7c3788ab2 100644 (file)
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -33,10 +33,6 @@
 #include "string.h"
 #include <unistd.h>
 
-#ifndef INTERFACE
-/* this allows JTAG devices to implement the entire jtag_xxx() layer in hw/sw */
-#define INTERFACE(a) a
-#endif
 
 
 /* note that this is not marked as static as it must be available from outside jtag.c for those 
@@ -411,13 +407,13 @@ int jtag_add_ir_scan(int num_fields, scan_field_t *fields, enum tap_state state)
        
        cmd_queue_cur_state = cmd_queue_end_state;
        
-       int retval=interface_jtag_add_ir_scan(num_fields, fields, state);
+       int retval=interface_jtag_add_ir_scan(num_fields, fields, cmd_queue_end_state);
        if (retval!=ERROR_OK)
                jtag_error=retval;
        return retval;
 }
 
-int INTERFACE(interface_jtag_add_ir_scan)(int num_fields, scan_field_t *fields, enum tap_state state)
+int MINIDRIVER(interface_jtag_add_ir_scan)(int num_fields, scan_field_t *fields, enum tap_state state)
 {      
        jtag_command_t **last_cmd;
        jtag_device_t *device;
@@ -513,10 +509,10 @@ int jtag_add_plain_ir_scan(int num_fields, scan_field_t *fields, enum tap_state
                
        cmd_queue_cur_state = cmd_queue_end_state;
        
-       return interface_jtag_add_plain_ir_scan(num_fields, fields, state);
+       return interface_jtag_add_plain_ir_scan(num_fields, fields, cmd_queue_end_state);
 }
 
-int INTERFACE(interface_jtag_add_plain_ir_scan)(int num_fields, scan_field_t *fields, enum tap_state state)
+int MINIDRIVER(interface_jtag_add_plain_ir_scan)(int num_fields, scan_field_t *fields, enum tap_state state)
 {
        int i;
        jtag_command_t **last_cmd;
@@ -572,10 +568,10 @@ int jtag_add_dr_scan(int num_fields, scan_field_t *fields, enum tap_state state)
                        
        cmd_queue_cur_state = cmd_queue_end_state;
 
-       return interface_jtag_add_dr_scan(num_fields, fields, state);
+       return interface_jtag_add_dr_scan(num_fields, fields, cmd_queue_end_state);
 }
 
-int INTERFACE(interface_jtag_add_dr_scan)(int num_fields, scan_field_t *fields, enum tap_state state)
+int MINIDRIVER(interface_jtag_add_dr_scan)(int num_fields, scan_field_t *fields, enum tap_state state)
 {
        int i, j;
        int bypass_devices = 0;
@@ -658,6 +654,94 @@ int INTERFACE(interface_jtag_add_dr_scan)(int num_fields, scan_field_t *fields,
        return ERROR_OK;
 }
 
+void MINIDRIVER(interface_jtag_add_dr_out)(int device_num, 
+               int num_fields,
+               int *num_bits,
+               u32 *value,
+               enum tap_state end_state)
+{
+       int i;
+       int field_count = 0;
+       int scan_size;
+       int bypass_devices = 0;
+
+       jtag_command_t **last_cmd = jtag_get_last_command_p();
+       jtag_device_t *device = jtag_devices;
+       /* count devices in bypass */
+       while (device)
+       {
+               if (device->bypass)
+                       bypass_devices++;
+               device = device->next;
+       }
+       
+       /* allocate memory for a new list member */
+       *last_cmd = cmd_queue_alloc(sizeof(jtag_command_t));
+       last_comand_pointer = &((*last_cmd)->next);
+       (*last_cmd)->next = NULL;
+       (*last_cmd)->type = JTAG_SCAN;
+
+       /* allocate memory for dr scan command */
+       (*last_cmd)->cmd.scan = cmd_queue_alloc(sizeof(scan_command_t));
+       (*last_cmd)->cmd.scan->ir_scan = 0;
+       (*last_cmd)->cmd.scan->num_fields = num_fields + bypass_devices;
+       (*last_cmd)->cmd.scan->fields = cmd_queue_alloc((num_fields + bypass_devices) * sizeof(scan_field_t));
+       (*last_cmd)->cmd.scan->end_state = end_state;
+
+       for (i = 0; i < jtag_num_devices; i++)
+       {
+               (*last_cmd)->cmd.scan->fields[field_count].device = i;
+
+               if (i == device_num)
+               {
+                       int j;
+#ifdef _DEBUG_JTAG_IO_
+                       /* if a device is listed, the BYPASS register must not be selected */
+                       if (jtag_get_device(i)->bypass)
+                       {
+                               ERROR("scan data for a device in BYPASS");
+                               exit(-1);
+                       }
+#endif
+                       for (j = 0; j < num_fields; j++)
+                       {
+                               char out_value[4];
+                               scan_size = num_bits[j];
+                               buf_set_u32(out_value, 0, scan_size, value[j]);
+                               (*last_cmd)->cmd.scan->fields[field_count].num_bits = scan_size;
+                               (*last_cmd)->cmd.scan->fields[field_count].out_value = buf_cpy(out_value, cmd_queue_alloc(CEIL(scan_size, 8)), scan_size);
+                               (*last_cmd)->cmd.scan->fields[field_count].out_mask = NULL;
+                               (*last_cmd)->cmd.scan->fields[field_count].in_value = NULL;
+                               (*last_cmd)->cmd.scan->fields[field_count].in_check_value = NULL;
+                               (*last_cmd)->cmd.scan->fields[field_count].in_check_mask = NULL;
+                               (*last_cmd)->cmd.scan->fields[field_count].in_handler = NULL;
+                               (*last_cmd)->cmd.scan->fields[field_count++].in_handler_priv = NULL;
+                       }
+               } else
+               {
+#ifdef _DEBUG_JTAG_IO_
+                       /* if a device isn't listed, the BYPASS register should be selected */
+                       if (!jtag_get_device(i)->bypass)
+                       {
+                               ERROR("BUG: no scan data for a device not in BYPASS");
+                               exit(-1);
+                       }
+#endif 
+                       /* program the scan field to 1 bit length, and ignore it's value */
+                       (*last_cmd)->cmd.scan->fields[field_count].num_bits = 1;
+                       (*last_cmd)->cmd.scan->fields[field_count].out_value = NULL;
+                       (*last_cmd)->cmd.scan->fields[field_count].out_mask = NULL;
+                       (*last_cmd)->cmd.scan->fields[field_count].in_value = NULL;
+                       (*last_cmd)->cmd.scan->fields[field_count].in_check_value = NULL;
+                       (*last_cmd)->cmd.scan->fields[field_count].in_check_mask = NULL;
+                       (*last_cmd)->cmd.scan->fields[field_count].in_handler = NULL;
+                       (*last_cmd)->cmd.scan->fields[field_count++].in_handler_priv = NULL;
+               }
+       }
+}
+
+
+
 
 int jtag_add_plain_dr_scan(int num_fields, scan_field_t *fields, enum tap_state state)
 {
@@ -678,10 +762,10 @@ int jtag_add_plain_dr_scan(int num_fields, scan_field_t *fields, enum tap_state
                        
        cmd_queue_cur_state = cmd_queue_end_state;
 
-       return interface_jtag_add_plain_dr_scan(num_fields, fields, state);
+       return interface_jtag_add_plain_dr_scan(num_fields, fields, cmd_queue_end_state);
 }
 
-int INTERFACE(interface_jtag_add_plain_dr_scan)(int num_fields, scan_field_t *fields, enum tap_state state)
+int MINIDRIVER(interface_jtag_add_plain_dr_scan)(int num_fields, scan_field_t *fields, enum tap_state state)
 {
        int i;
        jtag_command_t **last_cmd = jtag_get_last_command_p();
@@ -735,10 +819,10 @@ int jtag_add_statemove(enum tap_state state)
                        
        cmd_queue_cur_state = cmd_queue_end_state;
 
-       return interface_jtag_add_statemove(state);
+       return interface_jtag_add_statemove(cmd_queue_end_state);
 }
 
-int INTERFACE(interface_jtag_add_statemove)(enum tap_state state)
+int MINIDRIVER(interface_jtag_add_statemove)(enum tap_state state)
 {
        jtag_command_t **last_cmd = jtag_get_last_command_p();
        
@@ -782,7 +866,7 @@ int jtag_add_pathmove(int num_states, enum tap_state *path)
 }
 
 
-int INTERFACE(interface_jtag_add_pathmove)(int num_states, enum tap_state *path)
+int MINIDRIVER(interface_jtag_add_pathmove)(int num_states, enum tap_state *path)
 {
        jtag_command_t **last_cmd = jtag_get_last_command_p();
        int i;
@@ -803,7 +887,7 @@ int INTERFACE(interface_jtag_add_pathmove)(int num_states, enum tap_state *path)
        return ERROR_OK;
 }
 
-int INTERFACE(interface_jtag_add_runtest)(int num_cycles, enum tap_state state)
+int MINIDRIVER(interface_jtag_add_runtest)(int num_cycles, enum tap_state state)
 {
        jtag_command_t **last_cmd = jtag_get_last_command_p();
        
@@ -841,7 +925,7 @@ int jtag_add_runtest(int num_cycles, enum tap_state state)
        cmd_queue_cur_state = cmd_queue_end_state;
        
        /* executed by sw or hw fifo */
-       return interface_jtag_add_runtest(num_cycles, state);
+       return interface_jtag_add_runtest(num_cycles, cmd_queue_end_state);
 }
 
 int jtag_add_reset(int req_trst, int req_srst)
@@ -932,7 +1016,7 @@ int jtag_add_reset(int req_trst, int req_srst)
        
 }
 
-int INTERFACE(interface_jtag_add_reset)(int req_trst, int req_srst)
+int MINIDRIVER(interface_jtag_add_reset)(int req_trst, int req_srst)
 {
        jtag_command_t **last_cmd = jtag_get_last_command_p();
 
@@ -950,7 +1034,7 @@ int INTERFACE(interface_jtag_add_reset)(int req_trst, int req_srst)
        return ERROR_OK;
 }
 
-int INTERFACE(interface_jtag_add_end_state)(enum tap_state state)
+int MINIDRIVER(interface_jtag_add_end_state)(enum tap_state state)
 {
        jtag_command_t **last_cmd = jtag_get_last_command_p();
        
@@ -968,13 +1052,13 @@ int INTERFACE(interface_jtag_add_end_state)(enum tap_state state)
 
 int jtag_add_end_state(enum tap_state state)
 {
-       int retval = interface_jtag_add_end_state(state);
        if (state != -1)
                cmd_queue_end_state = state;
+       int retval = interface_jtag_add_end_state(cmd_queue_end_state);
        return retval;
 }
 
-int INTERFACE(interface_jtag_add_sleep)(u32 us)
+int MINIDRIVER(interface_jtag_add_sleep)(u32 us)
 {
        jtag_command_t **last_cmd = jtag_get_last_command_p();
        
@@ -1178,7 +1262,7 @@ enum scan_type jtag_scan_type(scan_command_t *cmd)
        return type;
 }
 
-int INTERFACE(interface_jtag_execute_queue)(void)
+int MINIDRIVER(interface_jtag_execute_queue)(void)
 {
        int retval;
 
@@ -1189,17 +1273,16 @@ int INTERFACE(interface_jtag_execute_queue)(void)
        jtag_command_queue = NULL;
        last_comand_pointer = &jtag_command_queue;
 
-       jtag_error=ERROR_OK;
-
        return retval;
 }
 
 int jtag_execute_queue(void)
 {
        int retval=interface_jtag_execute_queue();
-       if (retval!=ERROR_OK)
-               return retval;
+       if (retval==ERROR_OK)
+       {
        retval=jtag_error;
+       }
        jtag_error=ERROR_OK;
        return retval;
 }
@@ -1467,7 +1550,6 @@ int jtag_init(struct command_context_s *cmd_ctx)
                if (validate_tries > 5)
                {
                        ERROR("Could not validate JTAG chain, exit");
-                       jtag = NULL;
                        return ERROR_JTAG_INVALID_INTERFACE;
                }
                usleep(10000);
@@ -1894,7 +1976,7 @@ int handle_drscan_command(struct command_context_s *cmd_ctx, char *cmd, char **a
                free(fields[i].out_value);
 
        free(fields);
-
+       
        return ERROR_OK;
 }