feroceon updated w.r.t. latest arm7/9 changes

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

diff --git a/src/target/arm11.c b/src/target/arm11.c
index ea88d5c0b7333f60ee91265afc9ae3540c219540..7c947fc2e7ce5ce98d90f915d5fe5467905b19c3 100644 (file)
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -92,6 +92,7 @@ target_type_t arm11_target =
     ARM11_HANDLER(register_commands),
     ARM11_HANDLER(target_command),
     ARM11_HANDLER(init_target),
+    ARM11_HANDLER(examine),
     ARM11_HANDLER(quit),
 };
 
@@ -994,6 +995,13 @@ int arm11_assert_reset(struct target_s *target)
     arm11->trst_active = true;
 #endif
 
+    if (target->reset_halt)
+    {
+       int retval;
+               if ((retval = target_halt(target))!=ERROR_OK)
+                       return retval;
+    }
+
     return ERROR_OK;
 }
 
@@ -1371,6 +1379,13 @@ int arm11_target_command(struct command_context_s *cmd_ctx, char *cmd, char **ar
 }
 
 int arm11_init_target(struct command_context_s *cmd_ctx, struct target_s *target)
+{
+       /* Initialize anything we can set up without talking to the target */
+       return ERROR_OK;
+}
+
+/* talk to the target and set things up */
+int arm11_examine(struct target_s *target)
 {
     FNC_INFO;
 
@@ -1701,7 +1716,7 @@ int arm11_handle_mrc_mcr(struct command_context_s *cmd_ctx, char *cmd, char **ar
        if (values[i] > arm11_coproc_instruction_limits[i])
        {
            LOG_ERROR("Parameter %ld out of bounds (%d max). %s",
-               i + 2, arm11_coproc_instruction_limits[i],
+                     (long)(i + 2), arm11_coproc_instruction_limits[i],
                read ? arm11_mrc_syntax : arm11_mcr_syntax);
            return -1;
        }