#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
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;
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;
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;
}
if (!found)
{
+#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;
}
else
{
+#ifdef _DEBUG_JTAG_IO_
/* if a device is listed, the BYPASS register must not be selected */
if (jtag_get_device(i)->bypass)
{
WARNING("scan data for a device in BYPASS");
}
+#endif
}
}
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)
{
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();
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();
if (cmd_queue_end_state == TAP_TLR)
jtag_call_event_callbacks(JTAG_TRST_ASSERTED);
+
+ enum tap_state cur_state=cmd_queue_cur_state;
+ int i;
+ for (i=0; i<num_states; i++)
+ {
+ if ((tap_transitions[cur_state].low != path[i])&&
+ (tap_transitions[cur_state].high != path[i]))
+ {
+ ERROR("BUG: %s -> %s isn't a valid TAP transition", tap_state_strings[cur_state], tap_state_strings[path[i]]);
+ exit(-1);
+ }
+ cur_state = path[i];
+ }
+
cmd_queue_cur_state = path[num_states - 1];
return interface_jtag_add_pathmove(num_states, 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;
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();
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)
jtag_trst = req_trst;
jtag_srst = req_srst;
+ retval = interface_jtag_add_reset(req_trst, req_srst);
+ if (retval!=ERROR_OK)
+ {
+ jtag_error=retval;
+ return retval;
+ }
+
if (jtag_srst)
{
jtag_call_event_callbacks(JTAG_SRST_ASSERTED);
if (trst_with_tms)
{
jtag_call_event_callbacks(JTAG_TRST_ASSERTED);
- cmd_queue_cur_state = TAP_TLR;
- cmd_queue_end_state = TAP_TLR;
+ jtag_add_end_state(TAP_TLR);
+ jtag_add_statemove(TAP_TLR);
return ERROR_OK;
}
- else
+
+ if (jtag_trst)
{
- if (jtag_trst)
- {
- /* we just asserted nTRST, so we're now in Test-Logic-Reset,
- * and inform possible listeners about this
- */
- cmd_queue_cur_state = TAP_TLR;
- jtag_call_event_callbacks(JTAG_TRST_ASSERTED);
- }
- else
- {
- /* the nTRST line got deasserted, so we're still in Test-Logic-Reset,
- * but we might want to add a delay to give the TAP time to settle
- */
- if (jtag_ntrst_delay)
- jtag_add_sleep(jtag_ntrst_delay * 1000);
- }
+ /* we just asserted nTRST, so we're now in Test-Logic-Reset,
+ * and inform possible listeners about this
+ */
+ cmd_queue_cur_state = TAP_TLR;
+ jtag_call_event_callbacks(JTAG_TRST_ASSERTED);
}
- retval = interface_jtag_add_reset(req_trst, req_srst);
- if (retval!=ERROR_OK)
- jtag_error=retval;
-
- if (trst_with_tms)
+ else
{
- jtag_add_statemove(TAP_TLR);
+ /* the nTRST line got deasserted, so we're still in Test-Logic-Reset,
+ * but we might want to add a delay to give the TAP time to settle
+ */
+ if (jtag_ntrst_delay)
+ jtag_add_sleep(jtag_ntrst_delay * 1000);
}
return retval;
}
-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();
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();
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();
return type;
}
-int INTERFACE(interface_jtag_execute_queue)(void)
+int MINIDRIVER(interface_jtag_execute_queue)(void)
{
int retval;
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;
}
if (validate_tries > 5)
{
ERROR("Could not validate JTAG chain, exit");
- jtag = NULL;
return ERROR_JTAG_INVALID_INTERFACE;
}
usleep(10000);
free(fields[i].out_value);
free(fields);
-
+
return ERROR_OK;
}