command_handler: change 'args' to CMD_ARGV

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

diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c
index 47a20cb109042b39dac1360b65905a728bf6d27c..667805404837196a361af31a5f52dc463ad8dacc 100644 (file)
--- a/src/target/arm926ejs.c
+++ b/src/target/arm926ejs.c
@@ -27,6 +27,7 @@
 #include "arm926ejs.h"
 #include "time_support.h"
 #include "target_type.h"
+#include "register.h"
 
 
 /*
@@ -501,7 +502,7 @@ int arm926ejs_arch_state(struct target *target)
                return ERROR_TARGET_INVALID;
        }
 
-       armv4_5 = &arm926ejs->arm9tdmi_common.arm7_9_common.armv4_5_common;
+       armv4_5 = &arm926ejs->arm7_9_common.armv4_5_common;
 
        LOG_USER("target halted in %s state due to %s, current mode: %s\n"
                        "cpsr: 0x%8.8" PRIx32 " pc: 0x%8.8" PRIx32 "\n"
@@ -669,12 +670,10 @@ static int arm926ejs_read_phys_memory(struct target *target,
 int arm926ejs_init_arch_info(struct target *target, struct arm926ejs_common *arm926ejs,
                struct jtag_tap *tap)
 {
-       struct arm9tdmi_common *arm9tdmi = &arm926ejs->arm9tdmi_common;
-       struct arm7_9_common *arm7_9 = &arm9tdmi->arm7_9_common;
+       struct arm7_9_common *arm7_9 = &arm926ejs->arm7_9_common;
 
-       /* initialize arm9tdmi specific info (including arm7_9 and armv4_5)
-        */
-       arm9tdmi_init_arch_info(target, arm9tdmi, tap);
+       /* initialize arm7/arm9 specific info (including armv4_5) */
+       arm9tdmi_init_arch_info(target, arm7_9, tap);
 
        arm926ejs->common_magic = ARM926EJS_COMMON_MAGIC;
 
@@ -723,16 +722,16 @@ COMMAND_HANDLER(arm926ejs_handle_cp15_command)
        int CRn;
        int CRm;
 
-       if ((argc < 4) || (argc > 5))
+       if ((CMD_ARGC < 4) || (CMD_ARGC > 5))
        {
                command_print(cmd_ctx, "usage: arm926ejs cp15 <opcode_1> <opcode_2> <CRn> <CRm> [value]");
                return ERROR_OK;
        }
 
-       COMMAND_PARSE_NUMBER(int, args[0], opcode_1);
-       COMMAND_PARSE_NUMBER(int, args[1], opcode_2);
-       COMMAND_PARSE_NUMBER(int, args[2], CRn);
-       COMMAND_PARSE_NUMBER(int, args[3], CRm);
+       COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], opcode_1);
+       COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], opcode_2);
+       COMMAND_PARSE_NUMBER(int, CMD_ARGV[2], CRn);
+       COMMAND_PARSE_NUMBER(int, CMD_ARGV[3], CRm);
 
        retval = arm926ejs_verify_pointer(cmd_ctx, arm926ejs);
        if (retval != ERROR_OK)
@@ -744,7 +743,7 @@ COMMAND_HANDLER(arm926ejs_handle_cp15_command)
                return ERROR_OK;
        }
 
-       if (argc == 4)
+       if (CMD_ARGC == 4)
        {
                uint32_t value;
                if ((retval = arm926ejs->read_cp15(target, opcode_1, opcode_2, CRn, CRm, &value)) != ERROR_OK)
@@ -762,7 +761,7 @@ COMMAND_HANDLER(arm926ejs_handle_cp15_command)
        else
        {
                uint32_t value;
-               COMMAND_PARSE_NUMBER(u32, args[4], value);
+               COMMAND_PARSE_NUMBER(u32, CMD_ARGV[4], value);
                if ((retval = arm926ejs->write_cp15(target, opcode_1, opcode_2, CRn, CRm, value)) != ERROR_OK)
                {
                        command_print(cmd_ctx, "couldn't access register");
@@ -821,7 +820,7 @@ static int arm926ejs_mmu(struct target *target, int *enabled)
 int arm926ejs_register_commands(struct command_context *cmd_ctx)
 {
        int retval;
-       command_t *arm926ejs_cmd;
+       struct command *arm926ejs_cmd;
 
        retval = arm9tdmi_register_commands(cmd_ctx);
 
@@ -864,8 +863,9 @@ struct target_type arm926ejs_target =
        .read_memory = arm7_9_read_memory,
        .write_memory = arm926ejs_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,
 
@@ -877,7 +877,7 @@ struct target_type arm926ejs_target =
        .register_commands = arm926ejs_register_commands,
        .target_create = arm926ejs_target_create,
        .init_target = arm9tdmi_init_target,
-       .examine = arm9tdmi_examine,
+       .examine = arm7_9_examine,
        .virt2phys = arm926ejs_virt2phys,
        .mmu = arm926ejs_mmu,