X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm920t.c;h=2fe50a132fc42f9d459944f1a27d2b654bdb5a07;hp=e043aee024c69b4937d8737e4a2e2892b5958817;hb=93459582fd340e4f63efed0fab9abd49a2cb6373;hpb=508e5c803fcc49ffe16a2e539545081df65633f7 diff --git a/src/target/arm920t.c b/src/target/arm920t.c index e043aee024..2fe50a132f 100644 --- a/src/target/arm920t.c +++ b/src/target/arm920t.c @@ -54,9 +54,9 @@ static int arm920t_read_cp15_physical(target_t *target, int reg_addr, uint32_t *value) { - struct arm920t_common_s *arm920t = target_to_arm920(target); - arm_jtag_t *jtag_info; - scan_field_t fields[4]; + struct arm920t_common *arm920t = target_to_arm920(target); + struct arm_jtag *jtag_info; + struct scan_field fields[4]; uint8_t access_type_buf = 1; uint8_t reg_addr_buf = reg_addr & 0x3f; uint8_t nr_w_buf = 0; @@ -106,9 +106,9 @@ static int arm920t_read_cp15_physical(target_t *target, static int arm920t_write_cp15_physical(target_t *target, int reg_addr, uint32_t value) { - struct arm920t_common_s *arm920t = target_to_arm920(target); - arm_jtag_t *jtag_info; - scan_field_t fields[4]; + struct arm920t_common *arm920t = target_to_arm920(target); + struct arm_jtag *jtag_info; + struct scan_field fields[4]; uint8_t access_type_buf = 1; uint8_t reg_addr_buf = reg_addr & 0x3f; uint8_t nr_w_buf = 1; @@ -155,9 +155,9 @@ static int arm920t_execute_cp15(target_t *target, uint32_t cp15_opcode, uint32_t arm_opcode) { int retval; - struct arm920t_common_s *arm920t = target_to_arm920(target); - arm_jtag_t *jtag_info; - scan_field_t fields[4]; + struct arm920t_common *arm920t = target_to_arm920(target); + struct arm_jtag *jtag_info; + struct scan_field fields[4]; uint8_t access_type_buf = 0; /* interpreted access */ uint8_t reg_addr_buf = 0x0; uint8_t nr_w_buf = 0; @@ -350,7 +350,7 @@ void arm920t_enable_mmu_caches(target_t *target, int mmu, int d_u_cache, int i_c void arm920t_post_debug_entry(target_t *target) { uint32_t cp15c15; - struct arm920t_common_s *arm920t = target_to_arm920(target); + struct arm920t_common *arm920t = target_to_arm920(target); /* examine cp15 control reg */ arm920t_read_cp15_physical(target, 0x2, &arm920t->cp15_control_reg); @@ -394,7 +394,7 @@ void arm920t_post_debug_entry(target_t *target) void arm920t_pre_restore_context(target_t *target) { uint32_t cp15c15; - struct arm920t_common_s *arm920t = target_to_arm920(target); + struct arm920t_common *arm920t = target_to_arm920(target); /* restore i/d fault status and address register */ arm920t_write_cp15_interpreted(target, 0xee050f10, arm920t->d_fsr, 0x0); @@ -416,7 +416,7 @@ void arm920t_pre_restore_context(target_t *target) static const char arm920_not[] = "target is not an ARM920"; static int arm920t_verify_pointer(struct command_context_s *cmd_ctx, - struct arm920t_common_s *arm920t) + struct arm920t_common *arm920t) { if (arm920t->common_magic != ARM920T_COMMON_MAGIC) { command_print(cmd_ctx, arm920_not); @@ -434,7 +434,7 @@ int arm920t_arch_state(struct target_s *target) "disabled", "enabled" }; - struct arm920t_common_s *arm920t = target_to_arm920(target); + struct arm920t_common *arm920t = target_to_arm920(target); struct armv4_5_common_s *armv4_5; if (arm920t->common_magic != ARM920T_COMMON_MAGIC) @@ -494,7 +494,7 @@ static int arm920t_read_phys_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer) { - struct arm920t_common_s *arm920t = target_to_arm920(target); + struct arm920t_common *arm920t = target_to_arm920(target); return armv4_5_mmu_read_physical(target, &arm920t->armv4_5_mmu, address, size, count, buffer); @@ -504,7 +504,7 @@ static int arm920t_write_phys_memory(struct target_s *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer) { - struct arm920t_common_s *arm920t = target_to_arm920(target); + struct arm920t_common *arm920t = target_to_arm920(target); return armv4_5_mmu_write_physical(target, &arm920t->armv4_5_mmu, address, size, count, buffer); @@ -525,7 +525,7 @@ int arm920t_write_memory(struct target_s *target, uint32_t address, uint32_t siz */ if (((size == 4) || (size == 2)) && (count == 1)) { - struct arm920t_common_s *arm920t = target_to_arm920(target); + struct arm920t_common *arm920t = target_to_arm920(target); if (arm920t->armv4_5_mmu.armv4_5_cache.d_u_cache_enabled) { @@ -552,8 +552,8 @@ int arm920t_write_memory(struct target_s *target, uint32_t address, uint32_t siz int arm920t_soft_reset_halt(struct target_s *target) { int retval = ERROR_OK; - struct arm920t_common_s *arm920t = target_to_arm920(target); - struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target); + struct arm920t_common *arm920t = target_to_arm920(target); + struct arm7_9_common *arm7_9 = target_to_arm7_9(target); struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common; reg_t *dbg_stat = &arm7_9->eice_cache->reg_list[EICE_DBG_STAT]; @@ -620,10 +620,10 @@ 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, struct arm920t_common *arm920t, struct jtag_tap *tap) { - arm9tdmi_common_t *arm9tdmi = &arm920t->arm9tdmi_common; - arm7_9_common_t *arm7_9 = &arm9tdmi->arm7_9_common; + struct arm9tdmi_common *arm9tdmi = &arm920t->arm9tdmi_common; + struct arm7_9_common *arm7_9 = &arm9tdmi->arm7_9_common; /* initialize arm9tdmi specific info (including arm7_9 and armv4_5) */ @@ -657,18 +657,17 @@ int arm920t_init_arch_info(target_t *target, arm920t_common_t *arm920t, jtag_tap static int arm920t_target_create(struct target_s *target, Jim_Interp *interp) { - arm920t_common_t *arm920t = calloc(1,sizeof(arm920t_common_t)); + struct arm920t_common *arm920t = calloc(1,sizeof(struct arm920t_common)); return arm920t_init_arch_info(target, arm920t, target->tap); } -static int arm920t_handle_read_cache_command(struct command_context_s *cmd_ctx, - char *cmd, char **args, int argc) +COMMAND_HANDLER(arm920t_handle_read_cache_command) { int retval = ERROR_OK; target_t *target = get_current_target(cmd_ctx); - struct arm920t_common_s *arm920t = target_to_arm920(target); - struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target); + struct arm920t_common *arm920t = target_to_arm920(target); + struct arm7_9_common *arm7_9 = target_to_arm7_9(target); struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common; uint32_t cp15c15; uint32_t cp15_ctrl, cp15_ctrl_saved; @@ -677,7 +676,7 @@ static int arm920t_handle_read_cache_command(struct command_context_s *cmd_ctx, uint32_t C15_C_D_Ind, C15_C_I_Ind; int i; FILE *output; - arm920t_cache_line_t d_cache[8][64], i_cache[8][64]; + struct arm920t_cache_line d_cache[8][64], i_cache[8][64]; int segment, index; retval = arm920t_verify_pointer(cmd_ctx, arm920t); @@ -909,13 +908,12 @@ static int arm920t_handle_read_cache_command(struct command_context_s *cmd_ctx, return ERROR_OK; } -static int arm920t_handle_read_mmu_command(struct command_context_s *cmd_ctx, - char *cmd, char **args, int argc) +COMMAND_HANDLER(arm920t_handle_read_mmu_command) { int retval = ERROR_OK; target_t *target = get_current_target(cmd_ctx); - struct arm920t_common_s *arm920t = target_to_arm920(target); - struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target); + struct arm920t_common *arm920t = target_to_arm920(target); + struct arm7_9_common *arm7_9 = target_to_arm7_9(target); struct armv4_5_common_s *armv4_5 = &arm7_9->armv4_5_common; uint32_t cp15c15; uint32_t cp15_ctrl, cp15_ctrl_saved; @@ -924,7 +922,7 @@ static int arm920t_handle_read_mmu_command(struct command_context_s *cmd_ctx, int i; FILE *output; uint32_t Dlockdown, Ilockdown; - arm920t_tlb_entry_t d_tlb[64], i_tlb[64]; + struct arm920t_tlb_entry d_tlb[64], i_tlb[64]; int victim; retval = arm920t_verify_pointer(cmd_ctx, arm920t); @@ -1193,12 +1191,11 @@ static int arm920t_handle_read_mmu_command(struct command_context_s *cmd_ctx, return ERROR_OK; } -static int arm920t_handle_cp15_command(struct command_context_s *cmd_ctx, - char *cmd, char **args, int argc) +COMMAND_HANDLER(arm920t_handle_cp15_command) { int retval; target_t *target = get_current_target(cmd_ctx); - struct arm920t_common_s *arm920t = target_to_arm920(target); + struct arm920t_common *arm920t = target_to_arm920(target); retval = arm920t_verify_pointer(cmd_ctx, arm920t); if (retval != ERROR_OK) @@ -1206,7 +1203,7 @@ static int arm920t_handle_cp15_command(struct command_context_s *cmd_ctx, if (target->state != TARGET_HALTED) { - command_print(cmd_ctx, "target must be stopped for \"%s\" command", cmd); + command_print(cmd_ctx, "target must be stopped for \"%s\" command", CMD_NAME); return ERROR_OK; } @@ -1247,12 +1244,11 @@ static int arm920t_handle_cp15_command(struct command_context_s *cmd_ctx, return ERROR_OK; } -static int arm920t_handle_cp15i_command(struct command_context_s *cmd_ctx, - char *cmd, char **args, int argc) +COMMAND_HANDLER(arm920t_handle_cp15i_command) { int retval; target_t *target = get_current_target(cmd_ctx); - struct arm920t_common_s *arm920t = target_to_arm920(target); + struct arm920t_common *arm920t = target_to_arm920(target); retval = arm920t_verify_pointer(cmd_ctx, arm920t); if (retval != ERROR_OK) @@ -1261,7 +1257,7 @@ static int arm920t_handle_cp15i_command(struct command_context_s *cmd_ctx, if (target->state != TARGET_HALTED) { - command_print(cmd_ctx, "target must be stopped for \"%s\" command", cmd); + command_print(cmd_ctx, "target must be stopped for \"%s\" command", CMD_NAME); return ERROR_OK; } @@ -1315,12 +1311,11 @@ static int arm920t_handle_cp15i_command(struct command_context_s *cmd_ctx, return ERROR_OK; } -static int arm920t_handle_cache_info_command(struct command_context_s *cmd_ctx, - char *cmd, char **args, int argc) +COMMAND_HANDLER(arm920t_handle_cache_info_command) { int retval; target_t *target = get_current_target(cmd_ctx); - struct arm920t_common_s *arm920t = target_to_arm920(target); + struct arm920t_common *arm920t = target_to_arm920(target); retval = arm920t_verify_pointer(cmd_ctx, arm920t); if (retval != ERROR_OK)