summaryrefslogtreecommitdiffstats
path: root/sys/cam/scsi
diff options
context:
space:
mode:
authorken <ken@FreeBSD.org>1999-12-11 23:00:44 +0000
committerken <ken@FreeBSD.org>1999-12-11 23:00:44 +0000
commit54d3cf85919a430985f1be197281c95751db133d (patch)
tree7421266a670c19d6838788ac352074571b20a0c8 /sys/cam/scsi
parent32eaf3a0df9a6ce0206890fe721bc7fa34aadc1e (diff)
downloadFreeBSD-src-54d3cf85919a430985f1be197281c95751db133d.zip
FreeBSD-src-54d3cf85919a430985f1be197281c95751db133d.tar.gz
Quirk all Pioneer changers as changers up front, instead of waiting for the
second LUN to show up. mjacob's change (which is correct) in rev 1.21 of cam_periph.c to elminiate infinite retries of the SCSI busy status bit seems to have broken probing of Pioneer changers that aren't already quirked. The right way to fix this is probably to change things around so we can guarantee 100% sequential probing of LUN-based changers even if they aren't quirked. This should fix things for now, though.
Diffstat (limited to 'sys/cam/scsi')
-rw-r--r--sys/cam/scsi/scsi_cd.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index 4edc9d0..7513f4e 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -142,8 +142,6 @@ struct cd_quirk_entry {
cd_quirks quirks;
};
-static const char pioneer[] = "PIONEER";
-
/*
* These quirk entries aren't strictly necessary. Basically, what they do
* is tell cdregister() up front that a device is a changer. Otherwise, it
@@ -159,11 +157,7 @@ static struct cd_quirk_entry cd_quirk_table[] =
/*quirks*/ CD_Q_CHANGER
},
{
- { T_CDROM, SIP_MEDIA_REMOVABLE, pioneer, "CD-ROM DRM-604X",
- "*"}, /* quirks */ CD_Q_CHANGER
- },
- {
- { T_CDROM, SIP_MEDIA_REMOVABLE, pioneer, "CD-ROM DRM-6324X",
+ { T_CDROM, SIP_MEDIA_REMOVABLE, "PIONEER", "CD-ROM DRM*",
"*"}, /* quirks */ CD_Q_CHANGER
},
{
OpenPOWER on IntegriCloud