Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 7 Jul 2019 18:32:35 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r349816 - stable/12/sys/cam/scsi
Message-ID:  <201907071832.x67IWZ5g069399@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mav
Date: Sun Jul  7 18:32:34 2019
New Revision: 349816
URL: https://svnweb.freebsd.org/changeset/base/349816

Log:
  MFC r349287: Remove ancient SCSI-2/3 mentioning.

Modified:
  stable/12/sys/cam/scsi/scsi_enc.c
  stable/12/sys/cam/scsi/scsi_enc_internal.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/cam/scsi/scsi_enc.c
==============================================================================
--- stable/12/sys/cam/scsi/scsi_enc.c	Sun Jul  7 18:31:53 2019	(r349815)
+++ stable/12/sys/cam/scsi/scsi_enc.c	Sun Jul  7 18:32:34 2019	(r349816)
@@ -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: stable/12/sys/cam/scsi/scsi_enc_internal.h
==============================================================================
--- stable/12/sys/cam/scsi/scsi_enc_internal.h	Sun Jul  7 18:31:53 2019	(r349815)
+++ stable/12/sys/cam/scsi/scsi_enc_internal.h	Sun Jul  7 18:32:34 2019	(r349816)
@@ -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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907071832.x67IWZ5g069399>