use COMMAND_REGISTER macro

[fw/openocd] / src / target / arm720t.c

diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index ac7e4888832bb9ea3ccceb1f34c8055662ebb4e9..4ca80e1941fa5c0d24db35de1488c3e5be2e598d 100644 (file)
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -225,7 +225,7 @@ static int arm720t_verify_pointer(struct command_context *cmd_ctx,
 static int arm720t_arch_state(struct target *target)
 {
        struct arm720t_common *arm720t = target_to_arm720(target);
-       struct armv4_5_common_s *armv4_5;
+       struct arm *armv4_5;
 
        static const char *state[] =
        {
@@ -307,7 +307,7 @@ static int arm720t_soft_reset_halt(struct target *target)
        struct arm720t_common *arm720t = target_to_arm720(target);
        struct reg *dbg_stat = &arm720t->arm7_9_common
                        .eice_cache->reg_list[EICE_DBG_STAT];
-       struct armv4_5_common_s *armv4_5 = &arm720t->arm7_9_common
+       struct arm *armv4_5 = &arm720t->arm7_9_common
                        .armv4_5_common;
 
        if ((retval = target_halt(target)) != ERROR_OK)
@@ -354,7 +354,6 @@ static int arm720t_soft_reset_halt(struct target *target)
        cpsr |= 0xd3;
        arm_set_cpsr(armv4_5, cpsr);
        armv4_5->cpsr->dirty = 1;
-       armv4_5->core_state = ARMV4_5_STATE_ARM;
 
        /* start fetching from 0x0 */
        buf_set_u32(armv4_5->core_cache->reg_list[15].value, 0, 32, 0x0);
@@ -500,11 +499,11 @@ static int arm720t_register_commands(struct command_context *cmd_ctx)
 
        retval = arm7_9_register_commands(cmd_ctx);
 
-       arm720t_cmd = register_command(cmd_ctx, NULL, "arm720t",
+       arm720t_cmd = COMMAND_REGISTER(cmd_ctx, NULL, "arm720t",
                        NULL, COMMAND_ANY,
                        "arm720t specific commands");
 
-       register_command(cmd_ctx, arm720t_cmd, "cp15",
+       COMMAND_REGISTER(cmd_ctx, arm720t_cmd, "cp15",
                        arm720t_handle_cp15_command, COMMAND_EXEC,
                        "display/modify cp15 register <opcode> [value]");