d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove ancient SCSI-2/3 mentioning.

Browse Source 
MFC after:	2 weeks
This commit is contained in:
Alexander Motin 2019-06-22 03:50:43 +00:00
parent a616b25342
commit b8038d7827
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=349287
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/cam/scsi/scsi_enc.c
View File

@ -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";

2
sys/cam/scsi/scsi_enc_internal.h
View File

@ -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