command_handler: change to 'argc' to CMD_ARGC

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

diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index fd61020de4bba9eab04cdd83183eff0471c3594f..58e92c35ec24490d4e88b2505960a21515a35100 100644 (file)
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -24,6 +24,7 @@
 #include "arm920t.h"
 #include "time_support.h"
 #include "target_type.h"
+#include "register.h"
 
 
 /*
@@ -61,7 +62,7 @@ static int arm920t_read_cp15_physical(struct target *target,
        uint8_t reg_addr_buf = reg_addr & 0x3f;
        uint8_t nr_w_buf = 0;
 
-       jtag_info = &arm920t->arm9tdmi_common.arm7_9_common.jtag_info;
+       jtag_info = &arm920t->arm7_9_common.jtag_info;
 
        jtag_set_end_state(TAP_IDLE);
        arm_jtag_scann(jtag_info, 0xf);
@@ -114,7 +115,7 @@ static int arm920t_write_cp15_physical(struct target *target,
        uint8_t nr_w_buf = 1;
        uint8_t value_buf[4];
 
-       jtag_info = &arm920t->arm9tdmi_common.arm7_9_common.jtag_info;
+       jtag_info = &arm920t->arm7_9_common.jtag_info;
 
        buf_set_u32(value_buf, 0, 32, value);
 
@@ -163,7 +164,7 @@ static int arm920t_execute_cp15(struct target *target, uint32_t cp15_opcode,
        uint8_t nr_w_buf = 0;
        uint8_t cp15_opcode_buf[4];
 
-       jtag_info = &arm920t->arm9tdmi_common.arm7_9_common.jtag_info;
+       jtag_info = &arm920t->arm7_9_common.jtag_info;
 
        jtag_set_end_state(TAP_IDLE);
        arm_jtag_scann(jtag_info, 0xf);
@@ -443,7 +444,7 @@ int arm920t_arch_state(struct target *target)
                return ERROR_TARGET_INVALID;
        }
 
-       armv4_5 = &arm920t->arm9tdmi_common.arm7_9_common.armv4_5_common;
+       armv4_5 = &arm920t->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"
@@ -622,12 +623,10 @@ int arm920t_soft_reset_halt(struct target *target)
 
 int arm920t_init_arch_info(struct target *target, struct arm920t_common *arm920t, struct jtag_tap *tap)
 {
-       struct arm9tdmi_common *arm9tdmi = &arm920t->arm9tdmi_common;
-       struct arm7_9_common *arm7_9 = &arm9tdmi->arm7_9_common;
+       struct arm7_9_common *arm7_9 = &arm920t->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);
 
        arm920t->common_magic = ARM920T_COMMON_MAGIC;
 
@@ -683,7 +682,7 @@ COMMAND_HANDLER(arm920t_handle_read_cache_command)
        if (retval != ERROR_OK)
                return retval;
 
-       if (argc != 1)
+       if (CMD_ARGC != 1)
        {
                command_print(cmd_ctx, "usage: arm920t read_cache <filename>");
                return ERROR_OK;
@@ -929,7 +928,7 @@ COMMAND_HANDLER(arm920t_handle_read_mmu_command)
        if (retval != ERROR_OK)
                return retval;
 
-       if (argc != 1)
+       if (CMD_ARGC != 1)
        {
                command_print(cmd_ctx, "usage: arm920t read_mmu <filename>");
                return ERROR_OK;
@@ -1208,12 +1207,12 @@ COMMAND_HANDLER(arm920t_handle_cp15_command)
        }
 
        /* one or more argument, access a single register (write if second argument is given */
-       if (argc >= 1)
+       if (CMD_ARGC >= 1)
        {
                int address;
                COMMAND_PARSE_NUMBER(int, args[0], address);
 
-               if (argc == 1)
+               if (CMD_ARGC == 1)
                {
                        uint32_t value;
                        if ((retval = arm920t_read_cp15_physical(target, address, &value)) != ERROR_OK)
@@ -1228,7 +1227,7 @@ COMMAND_HANDLER(arm920t_handle_cp15_command)
 
                        command_print(cmd_ctx, "%i: %8.8" PRIx32 "", address, value);
                }
-               else if (argc == 2)
+               else if (CMD_ARGC == 2)
                {
                        uint32_t value;
                        COMMAND_PARSE_NUMBER(u32, args[1], value);
@@ -1262,12 +1261,12 @@ COMMAND_HANDLER(arm920t_handle_cp15i_command)
        }
 
        /* one or more argument, access a single register (write if second argument is given */
-       if (argc >= 1)
+       if (CMD_ARGC >= 1)
        {
                uint32_t opcode;
                COMMAND_PARSE_NUMBER(u32, args[0], opcode);
 
-               if (argc == 1)
+               if (CMD_ARGC == 1)
                {
                        uint32_t value;
                        if ((retval = arm920t_read_cp15_interpreted(target, opcode, 0x0, &value)) != ERROR_OK)
@@ -1278,7 +1277,7 @@ COMMAND_HANDLER(arm920t_handle_cp15i_command)
 
                        command_print(cmd_ctx, "%8.8" PRIx32 ": %8.8" PRIx32 "", opcode, value);
                }
-               else if (argc == 2)
+               else if (CMD_ARGC == 2)
                {
                        uint32_t value;
                        COMMAND_PARSE_NUMBER(u32, args[1], value);
@@ -1289,7 +1288,7 @@ COMMAND_HANDLER(arm920t_handle_cp15i_command)
                        }
                        command_print(cmd_ctx, "%8.8" PRIx32 ": %8.8" PRIx32 "", opcode, value);
                }
-               else if (argc == 3)
+               else if (CMD_ARGC == 3)
                {
                        uint32_t value;
                        COMMAND_PARSE_NUMBER(u32, args[1], value);