compile with cygwin (32-bit)

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

diff --git a/src/target/arm966e.c b/src/target/arm966e.c
index b1ae48c359a84714508e75560593a6ab46bf89ff..b3d8e158553a1c5b3d69e369798adc05c20dd33c 100644 (file)
--- a/src/target/arm966e.c
+++ b/src/target/arm966e.c
@@ -57,7 +57,7 @@ static int arm966e_target_create(struct target *target, Jim_Interp *interp)
        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) {
@@ -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",
@@ -268,5 +274,5 @@ struct target_type arm966e_target =
        .register_commands = arm966e_register_commands,
        .target_create = arm966e_target_create,
        .init_target = arm9tdmi_init_target,
-       .examine = arm9tdmi_examine,
+       .examine = arm7_9_examine,
 };