no longer use jtag_add_xxx() to set end state to TAP_DRPAUSE

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

diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index 2f474212f11e75700ff5587c216bb4c9de7d81fb..06b002dea902f6c1fdef7ef6b6a9509d66a40f8d 100644 (file)
--- a/src/target/arm11_dbgtap.c
+++ b/src/target/arm11_dbgtap.c
@@ -1,5 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2008 digenius technology GmbH.                          *
+ *   Michael Bruck                                                         *
  *                                                                         *
  *   Copyright (C) 2008 Oyvind Harboe oyvind.harboe@zylin.com              *
  *                                                                         *
@@ -24,11 +25,7 @@
 #endif
 
 #include "arm11.h"
-#include "jtag.h"
-#include "log.h"
 
-#include <stdlib.h>
-#include <string.h>
 
 #if 0
 #define JTAG_DEBUG(expr ...)   DEBUG(expr)
@@ -85,14 +82,8 @@ int arm11_add_dr_scan_vc(int num_fields, scan_field_t *fields, tap_state_t state
  */
 void arm11_setup_field(arm11_common_t * arm11, int num_bits, void * out_data, void * in_data, scan_field_t * field)
 {
-       field->tap                      = arm11->jtag_info.tap;
+       field->tap                      = arm11->target->tap;
        field->num_bits                 = num_bits;
-       field->out_mask                 = NULL;
-       field->in_check_mask    = NULL;
-       field->in_check_value   = NULL;
-       field->in_handler               = NULL;
-       field->in_handler_priv  = NULL;
-
        field->out_value                = out_data;
        field->in_value                 = in_data;
 }
@@ -109,7 +100,7 @@ void arm11_setup_field(arm11_common_t * arm11, int num_bits, void * out_data, vo
 void arm11_add_IR(arm11_common_t * arm11, u8 instr, tap_state_t state)
 {
        jtag_tap_t *tap;
-       tap = arm11->jtag_info.tap;
+       tap = arm11->target->tap;
 
        if (buf_get_u32(tap->cur_instr, 0, 5) == instr)
        {
@@ -131,7 +122,7 @@ void arm11_add_IR(arm11_common_t * arm11, u8 instr, tap_state_t state)
  *  arm11_add_debug_SCAN_N().
  *
  */
-static int arm11_in_handler_SCAN_N(u8 *in_value, void *priv, struct scan_field_s *field)
+static void arm11_in_handler_SCAN_N(u8 *in_value)
 {
        /** \todo TODO: clarify why this isnt properly masked in jtag.c jtag_read_buffer() */
        u8 v = *in_value & 0x1F;
@@ -139,11 +130,10 @@ static int arm11_in_handler_SCAN_N(u8 *in_value, void *priv, struct scan_field_s
        if (v != 0x10)
        {
                LOG_ERROR("'arm11 target' JTAG communication error SCREG SCAN OUT 0x%02x (expected 0x10)", v);
-               return ERROR_FAIL;
+               jtag_set_error(ERROR_FAIL);
        }
 
        JTAG_DEBUG("SCREG SCAN OUT 0x%02x", v);
-       return ERROR_OK;
 }
 
 /** Select and write to Scan Chain Register (SCREG)
@@ -178,11 +168,14 @@ void arm11_add_debug_SCAN_N(arm11_common_t * arm11, u8 chain, tap_state_t state)
 
        scan_field_t            field;
 
-       arm11_setup_field(arm11, 5, &chain, NULL, &field);
-
-       field.in_handler = arm11_in_handler_SCAN_N; /* deprecated! invoke this from user code! */
+       u8 tmp[1];
+       arm11_setup_field(arm11, 5, &chain, &tmp, &field);
 
        arm11_add_dr_scan_vc(1, &field, state == ARM11_TAP_DEFAULT ? TAP_DRPAUSE : state);
+
+       jtag_execute_queue_noclear();
+
+       arm11_in_handler_SCAN_N(tmp);
 }
 
 /** Write an instruction into the ITR register
@@ -219,7 +212,8 @@ void arm11_add_debug_INST(arm11_common_t * arm11, u32 inst, u8 * flag, tap_state
  * same as CP14 c1
  *
  * \param arm11                Target state variable.
- * \return                     DSCR content
+ * \param value                DSCR content
+ * \return                     Error status
  *
  * \remarks                    This is a stand-alone function that executes the JTAG command queue.
  */
@@ -445,7 +439,7 @@ int arm11_run_instr_data_to_core(arm11_common_t * arm11, u32 opcode, u32 * data,
                {
                        Data        = *data;
 
-                       arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_IDLE);
+                       arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, jtag_add_end_state(TAP_IDLE));
 
                        CHECK_RETVAL(jtag_execute_queue());
 
@@ -532,13 +526,13 @@ int arm11_run_instr_data_to_core_noack(arm11_common_t * arm11, u32 opcode, u32 *
 
                if (count)
                {
-                       jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, TAP_DRPAUSE);
+                       jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, jtag_add_end_state(TAP_DRPAUSE));
                        jtag_add_pathmove(asizeof(arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay),
                                arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay);
                }
                else
                {
-                       jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, TAP_IDLE);
+                       jtag_add_dr_scan(asizeof(chain5_fields), chain5_fields, jtag_add_end_state(TAP_IDLE));
                }
        }
 
@@ -553,14 +547,13 @@ int arm11_run_instr_data_to_core_noack(arm11_common_t * arm11, u32 opcode, u32 *
 
        size_t error_count = 0;
 
-       {size_t i;
-       for (i = 0; i < asizeof(Readies); i++)
+       for (size_t i = 0; i < asizeof(Readies); i++)
        {
                if (Readies[i] != 1)
                {
                        error_count++;
                }
-       }}
+       }
 
        if (error_count)
                LOG_ERROR("Transfer errors " ZU, error_count);
@@ -703,8 +696,7 @@ int arm11_sc7_run(arm11_common_t * arm11, arm11_sc7_action_t * actions, size_t c
        arm11_setup_field(arm11, 32, &DataOut,          &DataIn,        chain7_fields + 1);
        arm11_setup_field(arm11,  7, &AddressOut,       &AddressIn,     chain7_fields + 2);
 
-       {size_t i;
-       for (i = 0; i < count + 1; i++)
+       for (size_t i = 0; i < count + 1; i++)
        {
                if (i < count)
                {
@@ -750,13 +742,12 @@ int arm11_sc7_run(arm11_common_t * arm11, arm11_sc7_action_t * actions, size_t c
                                }
                        }
                }
-       }}
+       }
 
-       {size_t i;
-       for (i = 0; i < count; i++)
+       for (size_t i = 0; i < count; i++)
        {
                JTAG_DEBUG("SC7 %02d: %02x %s %08x", i, actions[i].address, actions[i].write ? "<=" : "=>", actions[i].value);
-       }}
+       }
 
        return ERROR_OK;
 }
@@ -771,22 +762,19 @@ void arm11_sc7_clear_vbw(arm11_common_t * arm11)
        arm11_sc7_action_t              clear_bw[arm11->brp + arm11->wrp + 1];
        arm11_sc7_action_t *    pos = clear_bw;
 
-       {size_t i;
-       for (i = 0; i < asizeof(clear_bw); i++)
+       for (size_t i = 0; i < asizeof(clear_bw); i++)
        {
                clear_bw[i].write       = true;
                clear_bw[i].value       = 0;
-       }}
+       }
 
-       {size_t i;
-       for (i = 0; i < arm11->brp; i++)
+       for (size_t i = 0; i < arm11->brp; i++)
                (pos++)->address = ARM11_SC7_BCR0 + i;
-       }
 
-       {size_t i;
-       for (i = 0; i < arm11->wrp; i++)
+
+       for (size_t i = 0; i < arm11->wrp; i++)
                (pos++)->address = ARM11_SC7_WCR0 + i;
-       }
+
 
        (pos++)->address = ARM11_SC7_VCR;