X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm_jtag.c;h=2db49e524b847b479eb076e441b93e9c73338cbb;hp=25eae9608f795b81b4a8fda5f9bdae1b8839c7e5;hb=e43979e7020ea9d05a3c0a2af444f292eacb6c53;hpb=526fe3d83e118d87af34353a7140c02f3f1a3c19 diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c index 25eae9608f..2db49e524b 100644 --- a/src/target/arm_jtag.c +++ b/src/target/arm_jtag.c @@ -2,7 +2,7 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * - * Copyright (C) 2007,2008 Øyvind Harboe * + * Copyright (C) 2007,2008 Øyvind Harboe * * oyvind.harboe@zylin.com * * * * This program is free software; you can redistribute it and/or modify * @@ -26,73 +26,83 @@ #include "arm_jtag.h" -#include "binarybuffer.h" -#include "log.h" -#include "jtag.h" - -#include #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) +int arm_jtag_set_instr(arm_jtag_t *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) + 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; - u8 t[4]; - - field.device = jtag_info->chain_pos; - field.num_bits = device->ir_length; + 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.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); + + + + if (no_verify_capture==NULL) + { + 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(arm_jtag_t *jtag_info, uint32_t new_scan_chain) { - if(jtag_info->cur_scan_chain != new_scan_chain) + int retval = ERROR_OK; + if (jtag_info->cur_scan_chain != new_scan_chain) { - u32 values[1]; + uint32_t values[1]; int num_bits[1]; - + values[0]=new_scan_chain; num_bits[0]=jtag_info->scann_size; - - arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL); - jtag_add_dr_out(jtag_info->chain_pos, + + 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, - -1); - + jtag_get_end_state()); + jtag_info->cur_scan_chain = new_scan_chain; } - - 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; } @@ -102,96 +112,94 @@ 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, struct scan_field_s *field) +/* read JTAG buffer into host-endian uint32_t, flipping bit-order */ +int arm_jtag_buf_to_u32_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field) { - u32 *dest = priv; + uint32_t *dest = priv; *dest = flip_u32(le_to_h_u32(in_buf), 32); return ERROR_OK; } -/* read JTAG buffer into little-endian u32, flipping bit-order */ -int arm_jtag_buf_to_le32_flip(u8 *in_buf, void *priv, struct scan_field_s *field) +/* read JTAG buffer into little-endian uint32_t, flipping bit-order */ +int arm_jtag_buf_to_le32_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field) { - h_u32_to_le(((u8*)priv), flip_u32(le_to_h_u32(in_buf), 32)); + h_u32_to_le(((uint8_t*)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, struct scan_field_s *field) +/* read JTAG buffer into little-endian uint16_t, flipping bit-order */ +int arm_jtag_buf_to_le16_flip(uint8_t *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); + h_u16_to_le(((uint8_t*)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, struct scan_field_s *field) +/* read JTAG buffer into big-endian uint32_t, flipping bit-order */ +int arm_jtag_buf_to_be32_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field) { - h_u32_to_be(((u8*)priv), flip_u32(le_to_h_u32(in_buf), 32)); + h_u32_to_be(((uint8_t*)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, struct scan_field_s *field) +/* read JTAG buffer into big-endian uint16_t, flipping bit-order */ +int arm_jtag_buf_to_be16_flip(uint8_t *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); + h_u16_to_be(((uint8_t*)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, struct scan_field_s *field) +/* read JTAG buffer into uint8_t, flipping bit-order */ +int arm_jtag_buf_to_8_flip(uint8_t *in_buf, void *priv, struct scan_field_s *field) { - u8 *dest = priv; + uint8_t *dest = priv; *dest = flip_u32(le_to_h_u32(in_buf), 32) & 0xff; return ERROR_OK; } /* not-flipping variants */ -/* read JTAG buffer into host-endian u32 */ -int arm_jtag_buf_to_u32(u8 *in_buf, void *priv, struct scan_field_s *field) +/* read JTAG buffer into host-endian uint32_t */ +int arm_jtag_buf_to_u32(uint8_t *in_buf, void *priv, struct scan_field_s *field) { - u32 *dest = priv; + uint32_t *dest = priv; *dest = le_to_h_u32(in_buf); return ERROR_OK; } -/* read JTAG buffer into little-endian u32 */ -int arm_jtag_buf_to_le32(u8 *in_buf, void *priv, struct scan_field_s *field) +/* read JTAG buffer into little-endian uint32_t */ +int arm_jtag_buf_to_le32(uint8_t *in_buf, void *priv, struct scan_field_s *field) { - h_u32_to_le(((u8*)priv), le_to_h_u32(in_buf)); + h_u32_to_le(((uint8_t*)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, struct scan_field_s *field) +/* read JTAG buffer into little-endian uint16_t */ +int arm_jtag_buf_to_le16(uint8_t *in_buf, void *priv, struct scan_field_s *field) { - h_u16_to_le(((u8*)priv), le_to_h_u32(in_buf) & 0xffff); + h_u16_to_le(((uint8_t*)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, struct scan_field_s *field) +/* read JTAG buffer into big-endian uint32_t */ +int arm_jtag_buf_to_be32(uint8_t *in_buf, void *priv, struct scan_field_s *field) { - h_u32_to_be(((u8*)priv), le_to_h_u32(in_buf)); + h_u32_to_be(((uint8_t*)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, struct scan_field_s *field) +/* read JTAG buffer into big-endian uint16_t */ +int arm_jtag_buf_to_be16(uint8_t *in_buf, void *priv, struct scan_field_s *field) { - h_u16_to_be(((u8*)priv), le_to_h_u32(in_buf) & 0xffff); + h_u16_to_be(((uint8_t*)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, struct scan_field_s *field) +/* read JTAG buffer into uint8_t */ +int arm_jtag_buf_to_8(uint8_t *in_buf, void *priv, struct scan_field_s *field) { - u8 *dest = priv; + uint8_t *dest = priv; *dest = le_to_h_u32(in_buf) & 0xff; return ERROR_OK; }