David Brownell <david-b@pacbell.net> DaVinci DM355 SoC support

[openocd] / src / target / arm_jtag.c

diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index 070af2137b4b783a3e4d1398e5d383e1e99b5290..9911f4463ccb2a2e624f7e9d5cf51ce5e1a136c4 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     *
@@ -35,74 +38,69 @@
 
 int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr,  in_handler_t handler)
 {
-       jtag_device_t *device = jtag_get_device(jtag_info->chain_pos);
-       
-       if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr)
+       jtag_tap_t *tap;
+       tap = jtag_info->tap;
+       if (tap==NULL)
+               return ERROR_FAIL;
+
+       if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
        {
                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);
+               u8 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.out_mask = NULL;
+               
                field.in_value = NULL;
-               field.in_check_value = NULL;
-               field.in_check_mask = NULL;
-               field.in_handler = handler;
-               field.in_handler_priv = NULL;
-               jtag_add_ir_scan(1, &field, -1, NULL);
                
                
-               free(field.out_value);
+               field.in_handler = handler;
+               
+               jtag_add_ir_scan(1, &field, TAP_INVALID);
        }
-       
+
        return ERROR_OK;
 }
 
 int arm_jtag_scann(arm_jtag_t *jtag_info, u32 new_scan_chain)
 {
+       int retval = ERROR_OK;
        if(jtag_info->cur_scan_chain != new_scan_chain)
        {
-#ifdef _ARM_JTAG_SCAN_N_CHECK_
-               u8 scan_n_check_value = 1 << (jtag_info->scann_size - 1);
-#endif
-               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 = NULL;
-#ifdef _ARM_JTAG_SCAN_N_CHECK_
-               jtag_set_check_value(&field, &scan_n_check_value, NULL, NULL, NULL);
-#else
-               field.in_handler = NULL;
-               field.in_handler_priv = NULL;
-#endif 
-               
-               
-               arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL);
-               jtag_add_dr_scan(1, &field, -1, NULL);
-               
+               u32 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,
+                               TAP_INVALID);
+
                jtag_info->cur_scan_chain = new_scan_chain;
-               
-               free(field.out_value);
        }
-       
-       return ERROR_OK;
+
+       return retval;
 }
 
 int arm_jtag_reset_callback(enum jtag_event event, void *priv)
 {
        arm_jtag_t *jtag_info = priv;
-       
+
        if (event == JTAG_TRST_ASSERTED)
        {
                jtag_info->cur_scan_chain = 0;
        }
-       
+
        return ERROR_OK;
 }
 
@@ -112,9 +110,7 @@ int arm_jtag_setup_connection(arm_jtag_t *jtag_info)
        jtag_info->cur_scan_chain = 0;
        jtag_info->intest_instr = 0xc;
 
-       jtag_register_event_callback(arm_jtag_reset_callback, jtag_info);
-       
-       return ERROR_OK;
+       return jtag_register_event_callback(arm_jtag_reset_callback, jtag_info);
 }
 
 /* read JTAG buffer into host-endian u32, flipping bit-order */