summaryrefslogtreecommitdiffstats
path: root/sys/scsi/scsiconf.h
diff options
context:
space:
mode:
authorjulian <julian@FreeBSD.org>1995-12-10 10:58:30 +0000
committerjulian <julian@FreeBSD.org>1995-12-10 10:58:30 +0000
commit2bdd745e5fbfb56190329a4e00ced6207c58f408 (patch)
tree901332a03465b75aef3a5b8360409d40a844ff2c /sys/scsi/scsiconf.h
parent87e768602b8616e6c6fa0e0bb6e816c9f6b0dd55 (diff)
downloadFreeBSD-src-2bdd745e5fbfb56190329a4e00ced6207c58f408.zip
FreeBSD-src-2bdd745e5fbfb56190329a4e00ced6207c58f408.tar.gz
Make NEW_SCSICONF the default way of doing things
It will need to be changed but it's the better starting point.. also add '?' to wildcarding in SCSI identification of devices.. so we can catch all PIONEER CD 6??* devices instead of having separate entries for the 600, 602, 604X, 624X etc.. it's getting so we should have a small regexp routine in the kernel maybe just a little one.. matching CDX-6[0-9][0-9][ A-Z] would be better there will be drastic changes in this but this is the best starting point..
Diffstat (limited to 'sys/scsi/scsiconf.h')
-rw-r--r--sys/scsi/scsiconf.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h
index e637a53..cfa53a7 100644
--- a/sys/scsi/scsiconf.h
+++ b/sys/scsi/scsiconf.h
@@ -14,7 +14,7 @@
*
* Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
*
- * $Id: scsiconf.h,v 1.31 1995/11/21 12:55:01 bde Exp $
+ * $Id: scsiconf.h,v 1.32 1995/12/05 07:14:25 julian Exp $
*/
#ifndef SCSI_SCSICONF_H
#define SCSI_SCSICONF_H 1
@@ -232,7 +232,6 @@ extern struct scsi_device_config scsi_dinit[];
#endif
-#ifdef NEW_SCSICONF
/*
* Define various devices that we know mis-behave in some way,
* and note how they are bad, so we can correct for them
@@ -272,7 +271,9 @@ typedef struct st_mode st_modes[4];
#define SD_Q_NO_FAST SCSI_Q_NO_FAST
#define SD_Q_NO_WIDE SCSI_Q_NO_WIDE
-#endif
+/* cd specific CD_Q_* */
+#define CD_Q_NO_TOUCH 0x0001
+
/*
* This structure describes the connection between an adapter driver and
@@ -487,7 +488,6 @@ void ukinit __P((void));
#define SCSI_EXTERNALLEN (sizeof(struct scsi_link))
-#ifdef NEW_SCSICONF
/* XXX This belongs in a tape file.
*/
@@ -552,7 +552,8 @@ void ukinit __P((void));
#define QIC_1320 0x12
#define DDS 0x13
#define DAT_1 0x13
-#endif /* NEW_SCSICONF */
+#define QIC_3080 0x29
+
/* XXX (dufault@hda.com) This is used only by "su" and "sctarg".
* The minor number field conflicts with the disk slice code,
OpenPOWER on IntegriCloud