[Openocd-svn] r1264 - trunk/src/jtag

[<oh...@ma...>]

Author: oharboe
Date: 2008-12-19 20:45:01 +0100 (Fri, 19 Dec 2008)
New Revision: 1264

Modified:
   trunk/src/jtag/jtag.c
   trunk/src/jtag/jtag.h
Log:
Dick Hollenbeck <di...@so...> better logging

Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2008-12-19 19:41:58 UTC (rev 1263)
+++ trunk/src/jtag/jtag.c	2008-12-19 19:45:01 UTC (rev 1264)
@@ -1300,7 +1300,7 @@
 				{
 					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 @@
 					/* 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;
 				}
 			}

Modified: trunk/src/jtag/jtag.h
===================================================================
--- trunk/src/jtag/jtag.h	2008-12-19 19:41:58 UTC (rev 1263)
+++ trunk/src/jtag/jtag.h	2008-12-19 19:45:01 UTC (rev 1264)
@@ -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 @@
 
 /**
  * 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);