compile with cygwin (32-bit)

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

diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index 524c3625f15896434b9fcb83a99d74e978318024..b3d8e158553a1c5b3d69e369798adc05c20dd33c 100644 (file)
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -32,7 +32,7 @@
 #define _DEBUG_INSTRUCTION_EXECUTION_
 #endif
 
-int arm966e_init_arch_info(target_t *target, struct arm966e_common *arm966e, struct jtag_tap *tap)
+int arm966e_init_arch_info(struct target *target, struct arm966e_common *arm966e, struct jtag_tap *tap)
 {
        struct arm9tdmi_common *arm9tdmi = &arm966e->arm9tdmi_common;
        struct arm7_9_common *arm7_9 = &arm9tdmi->arm7_9_common;
@@ -50,14 +50,14 @@ int arm966e_init_arch_info(target_t *target, struct arm966e_common *arm966e, str
        return ERROR_OK;
 }
 
-static int arm966e_target_create(struct target_s *target, Jim_Interp *interp)
+static int arm966e_target_create(struct target *target, Jim_Interp *interp)
 {
        struct arm966e_common *arm966e = calloc(1,sizeof(struct arm966e_common));
 
        return arm966e_init_arch_info(target, arm966e, target->tap);
 }
 
-static int arm966e_verify_pointer(struct command_context_s *cmd_ctx,
+static int arm966e_verify_pointer(struct command_context *cmd_ctx,
                struct arm966e_common *arm966e)
 {
        if (arm966e->common_magic != ARM966E_COMMON_MAGIC) {
@@ -67,11 +67,11 @@ static int arm966e_verify_pointer(struct command_context_s *cmd_ctx,
        return ERROR_OK;
 }
 
-static int arm966e_read_cp15(target_t *target, int reg_addr, uint32_t *value)
+static int arm966e_read_cp15(struct target *target, int reg_addr, uint32_t *value)
 {
        int retval = ERROR_OK;
        struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+       struct arm_jtag *jtag_info = &arm7_9->jtag_info;
        struct scan_field fields[3];
        uint8_t reg_addr_buf = reg_addr & 0x3f;
        uint8_t nr_w_buf = 0;
@@ -119,11 +119,11 @@ static int arm966e_read_cp15(target_t *target, int reg_addr, uint32_t *value)
 }
 
 // EXPORTED to str9x (flash)
-int arm966e_write_cp15(target_t *target, int reg_addr, uint32_t value)
+int arm966e_write_cp15(struct target *target, int reg_addr, uint32_t value)
 {
        int retval = ERROR_OK;
        struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
-       arm_jtag_t *jtag_info = &arm7_9->jtag_info;
+       struct arm_jtag *jtag_info = &arm7_9->jtag_info;
        struct scan_field fields[3];
        uint8_t reg_addr_buf = reg_addr & 0x3f;
        uint8_t nr_w_buf = 1;
@@ -165,7 +165,7 @@ int arm966e_write_cp15(target_t *target, int reg_addr, uint32_t value)
 COMMAND_HANDLER(arm966e_handle_cp15_command)
 {
        int retval;
-       target_t *target = get_current_target(cmd_ctx);
+       struct target *target = get_current_target(cmd_ctx);
        struct arm966e_common *arm966e = target_to_arm966(target);
 
        retval = arm966e_verify_pointer(cmd_ctx, arm966e);
@@ -189,7 +189,9 @@ COMMAND_HANDLER(arm966e_handle_cp15_command)
                        uint32_t value;
                        if ((retval = arm966e_read_cp15(target, address, &value)) != ERROR_OK)
                        {
-                               command_print(cmd_ctx, "couldn't access reg %i", address);
+                               command_print(cmd_ctx,
+                                               "couldn't access reg %" PRIi32,
+                                               address);
                                return ERROR_OK;
                        }
                        if ((retval = jtag_execute_queue()) != ERROR_OK)
@@ -197,7 +199,8 @@ COMMAND_HANDLER(arm966e_handle_cp15_command)
                                return retval;
                        }
 
-                       command_print(cmd_ctx, "%i: %8.8" PRIx32 "", address, value);
+                       command_print(cmd_ctx, "%" PRIi32 ": %8.8" PRIx32,
+                                       address, value);
                }
                else if (argc == 2)
                {
@@ -205,10 +208,13 @@ COMMAND_HANDLER(arm966e_handle_cp15_command)
                        COMMAND_PARSE_NUMBER(u32, args[1], value);
                        if ((retval = arm966e_write_cp15(target, address, value)) != ERROR_OK)
                        {
-                               command_print(cmd_ctx, "couldn't access reg %i", address);
+                               command_print(cmd_ctx,
+                                               "couldn't access reg %" PRIi32,
+                                               address);
                                return ERROR_OK;
                        }
-                       command_print(cmd_ctx, "%i: %8.8" PRIx32 "", address, value);
+                       command_print(cmd_ctx, "%" PRIi32 ": %8.8" PRIx32,
+                                       address, value);
                }
        }
 
@@ -216,10 +222,10 @@ COMMAND_HANDLER(arm966e_handle_cp15_command)
 }
 
 /** Registers commands used to access coprocessor resources. */
-int arm966e_register_commands(struct command_context_s *cmd_ctx)
+int arm966e_register_commands(struct command_context *cmd_ctx)
 {
        int retval;
-       command_t *arm966e_cmd;
+       struct command *arm966e_cmd;
 
        retval = arm9tdmi_register_commands(cmd_ctx);
        arm966e_cmd = register_command(cmd_ctx, NULL, "arm966e",
@@ -233,7 +239,7 @@ int arm966e_register_commands(struct command_context_s *cmd_ctx)
 }
 
 /** Holds methods for ARM966 targets. */
-target_type_t arm966e_target =
+struct target_type arm966e_target =
 {
        .name = "arm966e",
 
@@ -268,5 +274,5 @@ target_type_t arm966e_target =
        .register_commands = arm966e_register_commands,
        .target_create = arm966e_target_create,
        .init_target = arm9tdmi_init_target,
-       .examine = arm9tdmi_examine,
+       .examine = arm7_9_examine,
 };