arm11_reg_state_t -> struct arm11_reg_state

[openocd.git] / src / target / cortex_a8.c

diff --git a/src/target/cortex_a8.c b/src/target/cortex_a8.c
index a8cb37d3206ad244795345742e802febe0a3e4c6..2a3cbadddfe9d4b69799c82950622c821e2351ce 100644 (file)
--- a/src/target/cortex_a8.c
+++ b/src/target/cortex_a8.c
@@ -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;
@@ -1526,8 +1526,7 @@ static int cortex_a8_target_create(struct target_s *target, Jim_Interp *interp)
        return ERROR_OK;
 }
 
-static int cortex_a8_handle_cache_info_command(struct command_context_s *cmd_ctx,
-               char *cmd, char **args, int argc)
+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);
@@ -1537,8 +1536,7 @@ static int cortex_a8_handle_cache_info_command(struct command_context_s *cmd_ctx
 }
 
 
-static int cortex_a8_handle_dbginit_command(struct command_context_s *cmd_ctx,
-               char *cmd, char **args, int argc)
+COMMAND_HANDLER(cortex_a8_handle_dbginit_command)
 {
        target_t *target = get_current_target(cmd_ctx);
 
@@ -1572,40 +1570,40 @@ static int cortex_a8_register_commands(struct command_context_s *cmd_ctx)
 }
 
 target_type_t cortexa8_target = {
-               .name = "cortex_a8",
+       .name = "cortex_a8",
 
-               .poll = &cortex_a8_poll,
-               .arch_state = &armv7a_arch_state,
+       .poll = cortex_a8_poll,
+       .arch_state = armv7a_arch_state,
 
-               .target_request_data = NULL,
+       .target_request_data = NULL,
 
-               .halt = &cortex_a8_halt,
-               .resume = &cortex_a8_resume,
-               .step = &cortex_a8_step,
+       .halt = cortex_a8_halt,
+       .resume = cortex_a8_resume,
+       .step = cortex_a8_step,
 
-               .assert_reset = &cortex_a8_assert_reset,
-               .deassert_reset = &cortex_a8_deassert_reset,
-               .soft_reset_halt = NULL,
+       .assert_reset = cortex_a8_assert_reset,
+       .deassert_reset = cortex_a8_deassert_reset,
+       .soft_reset_halt = NULL,
 
-               .get_gdb_reg_list = &armv4_5_get_gdb_reg_list,
+       .get_gdb_reg_list = armv4_5_get_gdb_reg_list,
 
-               .read_memory = &cortex_a8_read_memory,
-               .write_memory = &cortex_a8_write_memory,
-               .bulk_write_memory = &cortex_a8_bulk_write_memory,
-               .checksum_memory = &arm7_9_checksum_memory,
-               .blank_check_memory = &arm7_9_blank_check_memory,
+       .read_memory = cortex_a8_read_memory,
+       .write_memory = cortex_a8_write_memory,
+       .bulk_write_memory = cortex_a8_bulk_write_memory,
+       .checksum_memory = arm7_9_checksum_memory,
+       .blank_check_memory = arm7_9_blank_check_memory,
 
-               .run_algorithm = &armv4_5_run_algorithm,
+       .run_algorithm = armv4_5_run_algorithm,
 
-               .add_breakpoint = &cortex_a8_add_breakpoint,
-               .remove_breakpoint = &cortex_a8_remove_breakpoint,
-               .add_watchpoint = NULL,
-               .remove_watchpoint = NULL,
+       .add_breakpoint = cortex_a8_add_breakpoint,
+       .remove_breakpoint = cortex_a8_remove_breakpoint,
+       .add_watchpoint = NULL,
+       .remove_watchpoint = NULL,
 
-               .register_commands = &cortex_a8_register_commands,
-               .target_create = &cortex_a8_target_create,
-               .init_target = &cortex_a8_init_target,
-               .examine = &cortex_a8_examine,
-               .mrc = &cortex_a8_mrc,
-               .mcr = &cortex_a8_mcr,
-       };
+       .register_commands = cortex_a8_register_commands,
+       .target_create = cortex_a8_target_create,
+       .init_target = cortex_a8_init_target,
+       .examine = cortex_a8_examine,
+       .mrc = cortex_a8_mrc,
+       .mcr = cortex_a8_mcr,
+};