projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM11: partial support for standard ARM register interfaces.
[fw/openocd]
/
src
/
target
/
mips_ejtag.c
diff --git
a/src/target/mips_ejtag.c
b/src/target/mips_ejtag.c
index 7a64bd4d5ddaad08143056be5deafdcef96a9c75..6f06d9a3afc79b2b0964e797459307ac3035d158 100644
(file)
--- a/
src/target/mips_ejtag.c
+++ b/
src/target/mips_ejtag.c
@@
-27,38
+27,34
@@
#include "mips_ejtag.h"
#include "mips_ejtag.h"
-int mips_ejtag_set_instr(
mips_ejtag_t
*ejtag_info, int new_instr, void *delete_me_and_submit_patch)
+int mips_ejtag_set_instr(
struct mips_ejtag
*ejtag_info, int new_instr, void *delete_me_and_submit_patch)
{
{
-
jtag_tap_t
*tap;
+
struct jtag_tap
*tap;
tap = ejtag_info->tap;
tap = ejtag_info->tap;
- if (tap
==
NULL)
+ if (tap
==
NULL)
return ERROR_FAIL;
if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != (uint32_t)new_instr)
{
return ERROR_FAIL;
if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != (uint32_t)new_instr)
{
- s
can_field_t
field;
+ s
truct scan_field
field;
uint8_t t[4];
field.tap = tap;
field.num_bits = tap->ir_length;
field.out_value = t;
buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
uint8_t t[4];
field.tap = tap;
field.num_bits = tap->ir_length;
field.out_value = t;
buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
-
field.in_value = NULL;
field.in_value = NULL;
-
-
-
-
+
jtag_add_ir_scan(1, &field, jtag_get_end_state());
}
return ERROR_OK;
}
jtag_add_ir_scan(1, &field, jtag_get_end_state());
}
return ERROR_OK;
}
-int mips_ejtag_get_idcode(
mips_ejtag_t
*ejtag_info, uint32_t *idcode)
+int mips_ejtag_get_idcode(
struct mips_ejtag
*ejtag_info, uint32_t *idcode)
{
{
- s
can_field_t
field;
+ s
truct scan_field
field;
jtag_set_end_state(TAP_IDLE);
jtag_set_end_state(TAP_IDLE);
@@
-67,12
+63,8
@@
int mips_ejtag_get_idcode(mips_ejtag_t *ejtag_info, uint32_t *idcode)
field.tap = ejtag_info->tap;
field.num_bits = 32;
field.out_value = NULL;
field.tap = ejtag_info->tap;
field.num_bits = 32;
field.out_value = NULL;
-
field.in_value = (void*)idcode;
field.in_value = (void*)idcode;
-
-
-
-
+
jtag_add_dr_scan(1, &field, jtag_get_end_state());
if (jtag_execute_queue() != ERROR_OK)
jtag_add_dr_scan(1, &field, jtag_get_end_state());
if (jtag_execute_queue() != ERROR_OK)
@@
-83,9
+75,9
@@
int mips_ejtag_get_idcode(mips_ejtag_t *ejtag_info, uint32_t *idcode)
return ERROR_OK;
}
return ERROR_OK;
}
-int mips_ejtag_get_impcode(
mips_ejtag_t
*ejtag_info, uint32_t *impcode)
+int mips_ejtag_get_impcode(
struct mips_ejtag
*ejtag_info, uint32_t *impcode)
{
{
- s
can_field_t
field;
+ s
truct scan_field
field;
jtag_set_end_state(TAP_IDLE);
jtag_set_end_state(TAP_IDLE);
@@
-94,12
+86,8
@@
int mips_ejtag_get_impcode(mips_ejtag_t *ejtag_info, uint32_t *impcode)
field.tap = ejtag_info->tap;
field.num_bits = 32;
field.out_value = NULL;
field.tap = ejtag_info->tap;
field.num_bits = 32;
field.out_value = NULL;
-
field.in_value = (void*)impcode;
field.in_value = (void*)impcode;
-
-
-
-
+
jtag_add_dr_scan(1, &field, jtag_get_end_state());
if (jtag_execute_queue() != ERROR_OK)
jtag_add_dr_scan(1, &field, jtag_get_end_state());
if (jtag_execute_queue() != ERROR_OK)
@@
-110,14
+98,14
@@
int mips_ejtag_get_impcode(mips_ejtag_t *ejtag_info, uint32_t *impcode)
return ERROR_OK;
}
return ERROR_OK;
}
-int mips_ejtag_drscan_32(
mips_ejtag_t
*ejtag_info, uint32_t *data)
+int mips_ejtag_drscan_32(
struct mips_ejtag
*ejtag_info, uint32_t *data)
{
{
-
jtag_tap_t
*tap;
+
struct jtag_tap
*tap;
tap = ejtag_info->tap;
tap = ejtag_info->tap;
- if (tap
==
NULL)
+ if (tap
==
NULL)
return ERROR_FAIL;
return ERROR_FAIL;
- s
can_field_t
field;
+ s
truct scan_field
field;
uint8_t t[4], r[4];
int retval;
uint8_t t[4], r[4];
int retval;
@@
-125,12
+113,8
@@
int mips_ejtag_drscan_32(mips_ejtag_t *ejtag_info, uint32_t *data)
field.num_bits = 32;
field.out_value = t;
buf_set_u32(field.out_value, 0, field.num_bits, *data);
field.num_bits = 32;
field.out_value = t;
buf_set_u32(field.out_value, 0, field.num_bits, *data);
-
field.in_value = r;
field.in_value = r;
-
-
-
-
+
jtag_add_dr_scan(1, &field, jtag_get_end_state());
if ((retval = jtag_execute_queue()) != ERROR_OK)
jtag_add_dr_scan(1, &field, jtag_get_end_state());
if ((retval = jtag_execute_queue()) != ERROR_OK)
@@
-146,7
+130,7
@@
int mips_ejtag_drscan_32(mips_ejtag_t *ejtag_info, uint32_t *data)
return ERROR_OK;
}
return ERROR_OK;
}
-int mips_ejtag_step_enable(
mips_ejtag_t
*ejtag_info)
+int mips_ejtag_step_enable(
struct mips_ejtag
*ejtag_info)
{
uint32_t code[] = {
MIPS32_MTC0(1,31,0), /* move $1 to COP0 DeSave */
{
uint32_t code[] = {
MIPS32_MTC0(1,31,0), /* move $1 to COP0 DeSave */
@@
-164,7
+148,7
@@
int mips_ejtag_step_enable(mips_ejtag_t *ejtag_info)
return ERROR_OK;
}
return ERROR_OK;
}
-int mips_ejtag_step_disable(
mips_ejtag_t
*ejtag_info)
+int mips_ejtag_step_disable(
struct mips_ejtag
*ejtag_info)
{
uint32_t code[] = {
MIPS32_MTC0(15,31,0), /* move $15 to COP0 DeSave */
{
uint32_t code[] = {
MIPS32_MTC0(15,31,0), /* move $15 to COP0 DeSave */
@@
-191,14
+175,14
@@
int mips_ejtag_step_disable(mips_ejtag_t *ejtag_info)
return ERROR_OK;
}
return ERROR_OK;
}
-int mips_ejtag_config_step(
mips_ejtag_t
*ejtag_info, int enable_step)
+int mips_ejtag_config_step(
struct mips_ejtag
*ejtag_info, int enable_step)
{
if (enable_step)
return mips_ejtag_step_enable(ejtag_info);
return mips_ejtag_step_disable(ejtag_info);
}
{
if (enable_step)
return mips_ejtag_step_enable(ejtag_info);
return mips_ejtag_step_disable(ejtag_info);
}
-int mips_ejtag_enter_debug(
mips_ejtag_t
*ejtag_info)
+int mips_ejtag_enter_debug(
struct mips_ejtag
*ejtag_info)
{
uint32_t ejtag_ctrl;
jtag_set_end_state(TAP_IDLE);
{
uint32_t ejtag_ctrl;
jtag_set_end_state(TAP_IDLE);
@@
-218,18
+202,18
@@
int mips_ejtag_enter_debug(mips_ejtag_t *ejtag_info)
return ERROR_OK;
}
return ERROR_OK;
}
-int mips_ejtag_exit_debug(
mips_ejtag_t
*ejtag_info)
+int mips_ejtag_exit_debug(
struct mips_ejtag
*ejtag_info)
{
uint32_t inst;
inst = MIPS32_DRET;
{
uint32_t inst;
inst = MIPS32_DRET;
-
+
/* execute our dret instruction */
mips32_pracc_exec(ejtag_info, 1, &inst, 0, NULL, 0, NULL, 0);
return ERROR_OK;
}
/* execute our dret instruction */
mips32_pracc_exec(ejtag_info, 1, &inst, 0, NULL, 0, NULL, 0);
return ERROR_OK;
}
-int mips_ejtag_read_debug(
mips_ejtag_t
*ejtag_info, uint32_t* debug_reg)
+int mips_ejtag_read_debug(
struct mips_ejtag
*ejtag_info, uint32_t* debug_reg)
{
/* read ejtag ECR */
uint32_t code[] = {
{
/* read ejtag ECR */
uint32_t code[] = {
@@
-256,7
+240,7
@@
int mips_ejtag_read_debug(mips_ejtag_t *ejtag_info, uint32_t* debug_reg)
return ERROR_OK;
}
return ERROR_OK;
}
-int mips_ejtag_init(
mips_ejtag_t
*ejtag_info)
+int mips_ejtag_init(
struct mips_ejtag
*ejtag_info)
{
uint32_t ejtag_version;
{
uint32_t ejtag_version;
@@
-292,7
+276,7
@@
int mips_ejtag_init(mips_ejtag_t *ejtag_info)
ejtag_info->impcode & (1 << 16) ? " MIPS16": "",
ejtag_info->impcode & (1 << 14) ? " noDMA": " DMA",
ejtag_info->impcode & (1 << 0) ? " MIPS64": " MIPS32"
ejtag_info->impcode & (1 << 16) ? " MIPS16": "",
ejtag_info->impcode & (1 << 14) ? " noDMA": " DMA",
ejtag_info->impcode & (1 << 0) ? " MIPS64": " MIPS32"
-
);
+);
if ((ejtag_info->impcode & (1 << 14)) == 0)
LOG_DEBUG("EJTAG: DMA Access Mode Support Enabled");
if ((ejtag_info->impcode & (1 << 14)) == 0)
LOG_DEBUG("EJTAG: DMA Access Mode Support Enabled");