diff options
| author | Pedro Martelletto <pedro@cvs.openbsd.org> | 2006-12-09 21:06:13 +0000 |
|---|---|---|
| committer | Pedro Martelletto <pedro@cvs.openbsd.org> | 2006-12-09 21:06:13 +0000 |
| commit | 13e968d0c3b7210b933472ce85de8917ee590d74 (patch) | |
| tree | b5eb5a9f044049323a233fbed1a7bf98b236256b /sys/dev | |
| parent | 3f055c20b3b798807ed62d206317bdd536665199 (diff) | |
Add quirk for Sony DSC-W50 (which is UFI, not SCSI) and rearrange
umass_fixup_sony() a bit while there, okay krw@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/umass_quirks.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/usb/umass_quirks.c b/sys/dev/usb/umass_quirks.c index b383c56c0d6..57bdd34035c 100644 --- a/sys/dev/usb/umass_quirks.c +++ b/sys/dev/usb/umass_quirks.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass_quirks.c,v 1.22 2005/12/31 04:55:52 fgsch Exp $ */ +/* $OpenBSD: umass_quirks.c,v 1.23 2006/12/09 21:06:12 pedro Exp $ */ /* $NetBSD: umass_quirks.c,v 1.67 2004/06/28 07:49:16 mycroft Exp $ */ /* @@ -519,14 +519,14 @@ umass_fixup_sony(struct umass_softc *sc) id = usbd_get_interface_descriptor(sc->sc_iface); if (id->bInterfaceSubClass == 0xff) { dd = usbd_get_device_descriptor(sc->sc_udev); - - /* - * The Sony DSC-P41, rev 5.00 is really UFI. - */ - if (UGETW(dd->bcdDevice) == 0x500) + switch (UGETW(dd->bcdDevice)) { + case 0x600: /* Sony DSC-W50, rev 6.00 */ + case 0x500: /* Sony DSC-P41, rev 5.00 */ sc->sc_cmd = UMASS_CPROTO_UFI; - else + break; + default: sc->sc_cmd = UMASS_CPROTO_SCSI; + } } } |