Ensure Cortex-M reset wakes device from sleep (wfi/wfe)

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

diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index af626eca6b43531faa533d2eae1d563b0f8eac7f..22538ca58b887f629f9fce53ccaa530337b2b5d7 100644 (file)
--- a/src/target/arm_jtag.c
+++ b/src/target/arm_jtag.c
@@ -20,88 +20,72 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "arm_jtag.h"
 
-
 #if 0
 #define _ARM_JTAG_SCAN_N_CHECK_
 #endif
 
-int arm_jtag_set_instr(struct arm_jtag *jtag_info, uint32_t new_instr,  void *no_verify_capture)
+int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info,
+               uint32_t new_instr, void *no_verify_capture, tap_state_t end_state)
 {
        struct jtag_tap *tap;
        tap = jtag_info->tap;
-       if (tap == NULL)
-               return ERROR_FAIL;
-
-       if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
-       {
-               struct scan_field field;
-               uint8_t t[4];
-
-               field.tap = tap;
-               field.num_bits = tap->ir_length;
-               field.out_value = t;
-               buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
-               field.in_value = NULL;
-
-
-
-               if (no_verify_capture == NULL)
-               {
-                       jtag_add_ir_scan(1, &field, jtag_get_end_state());
-               } else
-               {
-                       /* FIX!!!! this is a kludge!!! arm926ejs.c should reimplement this arm_jtag_set_instr to
-                        * have special verification code.
-                        */
-                       jtag_add_ir_scan_noverify(1, &field, jtag_get_end_state());
-               }
+       struct scan_field field;
+       uint8_t t[4];
+
+       field.num_bits = tap->ir_length;
+       field.out_value = t;
+       buf_set_u32(t, 0, field.num_bits, new_instr);
+       field.in_value = NULL;
+
+       if (no_verify_capture == NULL)
+               jtag_add_ir_scan(tap, &field, end_state);
+       else {
+               /* FIX!!!! this is a kludge!!! arm926ejs.c should reimplement this arm_jtag_set_instr to
+                * have special verification code.
+                */
+               jtag_add_ir_scan_noverify(tap, &field, end_state);
        }
 
        return ERROR_OK;
 }
 
-int arm_jtag_scann(struct arm_jtag *jtag_info, uint32_t new_scan_chain)
+int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain, tap_state_t end_state)
 {
        int retval = ERROR_OK;
-       if (jtag_info->cur_scan_chain != new_scan_chain)
-       {
-               uint32_t values[1];
-               int num_bits[1];
-
-               values[0]=new_scan_chain;
-               num_bits[0]=jtag_info->scann_size;
-
-               if ((retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL)) != ERROR_OK)
-               {
-                       return retval;
-               }
-
-               jtag_add_dr_out(jtag_info->tap,
-                               1,
-                               num_bits,
-                               values,
-                               jtag_get_end_state());
-
-               jtag_info->cur_scan_chain = new_scan_chain;
-       }
+       uint32_t values[1];
+       int num_bits[1];
+
+       values[0] = new_scan_chain;
+       num_bits[0] = jtag_info->scann_size;
+
+       retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL, end_state);
+       if (retval != ERROR_OK)
+               return retval;
+
+       jtag_add_dr_out(jtag_info->tap,
+                       1,
+                       num_bits,
+                       values,
+                       end_state);
+
+       jtag_info->cur_scan_chain = new_scan_chain;
 
        return retval;
 }
 
-int arm_jtag_reset_callback(enum jtag_event event, void *priv)
+static int arm_jtag_reset_callback(enum jtag_event event, void *priv)
 {
        struct arm_jtag *jtag_info = priv;
 
        if (event == JTAG_TRST_ASSERTED)
-       {
                jtag_info->cur_scan_chain = 0;
-       }
 
        return ERROR_OK;
 }