summaryrefslogtreecommitdiff
path: root/sys/scsi/scsiconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/scsi/scsiconf.c')
-rw-r--r--sys/scsi/scsiconf.c198
1 files changed, 100 insertions, 98 deletions
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index f208f56e700..697a98966d1 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scsiconf.c,v 1.47 1996/01/12 11:32:37 pk Exp $ */
+/* $NetBSD: scsiconf.c,v 1.49 1996/02/18 20:32:43 mycroft Exp $ */
/*
* Copyright (c) 1994 Charles Hannum. All rights reserved.
@@ -51,6 +51,7 @@
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/device.h>
+#include <sys/cpu.h>
#include <scsi/scsi_all.h>
#include <scsi/scsiconf.h>
@@ -85,6 +86,7 @@ struct scsi_device probe_switch = {
int scsibusmatch __P((struct device *, void *, void *));
void scsibusattach __P((struct device *, struct device *, void *));
+int scsibussubmatch __P((struct device *, void *, void *));
struct cfdriver scsibuscd = {
NULL, "scsibus", scsibusmatch, scsibusattach, DV_DULL,
@@ -257,106 +259,106 @@ struct scsi_quirk_inquiry_pattern {
};
struct scsi_quirk_inquiry_pattern scsi_quirk_patterns[] = {
- {T_CDROM, T_REMOV,
- "CHINON ", "CD-ROM CDS-431 ", "", SDEV_NOLUNS},
- {T_CDROM, T_REMOV,
- "Chinon ", "CD-ROM CDS-525 ", "", SDEV_NOLUNS},
- {T_CDROM, T_REMOV,
- "CHINON ", "CD-ROM CDS-535 ", "", SDEV_NOLUNS},
- {T_CDROM, T_REMOV,
- "DENON ", "DRD-25X ", "V", SDEV_NOLUNS},
- {T_CDROM, T_REMOV,
- "IMS ", "CDD521/10 ", "2.06", SDEV_NOLUNS},
- {T_CDROM, T_REMOV,
- "MEDIAVIS", "CDR-H93MV ", "1.31", SDEV_NOLUNS},
- {T_CDROM, T_REMOV,
- "NEC ", "CD-ROM DRIVE:55 ", "", SDEV_NOLUNS},
- {T_CDROM, T_REMOV,
- "NEC ", "CD-ROM DRIVE:83 ", "", SDEV_NOLUNS},
- {T_CDROM, T_REMOV,
- "NEC ", "CD-ROM DRIVE:84 ", "", SDEV_NOLUNS},
- {T_CDROM, T_REMOV,
- "NEC ", "CD-ROM DRIVE:841", "", SDEV_NOLUNS},
- {T_CDROM, T_REMOV,
- "SONY ", "CD-ROM CDU-541 ", "", SDEV_NOLUNS},
- {T_CDROM, T_REMOV,
- "SONY ", "CD-ROM CDU-55S ", "", SDEV_NOLUNS},
- {T_CDROM, T_REMOV,
- "SONY ", "CD-ROM CDU-8003A", "", SDEV_NOLUNS},
- {T_CDROM, T_REMOV,
- "SONY ", "CD-ROM CDU-8012 ", "", SDEV_NOLUNS},
- {T_CDROM, T_REMOV,
- "TEAC ", "CD-ROM ", "1.06", SDEV_NOLUNS},
- {T_CDROM, T_REMOV,
- "TEXEL ", "CD-ROM ", "1.06", SDEV_NOLUNS},
- {T_CDROM, T_REMOV,
- "TEXEL ", "CD-ROM DM-XX24 K", "1.10", SDEV_NOLUNS},
-
- {T_DIRECT, T_FIXED,
- "EMULEX ", "MD21/S2 ESDI", "A00", SDEV_FORCELUNS},
- {T_DIRECT, T_FIXED,
- "MAXTOR ", "XT-3280 ", "", SDEV_NOLUNS},
- {T_DIRECT, T_FIXED,
- "MAXTOR ", "XT-4380S ", "", SDEV_NOLUNS},
- {T_DIRECT, T_FIXED,
- "MAXTOR ", "MXT-1240S ", "", SDEV_NOLUNS},
- {T_DIRECT, T_FIXED,
- "MAXTOR ", "XT-4170S ", "", SDEV_NOLUNS},
- {T_DIRECT, T_FIXED,
- "MAXTOR ", "XT-8760S ", "", SDEV_NOLUNS},
- {T_DIRECT, T_FIXED,
- "MAXTOR ", "LXT-213S ", "", SDEV_NOLUNS},
- {T_DIRECT, T_FIXED,
- "MAXTOR ", "LXT-213S SUN0207", "", SDEV_NOLUNS},
- {T_DIRECT, T_FIXED,
- "MST ", "SnapLink ", "", SDEV_NOLUNS},
- {T_DIRECT, T_FIXED,
- "QUANTUM ", "LPS525S ", "", SDEV_NOLUNS},
- {T_DIRECT, T_FIXED,
- "QUANTUM ", "P105S 910-10-94x", "", SDEV_NOLUNS},
- {T_DIRECT, T_FIXED,
- "QUANTUM ", "PD1225S ", "", SDEV_NOLUNS},
- {T_DIRECT, T_FIXED,
- "QUANTUM ", "PD210S SUN0207", "", SDEV_NOLUNS},
- {T_DIRECT, T_FIXED,
- "RODIME ", "RO3000S ", "", SDEV_NOLUNS},
- {T_DIRECT, T_FIXED,
- "SEAGATE ", "ST157N ", "", SDEV_NOLUNS},
- {T_DIRECT, T_FIXED,
- "SEAGATE ", "ST296 ", "", SDEV_NOLUNS},
- {T_DIRECT, T_FIXED,
- "SEAGATE ", "ST296N ", "", SDEV_NOLUNS},
- {T_DIRECT, T_FIXED,
- "TOSHIBA ", "MK538FB ", "6027", SDEV_NOLUNS},
+ {{T_CDROM, T_REMOV,
+ "CHINON ", "CD-ROM CDS-431 ", ""}, SDEV_NOLUNS},
+ {{T_CDROM, T_REMOV,
+ "Chinon ", "CD-ROM CDS-525 ", ""}, SDEV_NOLUNS},
+ {{T_CDROM, T_REMOV,
+ "CHINON ", "CD-ROM CDS-535 ", ""}, SDEV_NOLUNS},
+ {{T_CDROM, T_REMOV,
+ "DENON ", "DRD-25X ", "V"}, SDEV_NOLUNS},
+ {{T_CDROM, T_REMOV,
+ "IMS ", "CDD521/10 ", "2.06"}, SDEV_NOLUNS},
+ {{T_CDROM, T_REMOV,
+ "MEDIAVIS", "CDR-H93MV ", "1.31"}, SDEV_NOLUNS},
+ {{T_CDROM, T_REMOV,
+ "NEC ", "CD-ROM DRIVE:55 ", ""}, SDEV_NOLUNS},
+ {{T_CDROM, T_REMOV,
+ "NEC ", "CD-ROM DRIVE:83 ", ""}, SDEV_NOLUNS},
+ {{T_CDROM, T_REMOV,
+ "NEC ", "CD-ROM DRIVE:84 ", ""}, SDEV_NOLUNS},
+ {{T_CDROM, T_REMOV,
+ "NEC ", "CD-ROM DRIVE:841", ""}, SDEV_NOLUNS},
+ {{T_CDROM, T_REMOV,
+ "SONY ", "CD-ROM CDU-541 ", ""}, SDEV_NOLUNS},
+ {{T_CDROM, T_REMOV,
+ "SONY ", "CD-ROM CDU-55S ", ""}, SDEV_NOLUNS},
+ {{T_CDROM, T_REMOV,
+ "SONY ", "CD-ROM CDU-8003A", ""}, SDEV_NOLUNS},
+ {{T_CDROM, T_REMOV,
+ "SONY ", "CD-ROM CDU-8012 ", ""}, SDEV_NOLUNS},
+ {{T_CDROM, T_REMOV,
+ "TEAC ", "CD-ROM ", "1.06"}, SDEV_NOLUNS},
+ {{T_CDROM, T_REMOV,
+ "TEXEL ", "CD-ROM ", "1.06"}, SDEV_NOLUNS},
+ {{T_CDROM, T_REMOV,
+ "TEXEL ", "CD-ROM DM-XX24 K", "1.10"}, SDEV_NOLUNS},
+
+ {{T_DIRECT, T_FIXED,
+ "EMULEX ", "MD21/S2 ESDI", "A00"}, SDEV_FORCELUNS},
+ {{T_DIRECT, T_FIXED,
+ "MAXTOR ", "XT-3280 ", ""}, SDEV_NOLUNS},
+ {{T_DIRECT, T_FIXED,
+ "MAXTOR ", "XT-4380S ", ""}, SDEV_NOLUNS},
+ {{T_DIRECT, T_FIXED,
+ "MAXTOR ", "MXT-1240S ", ""}, SDEV_NOLUNS},
+ {{T_DIRECT, T_FIXED,
+ "MAXTOR ", "XT-4170S ", ""}, SDEV_NOLUNS},
+ {{T_DIRECT, T_FIXED,
+ "MAXTOR ", "XT-8760S ", ""}, SDEV_NOLUNS},
+ {{T_DIRECT, T_FIXED,
+ "MAXTOR ", "LXT-213S ", ""}, SDEV_NOLUNS},
+ {{T_DIRECT, T_FIXED,
+ "MAXTOR ", "LXT-213S SUN0207", ""}, SDEV_NOLUNS},
+ {{T_DIRECT, T_FIXED,
+ "MST ", "SnapLink ", ""}, SDEV_NOLUNS},
+ {{T_DIRECT, T_FIXED,
+ "QUANTUM ", "LPS525S ", ""}, SDEV_NOLUNS},
+ {{T_DIRECT, T_FIXED,
+ "QUANTUM ", "P105S 910-10-94x", ""}, SDEV_NOLUNS},
+ {{T_DIRECT, T_FIXED,
+ "QUANTUM ", "PD1225S ", ""}, SDEV_NOLUNS},
+ {{T_DIRECT, T_FIXED,
+ "QUANTUM ", "PD210S SUN0207", ""}, SDEV_NOLUNS},
+ {{T_DIRECT, T_FIXED,
+ "RODIME ", "RO3000S ", ""}, SDEV_NOLUNS},
+ {{T_DIRECT, T_FIXED,
+ "SEAGATE ", "ST157N ", ""}, SDEV_NOLUNS},
+ {{T_DIRECT, T_FIXED,
+ "SEAGATE ", "ST296 ", ""}, SDEV_NOLUNS},
+ {{T_DIRECT, T_FIXED,
+ "SEAGATE ", "ST296N ", ""}, SDEV_NOLUNS},
+ {{T_DIRECT, T_FIXED,
+ "TOSHIBA ", "MK538FB ", "6027"}, SDEV_NOLUNS},
/* XXX: QIC-36 tape behind Emulex adapter. Very broken. */
- {T_SEQUENTIAL, T_REMOV,
- " ", " ", " ", SDEV_NOLUNS},
- {T_SEQUENTIAL, T_REMOV,
- "CALIPER ", "CP150 ", "", SDEV_NOLUNS},
- {T_SEQUENTIAL, T_REMOV,
- "EXABYTE ", "EXB-8200 ", "", SDEV_NOLUNS},
- {T_SEQUENTIAL, T_REMOV,
- "SONY ", "SDT-2000 ", "2.09", SDEV_NOLUNS},
- {T_SEQUENTIAL, T_REMOV,
- "SONY ", "SDT-5000 ", "3.", SDEV_NOSYNCWIDE},
- {T_SEQUENTIAL, T_REMOV,
- "SONY ", "SDT-5200 ", "3.", SDEV_NOLUNS},
- {T_SEQUENTIAL, T_REMOV,
- "TANDBERG", " TDC 3600 ", "", SDEV_NOLUNS},
+ {{T_SEQUENTIAL, T_REMOV,
+ " ", " ", " "}, SDEV_NOLUNS},
+ {{T_SEQUENTIAL, T_REMOV,
+ "CALIPER ", "CP150 ", ""}, SDEV_NOLUNS},
+ {{T_SEQUENTIAL, T_REMOV,
+ "EXABYTE ", "EXB-8200 ", ""}, SDEV_NOLUNS},
+ {{T_SEQUENTIAL, T_REMOV,
+ "SONY ", "SDT-2000 ", "2.09"}, SDEV_NOLUNS},
+ {{T_SEQUENTIAL, T_REMOV,
+ "SONY ", "SDT-5000 ", "3."}, SDEV_NOSYNCWIDE},
+ {{T_SEQUENTIAL, T_REMOV,
+ "SONY ", "SDT-5200 ", "3."}, SDEV_NOLUNS},
+ {{T_SEQUENTIAL, T_REMOV,
+ "TANDBERG", " TDC 3600 ", ""}, SDEV_NOLUNS},
/* Following entry reported as a Tandberg 3600; ref. PR1933 */
- {T_SEQUENTIAL, T_REMOV,
- "ARCHIVE ", "VIPER 150 21247", "", SDEV_NOLUNS},
- {T_SEQUENTIAL, T_REMOV,
- "WANGTEK ", "5099ES SCSI", "", SDEV_NOLUNS},
- {T_SEQUENTIAL, T_REMOV,
- "WANGTEK ", "5150ES SCSI", "", SDEV_NOLUNS},
- {T_SEQUENTIAL, T_REMOV,
- "WangDAT ", "Model 1300 ", "02.4", SDEV_NOSYNCWIDE},
- {T_SEQUENTIAL, T_REMOV,
- "WangDAT ", "Model 2600 ", "01.7", SDEV_NOSYNCWIDE},
- {T_SEQUENTIAL, T_REMOV,
- "WangDAT ", "Model 3200 ", "02.2", SDEV_NOSYNCWIDE},
+ {{T_SEQUENTIAL, T_REMOV,
+ "ARCHIVE ", "VIPER 150 21247", ""}, SDEV_NOLUNS},
+ {{T_SEQUENTIAL, T_REMOV,
+ "WANGTEK ", "5099ES SCSI", ""}, SDEV_NOLUNS},
+ {{T_SEQUENTIAL, T_REMOV,
+ "WANGTEK ", "5150ES SCSI", ""}, SDEV_NOLUNS},
+ {{T_SEQUENTIAL, T_REMOV,
+ "WangDAT ", "Model 1300 ", "02.4"}, SDEV_NOSYNCWIDE},
+ {{T_SEQUENTIAL, T_REMOV,
+ "WangDAT ", "Model 2600 ", "01.7"}, SDEV_NOSYNCWIDE},
+ {{T_SEQUENTIAL, T_REMOV,
+ "WangDAT ", "Model 3200 ", "02.2"}, SDEV_NOSYNCWIDE},
};
/*