auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jtag_tap_t -> struct jtag_tap

Browse Source 
Search and destroy the jtag_tap_t typedef.  This also cleans up a
layering violation, removing the declaration from types.h.
This commit is contained in:
Zachary T Welch
2009-11-13 03:19:35 -08:00
parent 9f212b01be
commit 42ef503d37
50 changed files with 149 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/target/arm11.c
View File

@@ -2066,7 +2066,7 @@ static const uint32_t arm11_coproc_instruction_limits[] =
static arm11_common_t * arm11_find_target(const char * arg)
{
jtag_tap_t * tap;
struct jtag_tap * tap;
target_t * t;
tap = jtag_tap_by_string(arg);

2
src/target/arm11_dbgtap.c
View File

@@ -100,7 +100,7 @@ void arm11_setup_field(arm11_common_t * arm11, int num_bits, void * out_data, vo
*/
void arm11_add_IR(arm11_common_t * arm11, uint8_t instr, tap_state_t state)
{
jtag_tap_t *tap;
struct jtag_tap *tap;
tap = arm11->target->tap;
if (buf_get_u32(tap->cur_instr, 0, 5) == instr)

2
src/target/arm720t.c
View File

@@ -377,7 +377,7 @@ static int arm720t_init_target(struct command_context_s *cmd_ctx, struct target_
}
static int arm720t_init_arch_info(target_t *target,
arm720t_common_t *arm720t, jtag_tap_t *tap)
arm720t_common_t *arm720t, struct jtag_tap *tap)
{
arm7tdmi_common_t *arm7tdmi = &arm720t->arm7tdmi_common;
arm7_9_common_t *arm7_9 = &arm7tdmi->arm7_9_common;

2
src/target/arm7_9_common.c
View File

@@ -2611,7 +2611,7 @@ static int arm7_9_dcc_completion(struct target_s *target, uint32_t exit_point, i
embeddedice_reg_t *ice_reg = arm7_9->eice_cache->reg_list[EICE_COMMS_DATA].arch_info;
uint8_t reg_addr = ice_reg->addr & 0x1f;
jtag_tap_t *tap;
struct jtag_tap *tap;
tap = ice_reg->jtag_info->tap;
embeddedice_write_dcc(tap, reg_addr, buffer, little, count-2);

2
src/target/arm7tdmi.c
View File

@@ -691,7 +691,7 @@ int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *tar
return ERROR_OK;
}
int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, jtag_tap_t *tap)
int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, struct jtag_tap *tap)
{
struct arm7_9_common_s *arm7_9 = &arm7tdmi->arm7_9_common;

2
src/target/arm7tdmi.h
View File

@@ -33,7 +33,7 @@ typedef struct arm7tdmi_common_s
arm7_9_common_t arm7_9_common;
} arm7tdmi_common_t;
int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, jtag_tap_t *tap);
int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, struct jtag_tap *tap);
int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
int arm7tdmi_examine(struct target_s *target);

2
src/target/arm920t.c
View File

@@ -620,7 +620,7 @@ int arm920t_soft_reset_halt(struct target_s *target)
return ERROR_OK;
}
int arm920t_init_arch_info(target_t *target, arm920t_common_t *arm920t, jtag_tap_t *tap)
int arm920t_init_arch_info(target_t *target, arm920t_common_t *arm920t, struct jtag_tap *tap)
{
arm9tdmi_common_t *arm9tdmi = &arm920t->arm9tdmi_common;
arm7_9_common_t *arm7_9 = &arm9tdmi->arm7_9_common;

2
src/target/arm926ejs.c
View File

@@ -667,7 +667,7 @@ static int arm926ejs_read_phys_memory(struct target_s *target,
}
int arm926ejs_init_arch_info(target_t *target, arm926ejs_common_t *arm926ejs,
jtag_tap_t *tap)
struct jtag_tap *tap)
{
arm9tdmi_common_t *arm9tdmi = &arm926ejs->arm9tdmi_common;
arm7_9_common_t *arm7_9 = &arm9tdmi->arm7_9_common;

2
src/target/arm926ejs.h
View File

@@ -47,7 +47,7 @@ target_to_arm926(struct target_s *target)
int arm926ejs_init_arch_info(target_t *target,
arm926ejs_common_t *arm926ejs, jtag_tap_t *tap);
arm926ejs_common_t *arm926ejs, struct jtag_tap *tap);
int arm926ejs_register_commands(struct command_context_s *cmd_ctx);
int arm926ejs_arch_state(struct target_s *target);
int arm926ejs_write_memory(struct target_s *target,

2
src/target/arm966e.c
View File

@@ -32,7 +32,7 @@
#define _DEBUG_INSTRUCTION_EXECUTION_
#endif
int arm966e_init_arch_info(target_t *target, arm966e_common_t *arm966e, jtag_tap_t *tap)
int arm966e_init_arch_info(target_t *target, arm966e_common_t *arm966e, struct jtag_tap *tap)
{
arm9tdmi_common_t *arm9tdmi = &arm966e->arm9tdmi_common;
arm7_9_common_t *arm7_9 = &arm9tdmi->arm7_9_common;

2
src/target/arm966e.h
View File

@@ -42,7 +42,7 @@ target_to_arm966(struct target_s *target)
}
int arm966e_init_arch_info(target_t *target,
arm966e_common_t *arm966e, jtag_tap_t *tap);
arm966e_common_t *arm966e, struct jtag_tap *tap);
int arm966e_register_commands(struct command_context_s *cmd_ctx);
int arm966e_write_cp15(target_t *target, int reg_addr, uint32_t value);

2
src/target/arm9tdmi.c
View File

@@ -786,7 +786,7 @@ int arm9tdmi_init_target(struct command_context_s *cmd_ctx,
return ERROR_OK;
}
int arm9tdmi_init_arch_info(target_t *target, arm9tdmi_common_t *arm9tdmi, jtag_tap_t *tap)
int arm9tdmi_init_arch_info(target_t *target, arm9tdmi_common_t *arm9tdmi, struct jtag_tap *tap)
{
armv4_5_common_t *armv4_5;
arm7_9_common_t *arm7_9;

2
src/target/arm9tdmi.h
View File

@@ -55,7 +55,7 @@ int arm9tdmi_init_target(struct command_context_s *cmd_ctx,
struct target_s *target);
int arm9tdmi_examine(struct target_s *target);
int arm9tdmi_init_arch_info(target_t *target,
arm9tdmi_common_t *arm9tdmi, jtag_tap_t *tap);
arm9tdmi_common_t *arm9tdmi, struct jtag_tap *tap);
int arm9tdmi_register_commands(struct command_context_s *cmd_ctx);
int arm9tdmi_clock_out(arm_jtag_t *jtag_info,

2
src/target/arm_jtag.c
View File

@@ -33,7 +33,7 @@
int arm_jtag_set_instr(arm_jtag_t *jtag_info, uint32_t new_instr, void *no_verify_capture)
{
jtag_tap_t *tap;
struct jtag_tap *tap;
tap = jtag_info->tap;
if (tap == NULL)
return ERROR_FAIL;

2
src/target/arm_jtag.h
View File

@@ -27,7 +27,7 @@
typedef struct arm_jtag_s
{
jtag_tap_t *tap;
struct jtag_tap *tap;
uint32_t scann_size;
uint32_t scann_instr;

40
src/target/avrt.c
View File

@@ -46,17 +46,17 @@ int avr_deassert_reset(target_t *target);
int avr_soft_reset_halt(struct target_s *target);
/* IR and DR functions */
int avr_jtag_sendinstr(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out);
int avr_jtag_senddat(jtag_tap_t *tap, uint32_t *dr_in, uint32_t dr_out, int len);
int avr_jtag_sendinstr(struct jtag_tap *tap, uint8_t *ir_in, uint8_t ir_out);
int avr_jtag_senddat(struct jtag_tap *tap, uint32_t *dr_in, uint32_t dr_out, int len);
int mcu_write_ir(jtag_tap_t *tap, uint8_t *ir_in, uint8_t *ir_out, int ir_len, int rti);
int mcu_write_dr(jtag_tap_t *tap, uint8_t *dr_in, uint8_t *dr_out, int dr_len, int rti);
int mcu_write_ir_u8(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out, int ir_len, int rti);
int mcu_write_dr_u8(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out, int dr_len, int rti);
int mcu_write_ir_u16(jtag_tap_t *tap, uint16_t *ir_in, uint16_t ir_out, int ir_len, int rti);
int mcu_write_dr_u16(jtag_tap_t *tap, uint16_t *ir_in, uint16_t ir_out, int dr_len, int rti);
int mcu_write_ir_u32(jtag_tap_t *tap, uint32_t *ir_in, uint32_t ir_out, int ir_len, int rti);
int mcu_write_dr_u32(jtag_tap_t *tap, uint32_t *ir_in, uint32_t ir_out, int dr_len, int rti);
int mcu_write_ir(struct jtag_tap *tap, uint8_t *ir_in, uint8_t *ir_out, int ir_len, int rti);
int mcu_write_dr(struct jtag_tap *tap, uint8_t *dr_in, uint8_t *dr_out, int dr_len, int rti);
int mcu_write_ir_u8(struct jtag_tap *tap, uint8_t *ir_in, uint8_t ir_out, int ir_len, int rti);
int mcu_write_dr_u8(struct jtag_tap *tap, uint8_t *ir_in, uint8_t ir_out, int dr_len, int rti);
int mcu_write_ir_u16(struct jtag_tap *tap, uint16_t *ir_in, uint16_t ir_out, int ir_len, int rti);
int mcu_write_dr_u16(struct jtag_tap *tap, uint16_t *ir_in, uint16_t ir_out, int dr_len, int rti);
int mcu_write_ir_u32(struct jtag_tap *tap, uint32_t *ir_in, uint32_t ir_out, int ir_len, int rti);
int mcu_write_dr_u32(struct jtag_tap *tap, uint32_t *ir_in, uint32_t ir_out, int dr_len, int rti);
int mcu_execute_queue(void);
target_type_t avr_target =
@@ -175,18 +175,18 @@ int avr_soft_reset_halt(struct target_s *target)
return ERROR_OK;
}
int avr_jtag_senddat(jtag_tap_t *tap, uint32_t* dr_in, uint32_t dr_out, int len)
int avr_jtag_senddat(struct jtag_tap *tap, uint32_t* dr_in, uint32_t dr_out, int len)
{
return mcu_write_dr_u32(tap, dr_in, dr_out, len, 1);
}
int avr_jtag_sendinstr(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out)
int avr_jtag_sendinstr(struct jtag_tap *tap, uint8_t *ir_in, uint8_t ir_out)
{
return mcu_write_ir_u8(tap, ir_in, ir_out, AVR_JTAG_INS_LEN, 1);
}
/* IR and DR functions */
int mcu_write_ir(jtag_tap_t *tap, uint8_t *ir_in, uint8_t *ir_out, int ir_len, int rti)
int mcu_write_ir(struct jtag_tap *tap, uint8_t *ir_in, uint8_t *ir_out, int ir_len, int rti)
{
if (NULL == tap)
{
@@ -212,7 +212,7 @@ int mcu_write_ir(jtag_tap_t *tap, uint8_t *ir_in, uint8_t *ir_out, int ir_len, i
return ERROR_OK;
}
int mcu_write_dr(jtag_tap_t *tap, uint8_t *dr_in, uint8_t *dr_out, int dr_len, int rti)
int mcu_write_dr(struct jtag_tap *tap, uint8_t *dr_in, uint8_t *dr_out, int dr_len, int rti)
{
if (NULL == tap)
{
@@ -233,7 +233,7 @@ int mcu_write_dr(jtag_tap_t *tap, uint8_t *dr_in, uint8_t *dr_out, int dr_len, i
return ERROR_OK;
}
int mcu_write_ir_u8(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out, int ir_len, int rti)
int mcu_write_ir_u8(struct jtag_tap *tap, uint8_t *ir_in, uint8_t ir_out, int ir_len, int rti)
{
if (ir_len > 8)
{
@@ -246,7 +246,7 @@ int mcu_write_ir_u8(jtag_tap_t *tap, uint8_t *ir_in, uint8_t ir_out, int ir_len,
return ERROR_OK;
}
int mcu_write_dr_u8(jtag_tap_t *tap, uint8_t *dr_in, uint8_t dr_out, int dr_len, int rti)
int mcu_write_dr_u8(struct jtag_tap *tap, uint8_t *dr_in, uint8_t dr_out, int dr_len, int rti)
{
if (dr_len > 8)
{
@@ -259,7 +259,7 @@ int mcu_write_dr_u8(jtag_tap_t *tap, uint8_t *dr_in, uint8_t dr_out, int dr_len,
return ERROR_OK;
}
int mcu_write_ir_u16(jtag_tap_t *tap, uint16_t *ir_in, uint16_t ir_out, int ir_len, int rti)
int mcu_write_ir_u16(struct jtag_tap *tap, uint16_t *ir_in, uint16_t ir_out, int ir_len, int rti)
{
if (ir_len > 16)
{
@@ -272,7 +272,7 @@ int mcu_write_ir_u16(jtag_tap_t *tap, uint16_t *ir_in, uint16_t ir_out, int ir_l
return ERROR_OK;
}
int mcu_write_dr_u16(jtag_tap_t *tap, uint16_t *dr_in, uint16_t dr_out, int dr_len, int rti)
int mcu_write_dr_u16(struct jtag_tap *tap, uint16_t *dr_in, uint16_t dr_out, int dr_len, int rti)
{
if (dr_len > 16)
{
@@ -285,7 +285,7 @@ int mcu_write_dr_u16(jtag_tap_t *tap, uint16_t *dr_in, uint16_t dr_out, int dr_l
return ERROR_OK;
}
int mcu_write_ir_u32(jtag_tap_t *tap, uint32_t *ir_in, uint32_t ir_out, int ir_len, int rti)
int mcu_write_ir_u32(struct jtag_tap *tap, uint32_t *ir_in, uint32_t ir_out, int ir_len, int rti)
{
if (ir_len > 32)
{
@@ -298,7 +298,7 @@ int mcu_write_ir_u32(jtag_tap_t *tap, uint32_t *ir_in, uint32_t ir_out, int ir_l
return ERROR_OK;
}
int mcu_write_dr_u32(jtag_tap_t *tap, uint32_t *dr_in, uint32_t dr_out, int dr_len, int rti)
int mcu_write_dr_u32(struct jtag_tap *tap, uint32_t *dr_in, uint32_t dr_out, int dr_len, int rti)
{
if (dr_len > 32)
{

2
src/target/avrt.h
View File

@@ -24,7 +24,7 @@
typedef struct mcu_jtag_s
{
jtag_tap_t *tap;
struct jtag_tap *tap;
} mcu_jtag_t;
typedef struct avr_common_s

2
src/target/cortex_a8.c
View File

@@ -1451,7 +1451,7 @@ static int cortex_a8_init_target(struct command_context_s *cmd_ctx,
}
int cortex_a8_init_arch_info(target_t *target,
cortex_a8_common_t *cortex_a8, jtag_tap_t *tap)
cortex_a8_common_t *cortex_a8, struct jtag_tap *tap)
{
armv4_5_common_t *armv4_5;
armv7a_common_t *armv7a;

2
src/target/cortex_a8.h
View File

@@ -144,6 +144,6 @@ target_to_cortex_a8(struct target_s *target)
}
int cortex_a8_init_arch_info(target_t *target,
cortex_a8_common_t *cortex_a8, jtag_tap_t *tap);
cortex_a8_common_t *cortex_a8, struct jtag_tap *tap);
#endif /* CORTEX_A8_H */

2
src/target/cortex_m3.c
View File

@@ -1708,7 +1708,7 @@ static int cortex_m3_handle_target_request(void *priv)
}
static int cortex_m3_init_arch_info(target_t *target,
cortex_m3_common_t *cortex_m3, jtag_tap_t *tap)
cortex_m3_common_t *cortex_m3, struct jtag_tap *tap)
{
int retval;
struct armv7m_common_s *armv7m = &cortex_m3->armv7m;

2
src/target/embeddedice.c
View File

@@ -622,7 +622,7 @@ int embeddedice_handshake(arm_jtag_t *jtag_info, int hsbit, uint32_t timeout)
/**
* This is an inner loop of the open loop DCC write of data to target
*/
void embeddedice_write_dcc(jtag_tap_t *tap,
void embeddedice_write_dcc(struct jtag_tap *tap,
int reg_addr, uint8_t *buffer, int little, int count)
{
int i;

4
src/target/embeddedice.h
View File

@@ -116,7 +116,7 @@ int embeddedice_handshake(arm_jtag_t *jtag_info, int hsbit, uint32_t timeout);
/* If many embeddedice_write_reg() follow eachother, then the >1 invocations can be this faster version of
* embeddedice_write_reg
*/
static __inline__ void embeddedice_write_reg_inner(jtag_tap_t *tap, int reg_addr, uint32_t value)
static __inline__ void embeddedice_write_reg_inner(struct jtag_tap *tap, int reg_addr, uint32_t value)
{
static const int embeddedice_num_bits[]={32,5,1};
uint32_t values[3];
@@ -132,6 +132,6 @@ static __inline__ void embeddedice_write_reg_inner(jtag_tap_t *tap, int reg_addr
jtag_get_end_state());
}
void embeddedice_write_dcc(jtag_tap_t *tap, int reg_addr, uint8_t *buffer, int little, int count);
void embeddedice_write_dcc(struct jtag_tap *tap, int reg_addr, uint8_t *buffer, int little, int count);
#endif /* EMBEDDED_ICE_H */

4
src/target/etb.c
View File

@@ -44,7 +44,7 @@ static int etb_get_reg(reg_t *reg);
static int etb_set_instr(etb_t *etb, uint32_t new_instr)
{
jtag_tap_t *tap;
struct jtag_tap *tap;
tap = etb->tap;
if (tap == NULL)
@@ -352,7 +352,7 @@ static int etb_write_reg(reg_t *reg, uint32_t value)
COMMAND_HANDLER(handle_etb_config_command)
{
target_t *target;
jtag_tap_t *tap;
struct jtag_tap *tap;
struct arm *arm;
if (argc != 2)

2
src/target/etb.h
View File

@@ -37,7 +37,7 @@ enum
typedef struct etb_s
{
etm_context_t *etm_ctx;
jtag_tap_t *tap;
struct jtag_tap *tap;
uint32_t cur_scan_chain;
reg_cache_t *reg_cache;

4
src/target/fa526.c
View File

@@ -256,7 +256,7 @@ static void fa526_branch_resume_thumb(target_t *target)
}
static int fa526_init_arch_info_2(target_t *target,
arm9tdmi_common_t *arm9tdmi, jtag_tap_t *tap)
arm9tdmi_common_t *arm9tdmi, struct jtag_tap *tap)
{
arm7_9_common_t *arm7_9;
@@ -315,7 +315,7 @@ static int fa526_init_arch_info_2(target_t *target,
}
static int fa526_init_arch_info(target_t *target,
arm920t_common_t *arm920t, jtag_tap_t *tap)
arm920t_common_t *arm920t, struct jtag_tap *tap)
{
arm9tdmi_common_t *arm9tdmi = &arm920t->arm9tdmi_common;
arm7_9_common_t *arm7_9 = &arm9tdmi->arm7_9_common;

2
src/target/mips32.c
View File

@@ -315,7 +315,7 @@ reg_cache_t *mips32_build_reg_cache(target_t *target)
return cache;
}
int mips32_init_arch_info(target_t *target, mips32_common_t *mips32, jtag_tap_t *tap)
int mips32_init_arch_info(target_t *target, mips32_common_t *mips32, struct jtag_tap *tap)
{
target->arch_info = mips32;
mips32->common_magic = MIPS32_COMMON_MAGIC;

2
src/target/mips32.h
View File

@@ -127,7 +127,7 @@ typedef struct mips32_core_reg_s
int mips32_arch_state(struct target_s *target);
int mips32_init_arch_info(target_t *target,
mips32_common_t *mips32, jtag_tap_t *tap);
mips32_common_t *mips32, struct jtag_tap *tap);
int mips32_restore_context(target_t *target);
int mips32_save_context(target_t *target);

4
src/target/mips_ejtag.c
View File

@@ -29,7 +29,7 @@
int mips_ejtag_set_instr(mips_ejtag_t *ejtag_info, int new_instr, void *delete_me_and_submit_patch)
{
jtag_tap_t *tap;
struct jtag_tap *tap;
tap = ejtag_info->tap;
if (tap == NULL)
@@ -100,7 +100,7 @@ int mips_ejtag_get_impcode(mips_ejtag_t *ejtag_info, uint32_t *impcode)
int mips_ejtag_drscan_32(mips_ejtag_t *ejtag_info, uint32_t *data)
{
jtag_tap_t *tap;
struct jtag_tap *tap;
tap = ejtag_info->tap;
if (tap == NULL)

2
src/target/mips_ejtag.h
View File

@@ -104,7 +104,7 @@
typedef struct mips_ejtag_s
{
jtag_tap_t *tap;
struct jtag_tap *tap;
uint32_t impcode;
uint32_t idcode;
/*int use_dma;*/

2
src/target/mips_m4k.c
View File

@@ -917,7 +917,7 @@ int mips_m4k_init_target(struct command_context_s *cmd_ctx, struct target_s *tar
return ERROR_OK;
}
int mips_m4k_init_arch_info(target_t *target, mips_m4k_common_t *mips_m4k, jtag_tap_t *tap)
int mips_m4k_init_arch_info(target_t *target, mips_m4k_common_t *mips_m4k, struct jtag_tap *tap)
{
mips32_common_t *mips32 = &mips_m4k->mips32_common;

2
src/target/target.c
View File

@@ -3785,7 +3785,7 @@ static int target_configure(Jim_GetOptInfo *goi, target_t *target)
case TCFG_CHAIN_POSITION:
if (goi->isconfigure) {
Jim_Obj *o;
jtag_tap_t *tap;
struct jtag_tap *tap;
target_free_all_working_areas(target);
e = Jim_GetOpt_Obj(goi, &o);
if (e != JIM_OK) {

2
src/target/target.h
View File

@@ -136,7 +136,7 @@ typedef struct target_s
target_type_t *type; /* target type definition (name, access functions) */
const char *cmd_name; /* tcl Name of target */
int target_number; /* DO NOT USE! field to be removed in 2010 */
jtag_tap_t *tap; /* where on the jtag chain is this */
struct jtag_tap *tap; /* where on the jtag chain is this */
const char *variant; /* what varient of this chip is it? */
target_event_action_t *event_action;

4
src/target/xscale.c
View File

@@ -156,7 +156,7 @@ static int xscale_verify_pointer(struct command_context_s *cmd_ctx,
return ERROR_OK;
}
static int xscale_jtag_set_instr(jtag_tap_t *tap, uint32_t new_instr)
static int xscale_jtag_set_instr(struct jtag_tap *tap, uint32_t new_instr)
{
if (tap == NULL)
return ERROR_FAIL;
@@ -2868,7 +2868,7 @@ static int xscale_init_target(struct command_context_s *cmd_ctx,
}
static int xscale_init_arch_info(target_t *target,
xscale_common_t *xscale, jtag_tap_t *tap, const char *variant)
xscale_common_t *xscale, struct jtag_tap *tap, const char *variant)
{
armv4_5_common_t *armv4_5;
uint32_t high_reset_branch, low_reset_branch;