target: use one second timeout while halting target at gdb attach

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

diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index f8b5f4f4f1fd652494a5575e839f045247d1e570..f9605acb16a562b1013eb514fb0d0228f69d358c 100644 (file)
--- a/src/target/arm_jtag.c
+++ b/src/target/arm_jtag.c
@@ -16,38 +16,33 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
+
 #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_inner(struct arm_jtag *jtag_info, uint32_t new_instr,  void *no_verify_capture, tap_state_t end_state)
+int arm_jtag_set_instr_inner(struct jtag_tap *tap,
+               uint32_t new_instr, void *no_verify_capture, tap_state_t end_state)
 {
-       struct jtag_tap *tap;
-       tap = jtag_info->tap;
        struct scan_field field;
-       uint8_t t[4];
+       uint8_t t[4] = { 0 };
 
        field.num_bits = tap->ir_length;
        field.out_value = t;
-       buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
+       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
-       {
+       else {
                /* FIX!!!! this is a kludge!!! arm926ejs.c should reimplement this arm_jtag_set_instr to
                 * have special verification code.
                 */
@@ -60,21 +55,18 @@ int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr,  vo
 int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain, tap_state_t end_state)
 {
        int retval = ERROR_OK;
-       uint32_t values[1];
-       int num_bits[1];
 
-       values[0]=new_scan_chain;
-       num_bits[0]=jtag_info->scann_size;
+       uint8_t out_value[4] = { 0 };
+       buf_set_u32(out_value, 0, jtag_info->scann_size, new_scan_chain);
+       struct scan_field field = { .num_bits = jtag_info->scann_size, .out_value = out_value, };
 
-       if ((retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL, end_state)) != ERROR_OK)
-       {
+       retval = arm_jtag_set_instr(jtag_info->tap, jtag_info->scann_instr, NULL, end_state);
+       if (retval != ERROR_OK)
                return retval;
-       }
 
-       jtag_add_dr_out(jtag_info->tap,
+       jtag_add_dr_scan(jtag_info->tap,
                        1,
-                       num_bits,
-                       values,
+                       &field,
                        end_state);
 
        jtag_info->cur_scan_chain = new_scan_chain;
@@ -82,14 +74,12 @@ int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain, ta
        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;
 }
@@ -102,3 +92,8 @@ int arm_jtag_setup_connection(struct arm_jtag *jtag_info)
 
        return jtag_register_event_callback(arm_jtag_reset_callback, jtag_info);
 }
+
+int arm_jtag_close_connection(struct arm_jtag *jtag_info)
+{
+       return jtag_unregister_event_callback(arm_jtag_reset_callback, jtag_info);
+}