FLASH/NOR: Remove useless file stellaris.h

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

diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index abfb21bd98d10d1c07971bd31aa66dc80568c06a..778e606b608adfd1a57644f5802b946d6630b7ba 100644 (file)
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -2,7 +2,7 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007-2009 Øyvind Harboe                                 *
+ *   Copyright (C) 2007-2010 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   Copyright (C) 2008 by Spencer Oliver                                  *
@@ -1074,24 +1074,29 @@ int arm7_9_deassert_reset(struct target *target)
        /* deassert reset lines */
        jtag_add_reset(0, 0);
 
+       /* In case polling is disabled, we need to examine the
+        * target and poll here for this target to work correctly.
+        *
+        * Otherwise, e.g. halt will fail afterwards with bogus
+        * error messages as halt will believe that reset is
+        * still in effect.
+        */
+       if ((retval = target_examine_one(target)) != ERROR_OK)
+               return retval;
+
+       if ((retval = target_poll(target)) != ERROR_OK)
+       {
+               return retval;
+       }
+
        enum reset_types jtag_reset_config = jtag_get_reset_config();
        if (target->reset_halt && (jtag_reset_config & RESET_SRST_PULLS_TRST) != 0)
        {
                LOG_WARNING("srst pulls trst - can not reset into halted mode. Issuing halt after reset.");
-               /* set up embedded ice registers again */
-               if ((retval = target_examine_one(target)) != ERROR_OK)
-                       return retval;
-
-               if ((retval = target_poll(target)) != ERROR_OK)
-               {
-                       return retval;
-               }
-
                if ((retval = target_halt(target)) != ERROR_OK)
                {
                        return retval;
                }
-
        }
        return retval;
 }
@@ -1513,7 +1518,10 @@ static int arm7_9_full_context(struct target *target)
        }
 
        if (!is_arm_mode(armv4_5->core_mode))
+       {
+               LOG_ERROR("not a valid arm core mode - communication failure?");
                return ERROR_FAIL;
+       }
 
        /* iterate through processor modes (User, FIQ, IRQ, SVC, ABT, UND)
         * SYS shares registers with User, so we don't touch SYS
@@ -1616,7 +1624,10 @@ static int arm7_9_restore_context(struct target *target)
                arm7_9->pre_restore_context(target);
 
        if (!is_arm_mode(armv4_5->core_mode))
+       {
+               LOG_ERROR("not a valid arm core mode - communication failure?");
                return ERROR_FAIL;
+       }
 
        /* iterate through processor modes (User, FIQ, IRQ, SVC, ABT, UND)
         * SYS shares registers with User, so we don't touch SYS