target: no implicit #includes of "register.h"

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

diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index 5425582d5aa108bd454d588b530b24e9d599c790..8e8f4d63db3ac175f8c0a35e491b82513c38e65f 100644 (file)
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -29,6 +29,7 @@
 
 #include "arm9tdmi.h"
 #include "target_type.h"
+#include "register.h"
 
 
 /*
@@ -742,44 +743,7 @@ static void arm9tdmi_build_reg_cache(struct target *target)
        armv4_5->core_cache = (*cache_p);
 }
 
-int arm9tdmi_examine(struct target *target)
-{
-       int retval;
-       struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
-
-       if (!target_was_examined(target))
-       {
-               struct reg_cache **cache_p = register_get_last_cache_p(&target->reg_cache);
-               struct reg_cache *t;
-               /* one extra register (vector catch) */
-               t = embeddedice_build_reg_cache(target, arm7_9);
-               if (t == NULL)
-                       return ERROR_FAIL;
-               (*cache_p) = t;
-               arm7_9->eice_cache = (*cache_p);
-
-               if (arm7_9->armv4_5_common.etm)
-               {
-                       struct arm_jtag *jtag_info = &arm7_9->jtag_info;
-                       (*cache_p)->next = etm_build_reg_cache(target,
-                                       jtag_info, arm7_9->armv4_5_common.etm);
-                       arm7_9->armv4_5_common.etm->reg_cache = (*cache_p)->next;
-               }
-               target_set_examined(target);
-       }
-       if ((retval = embeddedice_setup(target)) != ERROR_OK)
-               return retval;
-       if ((retval = arm7_9_setup(target)) != ERROR_OK)
-               return retval;
-       if (arm7_9->armv4_5_common.etm)
-       {
-               if ((retval = etm_setup(target)) != ERROR_OK)
-                       return retval;
-       }
-       return ERROR_OK;
-}
-
-int arm9tdmi_init_target(struct command_context_s *cmd_ctx,
+int arm9tdmi_init_target(struct command_context *cmd_ctx,
                struct target *target)
 {
        arm9tdmi_build_reg_cache(target);
@@ -936,10 +900,10 @@ COMMAND_HANDLER(handle_arm9tdmi_catch_vectors_command)
        return ERROR_OK;
 }
 
-int arm9tdmi_register_commands(struct command_context_s *cmd_ctx)
+int arm9tdmi_register_commands(struct command_context *cmd_ctx)
 {
        int retval;
-       command_t *arm9tdmi_cmd;
+       struct command *arm9tdmi_cmd;
 
        retval = arm7_9_register_commands(cmd_ctx);
        arm9tdmi_cmd = register_command(cmd_ctx, NULL, "arm9",
@@ -975,8 +939,9 @@ struct target_type arm9tdmi_target =
        .read_memory = arm7_9_read_memory,
        .write_memory = arm7_9_write_memory,
        .bulk_write_memory = arm7_9_bulk_write_memory,
-       .checksum_memory = arm7_9_checksum_memory,
-       .blank_check_memory = arm7_9_blank_check_memory,
+
+       .checksum_memory = arm_checksum_memory,
+       .blank_check_memory = arm_blank_check_memory,
 
        .run_algorithm = armv4_5_run_algorithm,
 
@@ -988,5 +953,5 @@ struct target_type arm9tdmi_target =
        .register_commands = arm9tdmi_register_commands,
        .target_create = arm9tdmi_target_create,
        .init_target = arm9tdmi_init_target,
-       .examine = arm9tdmi_examine,
+       .examine = arm7_9_examine,
 };