From 1f8518fef4f959dca96e9ce5bcff273222a427a8 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Wed, 7 Jan 2015 15:41:38 +0300 Subject: [PATCH] jtag/hla: output possible idcode candidates in case of mismatch Output a similar message to what we have on low-level JTAG adapters to avoid confusing users. Reported on IRC by chickensk. Change-Id: I96d58410ef715b966e32d79c0aacf38596c5eb3f Signed-off-by: Paul Fertser Reviewed-on: http://openocd.zylin.com/2451 Tested-by: jenkins Reviewed-by: Spencer Oliver --- src/jtag/hla/hla_interface.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c index ce914ea0c5..44a7fc69f8 100644 --- a/src/jtag/hla/hla_interface.c +++ b/src/jtag/hla/hla_interface.c @@ -92,8 +92,11 @@ int hl_interface_init_target(struct target *t) } if (found == 0) { - LOG_ERROR("hl_interface_init_target: target not found: idcode: 0x%08" PRIx32, - t->tap->idcode); + LOG_WARNING("UNEXPECTED idcode: 0x%08" PRIx32, t->tap->idcode); + for (ii = 0; ii < limit; ii++) + LOG_ERROR("expected %u of %u: 0x%08" PRIx32, ii + 1, limit, + t->tap->expected_ids[ii]); + return ERROR_FAIL; } -- 2.30.2