diff options
| -rw-r--r-- | src/jtag/jtag.h | 10 | ||||
| -rw-r--r-- | src/target/mips_ejtag.c | 12 | ||||
| -rw-r--r-- | src/target/mips_ejtag.h | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index 0699516c..9bc3fe82 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -273,9 +273,9 @@ typedef struct scan_field_s u8* out_value; /* value to be scanned into the device */ u8* in_value; /* pointer to a 32-bit memory location to take data scanned out */ /* in_check_value/mask, in_handler_error_handler, in_handler_priv can be used by the in handler, otherwise they contain garbage */ - u8* in_check_value; /* used to validate scan results */ - u8* in_check_mask; /* check specified bits against check_value */ - in_handler_t in_handler; /* process received buffer using this handler */ + u8* in_check_value; /* deprecated! only used from jtag_set_check_value. used to validate scan results */ + u8* in_check_mask; /* deprecated! only used from jtag_set_check_value. check specified bits against check_value */ + in_handler_t in_handler; /* deprecated! DO NOT USE! process received buffer using this handler */ void* in_handler_priv; /* additional information for the in_handler */ } scan_field_t; @@ -580,10 +580,10 @@ extern int interface_jtag_add_tlr(void); * of the same interface over time. Even if the OpenOCD code * is unchanged, the actual path taken may vary over time * and versions of interface firmware or PCB revisions. - * + * * Use jtag_add_pathmove() when specific transition sequences * are required. - * + * * Do not use jtag_add_pathmove() unless you need to, but do use it * if you have to. * diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c index d1931c6f..5cd82abf 100644 --- a/src/target/mips_ejtag.c +++ b/src/target/mips_ejtag.c @@ -32,7 +32,7 @@ #include <stdlib.h> -int mips_ejtag_set_instr(mips_ejtag_t *ejtag_info, int new_instr, in_handler_t handler) +int mips_ejtag_set_instr(mips_ejtag_t *ejtag_info, int new_instr, void *delete_me_and_submit_patch) { jtag_tap_t *tap; @@ -49,11 +49,11 @@ int mips_ejtag_set_instr(mips_ejtag_t *ejtag_info, int new_instr, in_handler_t h 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_check_value = NULL; field.in_check_mask = NULL; - field.in_handler = handler; + field.in_handler = NULL; field.in_handler_priv = NULL; jtag_add_ir_scan(1, &field, TAP_INVALID); } @@ -72,7 +72,7 @@ int mips_ejtag_get_idcode(mips_ejtag_t *ejtag_info, u32 *idcode, in_handler_t ha field.tap = ejtag_info->tap; field.num_bits = 32; field.out_value = NULL; - + field.in_value = (void*)idcode; field.in_check_value = NULL; field.in_check_mask = NULL; @@ -99,7 +99,7 @@ int mips_ejtag_get_impcode(mips_ejtag_t *ejtag_info, u32 *impcode, in_handler_t field.tap = ejtag_info->tap; field.num_bits = 32; field.out_value = NULL; - + field.in_value = (void*)impcode; field.in_check_value = NULL; field.in_check_mask = NULL; @@ -130,7 +130,7 @@ int mips_ejtag_drscan_32(mips_ejtag_t *ejtag_info, u32 *data) field.num_bits = 32; field.out_value = t; buf_set_u32(field.out_value, 0, field.num_bits, *data); - + field.in_value = (u8*)data; field.in_check_value = NULL; field.in_check_mask = NULL; diff --git a/src/target/mips_ejtag.h b/src/target/mips_ejtag.h index cab8c11f..a7d5c5d7 100644 --- a/src/target/mips_ejtag.h +++ b/src/target/mips_ejtag.h @@ -107,7 +107,7 @@ typedef struct mips_ejtag_s u32 ejtag_ctrl; } mips_ejtag_t; -extern int mips_ejtag_set_instr(mips_ejtag_t *ejtag_info, int new_instr, in_handler_t handler); +extern int mips_ejtag_set_instr(mips_ejtag_t *ejtag_info, int new_instr, void *delete_me_and_submit_patch); extern int mips_ejtag_enter_debug(mips_ejtag_t *ejtag_info); extern int mips_ejtag_exit_debug(mips_ejtag_t *ejtag_info, int enable_interrupts); extern int mips_ejtag_get_impcode(mips_ejtag_t *ejtag_info, u32 *impcode, in_handler_t handler); |