From 4d88f024a614f699d5ce5673520762bcfdf96ce2 Mon Sep 17 00:00:00 2001 From: ntfreak Date: Mon, 4 Feb 2008 20:12:46 +0000 Subject: [PATCH] =?UTF-8?q?-=20fixes=20issue=20with=20reset=20and=20arm926?= =?UTF-8?q?ejs=20core.=20Thanks=20=C3=98yvind=20Harboe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.berlios.de/openocd/trunk@281 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/target/arm926ejs.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c index efead81b8..8a609b076 100644 --- a/src/target/arm926ejs.c +++ b/src/target/arm926ejs.c @@ -97,19 +97,19 @@ target_type_t arm926ejs_target = int arm926ejs_catch_broken_irscan(u8 *captured, void *priv, scan_field_t *field) { - u8 *in_value=field->in_check_value; - /* The ARM926EJ-S' instruction register is 4 bits wide */ - u8 t=*in_value & 0xf; - if ((t == 0x0f) || (t == 0x00)) + u8 t = *captured & 0xf; + u8 t2 = *field->in_check_value & 0xf; + if (t == t2) + { + return ERROR_OK; + } + else if ((t == 0x0f) || (t == 0x00)) { DEBUG("caught ARM926EJ-S invalid Capture-IR result after CP15 access"); return ERROR_OK; } - else - { - return ERROR_JTAG_QUEUE_FAILED; - } + return ERROR_JTAG_QUEUE_FAILED;; } int arm926ejs_read_cp15(target_t *target, u32 address, u32 *value)