X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm_jtag.c;h=2967f0888e6aa3083d6c3b0eb50be62a620b77e6;hb=91afc3dc3083a3d4f6a4104a5132d87c8ec03c7f;hp=3bb8a32feba519b02b69ae1e13b0ff84a86155f4;hpb=3acb107b9ae4e3d38d3fcfd29b455ebcfb444696;p=openocd.git diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c index 3bb8a32feb..2967f0888e 100644 --- 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 * @@ -29,71 +32,74 @@ #include -int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr) +#if 0 +#define _ARM_JTAG_SCAN_N_CHECK_ +#endif + +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 (device==NULL) + return ERROR_FAIL; + if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr) { scan_field_t field; - + u8 t[4]; + field.device = jtag_info->chain_pos; field.num_bits = device->ir_length; - field.out_value = calloc(CEIL(field.num_bits, 8), 1); + 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 = NULL; + field.in_handler = handler; field.in_handler_priv = NULL; - jtag_add_ir_scan(1, &field, -1); - - free(field.out_value); } - + 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) { - 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); - + 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->chain_pos, + 1, + num_bits, + values, + -1); + 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; } @@ -103,13 +109,11 @@ 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 */ -int arm_jtag_buf_to_u32_flip(u8 *in_buf, void *priv) +int arm_jtag_buf_to_u32_flip(u8 *in_buf, void *priv, struct scan_field_s *field) { u32 *dest = priv; *dest = flip_u32(le_to_h_u32(in_buf), 32); @@ -117,35 +121,35 @@ int arm_jtag_buf_to_u32_flip(u8 *in_buf, void *priv) } /* read JTAG buffer into little-endian u32, flipping bit-order */ -int arm_jtag_buf_to_le32_flip(u8 *in_buf, void *priv) +int arm_jtag_buf_to_le32_flip(u8 *in_buf, void *priv, struct scan_field_s *field) { h_u32_to_le(((u8*)priv), flip_u32(le_to_h_u32(in_buf), 32)); return ERROR_OK; } /* read JTAG buffer into little-endian u16, flipping bit-order */ -int arm_jtag_buf_to_le16_flip(u8 *in_buf, void *priv) +int arm_jtag_buf_to_le16_flip(u8 *in_buf, void *priv, struct scan_field_s *field) { h_u16_to_le(((u8*)priv), flip_u32(le_to_h_u32(in_buf), 32) & 0xffff); return ERROR_OK; } /* read JTAG buffer into big-endian u32, flipping bit-order */ -int arm_jtag_buf_to_be32_flip(u8 *in_buf, void *priv) +int arm_jtag_buf_to_be32_flip(u8 *in_buf, void *priv, struct scan_field_s *field) { h_u32_to_be(((u8*)priv), flip_u32(le_to_h_u32(in_buf), 32)); return ERROR_OK; } /* read JTAG buffer into big-endian u16, flipping bit-order */ -int arm_jtag_buf_to_be16_flip(u8 *in_buf, void *priv) +int arm_jtag_buf_to_be16_flip(u8 *in_buf, void *priv, struct scan_field_s *field) { h_u16_to_be(((u8*)priv), flip_u32(le_to_h_u32(in_buf), 32) & 0xffff); return ERROR_OK; } /* read JTAG buffer into u8, flipping bit-order */ -int arm_jtag_buf_to_8_flip(u8 *in_buf, void *priv) +int arm_jtag_buf_to_8_flip(u8 *in_buf, void *priv, struct scan_field_s *field) { u8 *dest = priv; *dest = flip_u32(le_to_h_u32(in_buf), 32) & 0xff; @@ -154,7 +158,7 @@ int arm_jtag_buf_to_8_flip(u8 *in_buf, void *priv) /* not-flipping variants */ /* read JTAG buffer into host-endian u32 */ -int arm_jtag_buf_to_u32(u8 *in_buf, void *priv) +int arm_jtag_buf_to_u32(u8 *in_buf, void *priv, struct scan_field_s *field) { u32 *dest = priv; *dest = le_to_h_u32(in_buf); @@ -162,35 +166,35 @@ int arm_jtag_buf_to_u32(u8 *in_buf, void *priv) } /* read JTAG buffer into little-endian u32 */ -int arm_jtag_buf_to_le32(u8 *in_buf, void *priv) +int arm_jtag_buf_to_le32(u8 *in_buf, void *priv, struct scan_field_s *field) { h_u32_to_le(((u8*)priv), le_to_h_u32(in_buf)); return ERROR_OK; } /* read JTAG buffer into little-endian u16 */ -int arm_jtag_buf_to_le16(u8 *in_buf, void *priv) +int arm_jtag_buf_to_le16(u8 *in_buf, void *priv, struct scan_field_s *field) { h_u16_to_le(((u8*)priv), le_to_h_u32(in_buf) & 0xffff); return ERROR_OK; } /* read JTAG buffer into big-endian u32 */ -int arm_jtag_buf_to_be32(u8 *in_buf, void *priv) +int arm_jtag_buf_to_be32(u8 *in_buf, void *priv, struct scan_field_s *field) { h_u32_to_be(((u8*)priv), le_to_h_u32(in_buf)); return ERROR_OK; } /* read JTAG buffer into big-endian u16 */ -int arm_jtag_buf_to_be16(u8 *in_buf, void *priv) +int arm_jtag_buf_to_be16(u8 *in_buf, void *priv, struct scan_field_s *field) { h_u16_to_be(((u8*)priv), le_to_h_u32(in_buf) & 0xffff); return ERROR_OK; } /* read JTAG buffer into u8 */ -int arm_jtag_buf_to_8(u8 *in_buf, void *priv) +int arm_jtag_buf_to_8(u8 *in_buf, void *priv, struct scan_field_s *field) { u8 *dest = priv; *dest = le_to_h_u32(in_buf) & 0xff;