diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-07-22 18:03:08 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-07-22 18:03:08 +0000 |
| commit | 34000158948e98ee49c420f972f976ba32b58b69 (patch) | |
| tree | 07364ba3f072fcb96f83bb2a4befadb19c77e24d /sys | |
| parent | aca75566c86e7eadaa41a44dba9c17abe67e6f98 (diff) | |
Nuke SCSIFORCELUN* and friends. These were introduced as a safety
valve in case our duplicate LUN checks had to be circumvented. Since
no one has found a need for them, and they were just one more place
trying to shift a bit 255 places to the left could be induced, remove
them.
"i don't think any options like that are worthwhile" deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/scsi/scsiconf.c | 8 | ||||
| -rw-r--r-- | sys/scsi/scsiconf.h | 17 |
2 files changed, 2 insertions, 23 deletions
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index f2e60553df1..dfcec389ef8 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.c,v 1.107 2006/07/14 01:27:40 krw Exp $ */ +/* $OpenBSD: scsiconf.c,v 1.108 2006/07/22 18:03:07 krw Exp $ */ /* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */ /* @@ -90,9 +90,6 @@ int scsidebug_targets = SCSIDEBUG_TARGETS; int scsidebug_luns = SCSIDEBUG_LUNS; int scsidebug_level = SCSIDEBUG_LEVEL; -int scsiforcelun_buses = SCSIFORCELUN_BUSES; -int scsiforcelun_targets = SCSIFORCELUN_TARGETS; - int scsi_autoconf = SCSI_AUTOCONF; int scsibusprint(void *, const char *); @@ -608,9 +605,6 @@ scsi_probedev(struct scsibus_softc *scsi, int target, int lun) if (lun == 0 || scsi->sc_link[target][0] == NULL) ; - else if (((1 << sc_link->scsibus) & scsiforcelun_buses) && - ((1 << target) & scsiforcelun_targets)) - ; else if (sc_link->flags & SDEV_UMASS) ; else if (memcmp(&inqbuf, &scsi->sc_link[target][0]->inqdata, diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h index 270cd900ea9..57a320107d0 100644 --- a/sys/scsi/scsiconf.h +++ b/sys/scsi/scsiconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.h,v 1.69 2006/07/13 11:46:16 krw Exp $ */ +/* $OpenBSD: scsiconf.h,v 1.70 2006/07/22 18:03:07 krw Exp $ */ /* $NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $ */ /* @@ -96,21 +96,6 @@ struct scsi_link; extern int scsi_autoconf; /* - * Specify which buses and targets must scan all LUNs, even when IDENTIFY does - * not seem to be working. Some devices (e.g. some external RAID devices) may - * seem to have non-functional IDENTIFY because they return identical INQUIRY - * data for all LUNs. - */ -#ifndef SCSIFORCELUN_BUSES -#define SCSIFORCELUN_BUSES 0 -#endif -#ifndef SCSIFORCELUN_TARGETS -#define SCSIFORCELUN_TARGETS 0 -#endif - -extern int scsiforcelun_buses, scsiforcelun_targets; - -/* * These entrypoints are called by the high-end drivers to get services from * whatever low-end drivers they are attached to. Each adapter type has one * of these statically allocated. |