diff options
| author | Kenneth D. Merry <ken@FreeBSD.org> | 1999-12-11 23:00:44 +0000 |
|---|---|---|
| committer | Kenneth D. Merry <ken@FreeBSD.org> | 1999-12-11 23:00:44 +0000 |
| commit | 223b7a2363a4db325ba9c5c4a519e2d7a4374b77 (patch) | |
| tree | a48f8c7854ce1a39563940efdbd7cf1868b735b6 /sys/cam/scsi/scsi_cd.c | |
| parent | 1c5febb12cc8ee05a2ae2d182f4cc8609773ccdf (diff) | |
| download | src-223b7a2363a4db325ba9c5c4a519e2d7a4374b77.tar.gz src-223b7a2363a4db325ba9c5c4a519e2d7a4374b77.zip | |
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.
Notes
Notes:
svn path=/head/; revision=54451
Diffstat (limited to 'sys/cam/scsi/scsi_cd.c')
| -rw-r--r-- | sys/cam/scsi/scsi_cd.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index 4edc9d05770a..7513f4e52944 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 }, { |