Author: mav
Date: Sat Jun 22 03:50:43 2019
New Revision: 349287
URL: https://svnweb.freebsd.org/changeset/base/349287
Log:
Remove ancient SCSI-2/3 mentioning.
MFC after: 2 weeks
Modified:
head/sys/cam/scsi/scsi_enc.c
head/sys/cam/scsi/scsi_enc_internal.h
Modified: head/sys/cam/scsi/scsi_enc.c
==============================================================================
--- head/sys/cam/scsi/scsi_enc.c Sat Jun 22 03:16:01 2019
(r349286)
+++ head/sys/cam/scsi/scsi_enc.c Sat Jun 22 03:50:43 2019
(r349287)
@@ -684,14 +684,8 @@ enc_type(struct ccb_getdev *cgd)
buflen = min(sizeof(cgd->inq_data),
SID_ADDITIONAL_LENGTH(&cgd->inq_data));
- if ((iqd[0] & 0x1f) == T_ENCLOSURE) {
- if ((iqd[2] & 0x7) > 2) {
- return (ENC_SES);
- } else {
- return (ENC_SES_SCSI2);
- }
- return (ENC_NONE);
- }
+ if ((iqd[0] & 0x1f) == T_ENCLOSURE)
+ return (ENC_SES);
#ifdef SES_ENABLE_PASSTHROUGH
if ((iqd[6] & 0x40) && (iqd[2] & 0x7) >= 2) {
@@ -928,7 +922,6 @@ enc_ctor(struct cam_periph *periph, void *arg)
switch (enc->enc_type) {
case ENC_SES:
- case ENC_SES_SCSI2:
case ENC_SES_PASSTHROUGH:
case ENC_SEMB_SES:
err = ses_softc_init(enc);
@@ -1017,17 +1010,14 @@ enc_ctor(struct cam_periph *periph, void *arg)
case ENC_NONE:
tname = "No ENC device";
break;
- case ENC_SES_SCSI2:
- tname = "SCSI-2 ENC Device";
- break;
case ENC_SES:
- tname = "SCSI-3 ENC Device";
+ tname = "SES Device";
break;
case ENC_SES_PASSTHROUGH:
- tname = "ENC Passthrough Device";
+ tname = "SES Passthrough Device";
break;
case ENC_SAFT:
- tname = "SAF-TE Compliant Device";
+ tname = "SAF-TE Device";
break;
case ENC_SEMB_SES:
tname = "SEMB SES Device";
Modified: head/sys/cam/scsi/scsi_enc_internal.h
==============================================================================
--- head/sys/cam/scsi/scsi_enc_internal.h Sat Jun 22 03:16:01 2019
(r349286)
+++ head/sys/cam/scsi/scsi_enc_internal.h Sat Jun 22 03:50:43 2019
(r349287)
@@ -55,10 +55,8 @@ typedef struct enc_element {
typedef enum {
ENC_NONE,
- ENC_SES_SCSI2,
ENC_SES,
ENC_SES_PASSTHROUGH,
- ENC_SEN,
ENC_SAFT,
ENC_SEMB_SES,
ENC_SEMB_SAFT
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
