diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-11-22 12:21:47 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-11-22 12:21:47 +0000 |
| commit | 3cbb66f10279e701483baa0550fb1f10355518e8 (patch) | |
| tree | cd1b20805133332747a4615b853c5e1493c6a6ab /sys/scsi/cd.c | |
| parent | 25b41c4af206222d719e77f7c86fe3a9cc8eac69 (diff) | |
SCSI devices are assumed to be T_FIXED unless they say otherwise.
cd(4) did not believe any T_FIXED device was its responsibility.
Thus when a USB CD forgot to mention that it is T_REMOV, it appeared
as uk(4).
Make cd(4) accept even T_FIXED devices that claim to be T_CDROM or
T_WORM.
Noticed and fix tested by Rene Maroufi. Closes PR #6513.
Diffstat (limited to 'sys/scsi/cd.c')
| -rw-r--r-- | sys/scsi/cd.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 75525012ee4..37ddf0529b4 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.196 2010/09/23 13:11:38 jsing Exp $ */ +/* $OpenBSD: cd.c,v 1.197 2010/11/22 12:21:46 krw Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -161,8 +161,12 @@ struct cfdriver cd_cd = { const struct scsi_inquiry_pattern cd_patterns[] = { {T_CDROM, T_REMOV, "", "", ""}, + {T_CDROM, T_FIXED, + "", "", ""}, {T_WORM, T_REMOV, "", "", ""}, + {T_WORM, T_FIXED, + "", "", ""}, {T_DIRECT, T_REMOV, "NEC CD-ROM DRIVE:260", "", ""}, #if 0 |