* Copyright (C) 2005 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
- * Copyright (C) 2007,2008 Øyvind Harboe *
+ * Copyright (C) 2007,2008 Øyvind Harboe *
* oyvind.harboe@zylin.com *
* *
* This program is free software; you can redistribute it and/or modify *
int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr, in_handler_t handler)
{
jtag_device_t *device = jtag_get_device(jtag_info->chain_pos);
-
+ if (device==NULL)
+ return ERROR_FAIL;
+
if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr)
{
scan_field_t field;
u8 t[4];
-
+
field.device = jtag_info->chain_pos;
field.num_bits = device->ir_length;
field.out_value = t;
field.in_handler_priv = NULL;
jtag_add_ir_scan(1, &field, -1);
}
-
+
return ERROR_OK;
}
int arm_jtag_scann(arm_jtag_t *jtag_info, u32 new_scan_chain)
{
+ int retval = ERROR_OK;
if(jtag_info->cur_scan_chain != new_scan_chain)
{
u32 values[1];
int num_bits[1];
-
+
values[0]=new_scan_chain;
num_bits[0]=jtag_info->scann_size;
-
- arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL);
- jtag_add_dr_out(jtag_info->chain_pos,
+
+ if((retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL)) != ERROR_OK)
+ {
+ return retval;
+ }
+
+ jtag_add_dr_out(jtag_info->chain_pos,
1,
num_bits,
values,
-1);
-
+
jtag_info->cur_scan_chain = new_scan_chain;
}
-
- return ERROR_OK;
+
+ return retval;
}
int arm_jtag_reset_callback(enum jtag_event event, void *priv)
{
arm_jtag_t *jtag_info = priv;
-
+
if (event == JTAG_TRST_ASSERTED)
{
jtag_info->cur_scan_chain = 0;
}
-
+
return ERROR_OK;
}
jtag_info->cur_scan_chain = 0;
jtag_info->intest_instr = 0xc;
- jtag_register_event_callback(arm_jtag_reset_callback, jtag_info);
-
- return ERROR_OK;
+ return jtag_register_event_callback(arm_jtag_reset_callback, jtag_info);
}
/* read JTAG buffer into host-endian u32, flipping bit-order */