From 3805e53fd89b34ec932b2993a14a727cd31f9e48 Mon Sep 17 00:00:00 2001 From: oharboe Date: Fri, 19 Dec 2008 19:45:01 +0000 Subject: [PATCH] Dick Hollenbeck better logging git-svn-id: svn://svn.berlios.de/openocd/trunk@1264 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/jtag/jtag.c | 4 ++-- src/jtag/jtag.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c index ef0b69529..16dbbd22f 100644 --- a/src/jtag/jtag.c +++ b/src/jtag/jtag.c @@ -1300,7 +1300,7 @@ int jtag_read_buffer(u8 *buffer, scan_command_t *cmd) { if (cmd->fields[i].in_handler(cmd->fields[i].in_value, cmd->fields[i].in_handler_priv, cmd->fields+i) != ERROR_OK) { - LOG_WARNING("in_handler reported a failed check"); + LOG_WARNING("in_handler: with \"in_value\", mismatch in %s", cmd->ir_scan ? "SIR" : "SDR" ); retval = ERROR_JTAG_QUEUE_FAILED; } } @@ -1314,7 +1314,7 @@ int jtag_read_buffer(u8 *buffer, scan_command_t *cmd) /* We're going to call the error:handler later, but if the in_handler * reported an error we report this failure upstream */ - LOG_WARNING("in_handler reported a failed check"); + LOG_WARNING("in_handler: w/o \"in_value\", mismatch in %s", cmd->ir_scan ? "SIR" : "SDR" ); retval = ERROR_JTAG_QUEUE_FAILED; } } diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index 9a2bc4237..82fa061bc 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -35,14 +35,14 @@ /* 16 Tap States, from page 21 of ASSET InterTech, Inc.'s svf.pdf */ -enum tap_state +typedef enum tap_state { TAP_RESET = 0x0, TAP_IDLE = 0x8, TAP_DRSELECT = 0x1, TAP_DRCAPTURE = 0x2, TAP_DRSHIFT = 0x3, TAP_DREXIT1 = 0x4, TAP_DRPAUSE = 0x5, TAP_DREXIT2 = 0x6, TAP_DRUPDATE = 0x7, TAP_IRSELECT = 0x9, TAP_IRCAPTURE = 0xa, TAP_IRSHIFT = 0xb, TAP_IREXIT1 = 0xc, TAP_IRPAUSE = 0xd, TAP_IREXIT2 = 0xe, TAP_IRUPDATE = 0xf -}; +} tap_state_t; typedef struct tap_transition_s { @@ -530,7 +530,7 @@ static __inline__ void jtag_add_dr_out(jtag_tap_t *tap, /** * Function jtag_state_name - * Returns a string suitable for display representing the JTAG tap_state + * Returns a string suitable for display representing the JTAG tap_state */ const char* jtag_state_name(enum tap_state state);