diff options
| author | mav <mav@FreeBSD.org> | 2017-01-05 11:39:54 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2017-01-05 11:39:54 +0000 |
| commit | f2970b71b52488e4cc93b04caa4a90cdfbc2a73e (patch) | |
| tree | c9e0ddcb3b681438f30cd4e3193adfa42763fa74 /sys/cam | |
| parent | 6b7d6f3c539e7460fc7ecb268868c5cdf0bf5d7f (diff) | |
| download | FreeBSD-src-f2970b71b52488e4cc93b04caa4a90cdfbc2a73e.zip FreeBSD-src-f2970b71b52488e4cc93b04caa4a90cdfbc2a73e.tar.gz | |
MFC r310339: Bump specifications support to SAM-6/SPC-5.
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/ctl/ctl.c | 10 | ||||
| -rw-r--r-- | sys/cam/scsi/scsi_all.h | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index cbf7467..2e7341c 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -10165,7 +10165,7 @@ ctl_inquiry_std(struct ctl_scsiio *ctsio) inq_ptr->device = (SID_QUAL_BAD_LU << 5) | T_NODEVICE; /* RMB in byte 2 is 0 */ - inq_ptr->version = SCSI_REV_SPC4; + inq_ptr->version = SCSI_REV_SPC5; /* * According to SAM-3, even if a device only supports a single @@ -10263,10 +10263,10 @@ ctl_inquiry_std(struct ctl_scsiio *ctsio) inq_ptr->spi3data = SID_SPI_CLOCK_DT_ST | SID_SPI_QAS | SID_SPI_IUS; - /* SAM-5 (no version claimed) */ - scsi_ulto2b(0x00A0, inq_ptr->version1); - /* SPC-4 (no version claimed) */ - scsi_ulto2b(0x0460, inq_ptr->version2); + /* SAM-6 (no version claimed) */ + scsi_ulto2b(0x00C0, inq_ptr->version1); + /* SPC-5 (no version claimed) */ + scsi_ulto2b(0x05C0, inq_ptr->version2); if (port_type == CTL_PORT_FC) { /* FCP-2 ANSI INCITS.350:2003 */ scsi_ulto2b(0x0917, inq_ptr->version3); diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h index a297498..bddf3c6 100644 --- a/sys/cam/scsi/scsi_all.h +++ b/sys/cam/scsi/scsi_all.h @@ -2129,6 +2129,7 @@ struct scsi_inquiry_data #define SCSI_REV_SPC2 4 #define SCSI_REV_SPC3 5 #define SCSI_REV_SPC4 6 +#define SCSI_REV_SPC5 7 #define SID_ECMA 0x38 #define SID_ISO 0xC0 |
