PERFORCE change 164398 for review

[Alexander Motin]

http://perforce.freebsd.org/chv.cgi?CH=164398

Change 164398 by mav at mav_mavbook on 2009/06/15 06:27:23

	Add CAM_ATA_STATUS_ERROR error.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam.c#7 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam.h#5 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#28 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam.c#7 (text+ko) ====

@@ -81,6 +81,7 @@
 	{ CAM_UNREC_HBA_ERROR,	 "Unrecoverable Host Bus Adapter Error"	     },
 	{ CAM_REQ_TOO_BIG,	 "The request was too large for this host"   },
 	{ CAM_REQUEUE_REQ,	 "Unconditionally Re-queue Request",	     },
+	{ CAM_ATA_STATUS_ERROR,	 "ATA Status Error"			     },
 	{ CAM_IDE,		 "Initiator Detected Error Message Received" },
 	{ CAM_RESRC_UNAVAIL,	 "Resource Unavailable"			     },
 	{ CAM_UNACKED_EVENT,	 "Unacknowledged Event by Host"		     },

==== //depot/projects/scottl-camlock/src/sys/cam/cam.h#5 (text+ko) ====

@@ -129,6 +129,7 @@
 				 * requests for the target at the sim level
 				 * back into the XPT queue.
 				 */
+	CAM_ATA_STATUS_ERROR,	/* ATA error, look at error code in CCB */
 	CAM_SCSI_IT_NEXUS_LOST,	/* Initiator/Target Nexus lost. */
 	CAM_IDE = 0x33,		/* Initiator Detected Error */
 	CAM_RESRC_UNAVAIL,	/* Resource Unavailable */

==== //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#28 (text+ko) ====

@@ -1584,6 +1584,13 @@
 		xpt_print(ccb->ccb_h.path, "AutoSense Failed\n");
 		error = EIO;	/* we have to kill the command */
 		break;
+	case CAM_ATA_STATUS_ERROR:
+		if (bootverbose && printed == 0) {
+			xpt_print(ccb->ccb_h.path,
+			    "Request completed with CAM_ATA_STATUS_ERROR\n");
+			printed++;
+		}
+		/* FALLTHROUGH */
 	case CAM_REQ_CMP_ERR:
 		if (bootverbose && printed == 0) {
 			xpt_print(ccb->ccb_h.path,