MinGW build fixes

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

diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index c401d8f358c612a1911f8dffe500c2855f5efb7b..f7a540a4dff9a38a2da95f9b1791a523d2d84cf6 100644 (file)
--- a/src/target/arm_jtag.c
+++ b/src/target/arm_jtag.c
@@ -2,6 +2,9 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -17,100 +20,86 @@
  *   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"
 
-#include "binarybuffer.h"
-#include "log.h"
-#include "jtag.h"
 
-#include <stdlib.h>
+#if 0
+#define _ARM_JTAG_SCAN_N_CHECK_
+#endif
 
-int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr)
+int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info, uint32_t new_instr,  void *no_verify_capture)
 {
-       jtag_device_t *device = jtag_get_device(jtag_info->chain_pos);
-       
-       if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr)
+       struct jtag_tap *tap;
+       tap = jtag_info->tap;
+       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)
        {
-               scan_field_t field;
-       
-               field.device = jtag_info->chain_pos;
-               field.num_bits = device->ir_length;
-               field.out_value = calloc(CEIL(field.num_bits, 8), 1);
-               buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
-               field.out_mask = NULL;
-               field.in_value = NULL;
-               field.in_check_value = NULL;
-               field.in_check_mask = NULL;
-               field.in_handler = NULL;
-               field.in_handler_priv = NULL;
-               
-               jtag_add_ir_scan(1, &field, -1);
-               
-               free(field.out_value);
+               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());
        }
-       
+
        return ERROR_OK;
 }
 
-int arm_jtag_scann(arm_jtag_t *jtag_info, u32 new_scan_chain)
+int arm_jtag_scann_inner(struct arm_jtag *jtag_info, uint32_t new_scan_chain)
 {
-       if(jtag_info->cur_scan_chain != new_scan_chain)
+       int retval = ERROR_OK;
+       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)
        {
-               scan_field_t field;
-               
-               field.device = jtag_info->chain_pos;
-               field.num_bits = jtag_info->scann_size;
-               field.out_value = calloc(CEIL(field.num_bits, 8), 1);
-               buf_set_u32(field.out_value, 0, field.num_bits, new_scan_chain);
-               field.out_mask = NULL;
-               //field.in_value = &scan_n_capture;
-               field.in_value = NULL;
-               field.in_check_value = NULL;
-               field.in_check_mask = NULL;
-               field.in_handler = NULL;
-               field.in_handler_priv = NULL;
-               
-               arm_jtag_set_instr(jtag_info, jtag_info->scann_instr);
-               jtag_add_dr_scan(1, &field, -1);
-               
-               jtag_info->cur_scan_chain = new_scan_chain;
-               
-               free(field.out_value);
+               return retval;
        }
-       
-       return ERROR_OK;
+
+       jtag_add_dr_out(jtag_info->tap,
+                       1,
+                       num_bits,
+                       values,
+                       jtag_get_end_state());
+
+       jtag_info->cur_scan_chain = new_scan_chain;
+
+       return retval;
 }
 
 int arm_jtag_reset_callback(enum jtag_event event, void *priv)
 {
-       arm_jtag_t *jtag_info = priv;
-       
+       struct arm_jtag *jtag_info = priv;
+
        if (event == JTAG_TRST_ASSERTED)
        {
                jtag_info->cur_scan_chain = 0;
        }
-       
+
        return ERROR_OK;
 }
 
-int arm_jtag_setup_connection(arm_jtag_t *jtag_info)
+int arm_jtag_setup_connection(struct arm_jtag *jtag_info)
 {
        jtag_info->scann_instr = 0x2;
        jtag_info->cur_scan_chain = 0;
        jtag_info->intest_instr = 0xc;
 
-       jtag_register_event_callback(arm_jtag_reset_callback, jtag_info);
-       
-       return ERROR_OK;
-}
-
-int arm_jtag_buf_to_u32_flip(u8 *in_buf, void *priv)
-{
-       u32 *dest = priv;
-       
-       *dest = flip_u32(buf_get_u32(in_buf, 0, 32), 32);
-       
-       return ERROR_OK;
+       return jtag_register_event_callback(arm_jtag_reset_callback, jtag_info);
 }