summaryrefslogtreecommitdiffstats
path: root/sys/scsi/cd.c
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/cd.c
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/cd.c')
-rw-r--r--sys/scsi/cd.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 6e79c6d..0db6bb4 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -14,7 +14,7 @@
*
* Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
*
- * $Id: cd.c,v 1.48 1995/12/08 11:18:38 julian Exp $
+ * $Id: cd.c,v 1.49 1995/12/08 23:22:17 phk Exp $
*/
#define SPLCD splbio
@@ -224,7 +224,11 @@ cdattach(struct scsi_link *sc_link)
* the command can get the sense back so that it can selectively log
* errors.
*/
- cd_get_parms(unit, SCSI_NOSLEEP | SCSI_NOMASK);
+ if (sc_link->quirks & CD_Q_NO_TOUCH) {
+ dp->disksize = 0;
+ } else {
+ cd_get_parms(unit, SCSI_NOSLEEP | SCSI_NOMASK);
+ }
if (dp->disksize) {
printf("cd present [%ld x %ld byte records]",
cd->params.disksize,
OpenPOWER on IntegriCloud