View | Details | Raw Unified | Return to bug 119668
Collapse All | Expand All

(-)sys/cam/scsi/scsi_all.h (+7 lines)
Lines 90-95 typedef enum { Link Here
90
					    * and text.
90
					    * and text.
91
					    */
91
					    */
92
	SSQ_PRINT_SENSE		= 0x0800,
92
	SSQ_PRINT_SENSE		= 0x0800,
93
	SSQ_PRINT_SENSE_VERBOSE	= 0x1000,
93
	SSQ_MASK		= 0xff00
94
	SSQ_MASK		= 0xff00
94
} scsi_sense_action_qualifier;
95
} scsi_sense_action_qualifier;
95
96
Lines 104-109 typedef enum { Link Here
104
105
105
/* Fatal error action, with table specified error code */
106
/* Fatal error action, with table specified error code */
106
#define SS_FATAL	SS_FAIL|SSQ_PRINT_SENSE
107
#define SS_FATAL	SS_FAIL|SSQ_PRINT_SENSE
108
109
/* Fatal error action, with table specified error code */
110
/* This type of error doesn't imply malfunction of hardware and
111
 * and indicates conditions that can occur in "normal" circumstances
112
 */
113
#define SS_FATAL_NORMAL	SS_FAIL|SSQ_PRINT_SENSE_VERBOSE
107
114
108
struct scsi_generic
115
struct scsi_generic
109
{
116
{
(-)sys/cam/scsi/scsi_all.c (-3 / +3 lines)
Lines 1102-1108 static struct asc_table_entry asc_table[ Link Here
1102
			"Persistent write protect") },
1102
			"Persistent write protect") },
1103
/*  T           */{SST(0x27, 0x05, SS_FATAL|EACCES,
1103
/*  T           */{SST(0x27, 0x05, SS_FATAL|EACCES,
1104
			"Permanent write protect") },
1104
			"Permanent write protect") },
1105
/* DTLPWRSOMCAE */{SST(0x28, 0x00, SS_FATAL|ENXIO,
1105
/* DTLPWRSOMCAE */{SST(0x28, 0x00, SS_FATAL_NORMAL|ENXIO,
1106
			"Not ready to ready change, medium may have changed") },
1106
			"Not ready to ready change, medium may have changed") },
1107
/* DTLPWRSOMCAE */{SST(0x28, 0x01, SS_FATAL|ENXIO,
1107
/* DTLPWRSOMCAE */{SST(0x28, 0x01, SS_FATAL|ENXIO,
1108
			"Import or export element accessed") },
1108
			"Import or export element accessed") },
Lines 1197-1203 static struct asc_table_entry asc_table[ Link Here
1197
			"Rounded parameter") },
1197
			"Rounded parameter") },
1198
/* DTL WRSOMCAE */{SST(0x39, 0x00, SS_RDEF,
1198
/* DTL WRSOMCAE */{SST(0x39, 0x00, SS_RDEF,
1199
			"Saving parameters not supported") },
1199
			"Saving parameters not supported") },
1200
/* DTL WRSOM    */{SST(0x3A, 0x00, SS_FATAL|ENXIO,
1200
/* DTL WRSOM    */{SST(0x3A, 0x00, SS_FATAL_NORMAL|ENXIO,
1201
			"Medium not present") },
1201
			"Medium not present") },
1202
/* DT  WR OM    */{SST(0x3A, 0x01, SS_FATAL|ENXIO,
1202
/* DT  WR OM    */{SST(0x3A, 0x01, SS_FATAL|ENXIO,
1203
			"Medium not present - tray closed") },
1203
			"Medium not present - tray closed") },
Lines 1395-1401 static struct asc_table_entry asc_table[ Link Here
1395
			"End of user area encountered on this track") },
1395
			"End of user area encountered on this track") },
1396
/*      R       */{SST(0x63, 0x01, SS_FATAL|ENOSPC,
1396
/*      R       */{SST(0x63, 0x01, SS_FATAL|ENOSPC,
1397
			"Packet does not fit in available space") },
1397
			"Packet does not fit in available space") },
1398
/*      R       */{SST(0x64, 0x00, SS_FATAL|ENXIO,
1398
/*      R       */{SST(0x64, 0x00, SS_FATAL_NORMAL|ENXIO,
1399
			"Illegal mode for this track") },
1399
			"Illegal mode for this track") },
1400
/*      R       */{SST(0x64, 0x01, SS_RDEF,
1400
/*      R       */{SST(0x64, 0x01, SS_RDEF,
1401
			"Invalid packet size") },
1401
			"Invalid packet size") },
(-)sys/cam/cam_periph.c (-1 / +2 lines)
Lines 1515-1521 camperiphscsisenseerror(union ccb *ccb, Link Here
1515
		}
1515
		}
1516
1516
1517
sense_error_done:
1517
sense_error_done:
1518
		if ((err_action & SSQ_PRINT_SENSE) != 0
1518
		if (((err_action & SSQ_PRINT_SENSE) != 0
1519
		    || ((err_action & SSQ_PRINT_SENSE_VERBOSE) != 0 && bootverbose))
1519
		 && (ccb->ccb_h.status & CAM_AUTOSNS_VALID) != 0) {
1520
		 && (ccb->ccb_h.status & CAM_AUTOSNS_VALID) != 0) {
1520
			cam_error_print(print_ccb, CAM_ESF_ALL, CAM_EPF_ALL);
1521
			cam_error_print(print_ccb, CAM_ESF_ALL, CAM_EPF_ALL);
1521
			xpt_print_path(ccb->ccb_h.path);
1522
			xpt_print_path(ccb->ccb_h.path);

Return to bug 119668