From: Zachary T Welch Date: Fri, 13 Nov 2009 16:41:29 +0000 (-0800) Subject: armv7a_common_t -> struct armv7a_common X-Git-Tag: v0.4.0-rc1~680 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=248448ee3a5f4f97307f1d5af4ef940529478a34;p=openocd armv7a_common_t -> struct armv7a_common Remove misleading typedef and redundant suffix from struct armv7a_common. --- diff --git a/src/target/armv7a.c b/src/target/armv7a.c index 0bba549f..1def12f7 100644 --- a/src/target/armv7a.c +++ b/src/target/armv7a.c @@ -176,7 +176,7 @@ reg_t armv7a_gdb_dummy_fp_reg = void armv7a_show_fault_registers(target_t *target) { uint32_t dfsr, ifsr, dfar, ifar; - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); armv7a->read_cp15(target, 0, 0, 5, 0, &dfsr); armv7a->read_cp15(target, 0, 1, 5, 0, &ifsr); @@ -197,7 +197,7 @@ int armv7a_arch_state(struct target_s *target) "disabled", "enabled" }; - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct armv4_5_common_s *armv4_5 = &armv7a->armv4_5_common; if (armv4_5->common_magic != ARMV4_5_COMMON_MAGIC) @@ -233,7 +233,7 @@ int armv7a_arch_state(struct target_s *target) COMMAND_HANDLER(handle_dap_baseaddr_command) { target_t *target = get_current_target(cmd_ctx); - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct swjdp_common *swjdp = &armv7a->swjdp_info; return CALL_COMMAND_HANDLER(dap_baseaddr_command, swjdp); @@ -242,7 +242,7 @@ COMMAND_HANDLER(handle_dap_baseaddr_command) COMMAND_HANDLER(handle_dap_memaccess_command) { target_t *target = get_current_target(cmd_ctx); - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct swjdp_common *swjdp = &armv7a->swjdp_info; return CALL_COMMAND_HANDLER(dap_memaccess_command, swjdp); @@ -251,7 +251,7 @@ COMMAND_HANDLER(handle_dap_memaccess_command) COMMAND_HANDLER(handle_dap_apsel_command) { target_t *target = get_current_target(cmd_ctx); - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct swjdp_common *swjdp = &armv7a->swjdp_info; return CALL_COMMAND_HANDLER(dap_apsel_command, swjdp); @@ -260,7 +260,7 @@ COMMAND_HANDLER(handle_dap_apsel_command) COMMAND_HANDLER(handle_dap_apid_command) { target_t *target = get_current_target(cmd_ctx); - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct swjdp_common *swjdp = &armv7a->swjdp_info; return CALL_COMMAND_HANDLER(dap_apid_command, swjdp); @@ -269,7 +269,7 @@ COMMAND_HANDLER(handle_dap_apid_command) COMMAND_HANDLER(handle_dap_info_command) { target_t *target = get_current_target(cmd_ctx); - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct swjdp_common *swjdp = &armv7a->swjdp_info; uint32_t apsel; diff --git a/src/target/armv7a.h b/src/target/armv7a.h index b12c62c1..e5615bb5 100644 --- a/src/target/armv7a.h +++ b/src/target/armv7a.h @@ -89,7 +89,7 @@ enum #define V2POWUR 6 #define V2POWUW 7 -typedef struct armv7a_common_s +struct armv7a_common { int common_magic; reg_cache_t *core_cache; @@ -124,12 +124,12 @@ typedef struct armv7a_common_s void (*pre_restore_context)(target_t *target); void (*post_restore_context)(target_t *target); -} armv7a_common_t; +}; -static inline struct armv7a_common_s * +static inline struct armv7a_common * target_to_armv7a(struct target_s *target) { - return container_of(target->arch_info, struct armv7a_common_s, + return container_of(target->arch_info, struct armv7a_common, armv4_5_common); } @@ -146,14 +146,14 @@ typedef struct armv7a_core_reg_s int num; enum armv7a_mode mode; target_t *target; - armv7a_common_t *armv7a_common; + struct armv7a_common *armv7a_common; } armv7a_core_reg_t; int armv7a_arch_state(struct target_s *target); reg_cache_t *armv7a_build_reg_cache(target_t *target, - armv7a_common_t *armv7a_common); + struct armv7a_common *armv7a_common); int armv7a_register_commands(struct command_context_s *cmd_ctx); -int armv7a_init_arch_info(target_t *target, armv7a_common_t *armv7a); +int armv7a_init_arch_info(target_t *target, struct armv7a_common *armv7a); /* map psr mode bits to linear number */ static inline int armv7a_mode_to_number(enum armv7a_mode mode) diff --git a/src/target/cortex_a8.c b/src/target/cortex_a8.c index 7f0189b2..fec88379 100644 --- a/src/target/cortex_a8.c +++ b/src/target/cortex_a8.c @@ -64,7 +64,7 @@ static int cortex_a8_dap_write_coreregister_u32(target_t *target, */ static int cortex_a8_init_debug_access(target_t *target) { - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct swjdp_common *swjdp = &armv7a->swjdp_info; int retval; @@ -94,7 +94,7 @@ int cortex_a8_exec_opcode(target_t *target, uint32_t opcode) { uint32_t dscr; int retval; - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct swjdp_common *swjdp = &armv7a->swjdp_info; LOG_DEBUG("exec opcode 0x%08" PRIx32, opcode); @@ -135,7 +135,7 @@ static int cortex_a8_read_regs_through_mem(target_t *target, uint32_t address, uint32_t * regfile) { int retval = ERROR_OK; - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct swjdp_common *swjdp = &armv7a->swjdp_info; cortex_a8_dap_read_coreregister_u32(target, regfile, 0); @@ -152,7 +152,7 @@ static int cortex_a8_read_cp(target_t *target, uint32_t *value, uint8_t CP, uint8_t op1, uint8_t CRn, uint8_t CRm, uint8_t op2) { int retval; - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct swjdp_common *swjdp = &armv7a->swjdp_info; cortex_a8_exec_opcode(target, ARMV4_5_MRC(CP, op1, 0, CRn, CRm, op2)); @@ -171,7 +171,7 @@ static int cortex_a8_write_cp(target_t *target, uint32_t value, { int retval; uint32_t dscr; - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct swjdp_common *swjdp = &armv7a->swjdp_info; LOG_DEBUG("CP%i, CRn %i, value 0x%08" PRIx32, CP, CRn, value); @@ -235,7 +235,7 @@ static int cortex_a8_dap_read_coreregister_u32(target_t *target, int retval = ERROR_OK; uint8_t reg = regnum&0xFF; uint32_t dscr; - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct swjdp_common *swjdp = &armv7a->swjdp_info; if (reg > 16) @@ -276,7 +276,7 @@ static int cortex_a8_dap_write_coreregister_u32(target_t *target, uint32_t value int retval = ERROR_OK; uint8_t Rd = regnum&0xFF; uint32_t dscr; - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct swjdp_common *swjdp = &armv7a->swjdp_info; LOG_DEBUG("register %i, value 0x%08" PRIx32, regnum, value); @@ -323,7 +323,7 @@ static int cortex_a8_dap_write_coreregister_u32(target_t *target, uint32_t value static int cortex_a8_dap_write_memap_register_u32(target_t *target, uint32_t address, uint32_t value) { int retval; - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct swjdp_common *swjdp = &armv7a->swjdp_info; retval = mem_ap_write_atomic_u32(swjdp, address, value); @@ -340,7 +340,7 @@ static int cortex_a8_poll(target_t *target) int retval = ERROR_OK; uint32_t dscr; struct cortex_a8_common_s *cortex_a8 = target_to_cortex_a8(target); - struct armv7a_common_s *armv7a = &cortex_a8->armv7a_common; + struct armv7a_common *armv7a = &cortex_a8->armv7a_common; struct swjdp_common *swjdp = &armv7a->swjdp_info; enum target_state prev_target_state = target->state; uint8_t saved_apsel = dap_ap_get_select(swjdp); @@ -404,7 +404,7 @@ static int cortex_a8_halt(target_t *target) { int retval = ERROR_OK; uint32_t dscr; - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct swjdp_common *swjdp = &armv7a->swjdp_info; uint8_t saved_apsel = dap_ap_get_select(swjdp); dap_ap_select(swjdp, swjdp_debugap); @@ -441,7 +441,7 @@ out: static int cortex_a8_resume(struct target_s *target, int current, uint32_t address, int handle_breakpoints, int debug_execution) { - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct armv4_5_common_s *armv4_5 = &armv7a->armv4_5_common; struct swjdp_common *swjdp = &armv7a->swjdp_info; @@ -566,7 +566,7 @@ static int cortex_a8_debug_entry(target_t *target) int retval = ERROR_OK; working_area_t *regfile_working_area = NULL; struct cortex_a8_common_s *cortex_a8 = target_to_cortex_a8(target); - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct armv4_5_common_s *armv4_5 = &armv7a->armv4_5_common; struct swjdp_common *swjdp = &armv7a->swjdp_info; @@ -691,7 +691,7 @@ static int cortex_a8_debug_entry(target_t *target) static void cortex_a8_post_debug_entry(target_t *target) { struct cortex_a8_common_s *cortex_a8 = target_to_cortex_a8(target); - struct armv7a_common_s *armv7a = &cortex_a8->armv7a_common; + struct armv7a_common *armv7a = &cortex_a8->armv7a_common; // cortex_a8_read_cp(target, &cp15_control_register, 15, 0, 1, 0, 0); /* examine cp15 control reg */ @@ -723,7 +723,7 @@ static void cortex_a8_post_debug_entry(target_t *target) static int cortex_a8_step(struct target_s *target, int current, uint32_t address, int handle_breakpoints) { - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct armv4_5_common_s *armv4_5 = &armv7a->armv4_5_common; breakpoint_t *breakpoint = NULL; breakpoint_t stepbreakpoint; @@ -803,7 +803,7 @@ static int cortex_a8_restore_context(target_t *target) { int i; uint32_t value; - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct armv4_5_common_s *armv4_5 = &armv7a->armv4_5_common; LOG_DEBUG(" "); @@ -968,7 +968,7 @@ static int cortex_a8_set_breakpoint(struct target_s *target, uint32_t control; uint8_t byte_addr_select = 0x0F; struct cortex_a8_common_s *cortex_a8 = target_to_cortex_a8(target); - struct armv7a_common_s *armv7a = &cortex_a8->armv7a_common; + struct armv7a_common *armv7a = &cortex_a8->armv7a_common; cortex_a8_brp_t * brp_list = cortex_a8->brp_list; if (breakpoint->set) @@ -1039,7 +1039,7 @@ static int cortex_a8_unset_breakpoint(struct target_s *target, breakpoint_t *bre { int retval; struct cortex_a8_common_s *cortex_a8 = target_to_cortex_a8(target); - struct armv7a_common_s *armv7a = &cortex_a8->armv7a_common; + struct armv7a_common *armv7a = &cortex_a8->armv7a_common; cortex_a8_brp_t * brp_list = cortex_a8->brp_list; if (!breakpoint->set) @@ -1178,7 +1178,7 @@ static int cortex_a8_deassert_reset(target_t *target) static int cortex_a8_read_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer) { - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct swjdp_common *swjdp = &armv7a->swjdp_info; int retval = ERROR_OK; @@ -1213,7 +1213,7 @@ static int cortex_a8_read_memory(struct target_s *target, uint32_t address, int cortex_a8_write_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer) { - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct swjdp_common *swjdp = &armv7a->swjdp_info; int retval; @@ -1299,7 +1299,7 @@ static int cortex_a8_handle_target_request(void *priv) target_t *target = priv; if (!target->type->examined) return ERROR_OK; - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); struct swjdp_common *swjdp = &armv7a->swjdp_info; if (!target->dbg_msg_enabled) @@ -1339,7 +1339,7 @@ static int cortex_a8_handle_target_request(void *priv) static int cortex_a8_examine(struct target_s *target) { struct cortex_a8_common_s *cortex_a8 = target_to_cortex_a8(target); - struct armv7a_common_s *armv7a = &cortex_a8->armv7a_common; + struct armv7a_common *armv7a = &cortex_a8->armv7a_common; struct swjdp_common *swjdp = &armv7a->swjdp_info; int i; int retval = ERROR_OK; @@ -1454,7 +1454,7 @@ int cortex_a8_init_arch_info(target_t *target, cortex_a8_common_t *cortex_a8, struct jtag_tap *tap) { armv4_5_common_t *armv4_5; - armv7a_common_t *armv7a; + struct armv7a_common *armv7a; armv7a = &cortex_a8->armv7a_common; armv4_5 = &armv7a->armv4_5_common; @@ -1529,7 +1529,7 @@ static int cortex_a8_target_create(struct target_s *target, Jim_Interp *interp) COMMAND_HANDLER(cortex_a8_handle_cache_info_command) { target_t *target = get_current_target(cmd_ctx); - struct armv7a_common_s *armv7a = target_to_armv7a(target); + struct armv7a_common *armv7a = target_to_armv7a(target); return armv4_5_handle_cache_info_command(cmd_ctx, &armv7a->armv4_5_mmu.armv4_5_cache); diff --git a/src/target/cortex_a8.h b/src/target/cortex_a8.h index 02cf797f..8216ffbb 100644 --- a/src/target/cortex_a8.h +++ b/src/target/cortex_a8.h @@ -133,7 +133,7 @@ typedef struct cortex_a8_common_s /* Use cortex_a8_read_regs_through_mem for fast register reads */ int fast_reg_read; - armv7a_common_t armv7a_common; + struct armv7a_common armv7a_common; } cortex_a8_common_t; static inline struct cortex_a8_common_s *