diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-07-09 19:14:42 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-07-09 19:14:42 +0000 |
| commit | 82aa2baa149f412a754c48771816d68f23ec69ea (patch) | |
| tree | 7f8545d4418077046e9b745e9e130b1e02af7baf /sys | |
| parent | 1b5f8876ef23cb77243b61461ac7342d11382de7 (diff) | |
from netbsd:
The Sony camera reports itself as a "disk", not a "simplified direct access"
device -- ergo, it is "SCSI", not "RBC".
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/umass_quirks.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/dev/usb/umass_quirks.c b/sys/dev/usb/umass_quirks.c index 25155b7e558..0e527fbdeee 100644 --- a/sys/dev/usb/umass_quirks.c +++ b/sys/dev/usb/umass_quirks.c @@ -1,5 +1,5 @@ -/* $OpenBSD: umass_quirks.c,v 1.12 2004/06/13 19:52:57 mickey Exp $ */ -/* $NetBSD: umass_quirks.c,v 1.39 2003/05/08 15:19:47 augustss Exp $ */ +/* $OpenBSD: umass_quirks.c,v 1.13 2004/07/09 19:14:41 deraadt Exp $ */ +/* $NetBSD: umass_quirks.c,v 1.67 2004/06/28 07:49:16 mycroft Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -127,7 +127,6 @@ Static const struct umass_quirk umass_quirks[] = { UMATCH_VENDOR_PRODUCT, NULL, NULL }, - { { USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ATAPI }, UMASS_WPROTO_BBB, UMASS_CPROTO_ISD_ATA, 0, @@ -135,7 +134,6 @@ Static const struct umass_quirk umass_quirks[] = { UMATCH_VENDOR_PRODUCT, NULL, NULL }, - { { USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_DRIVEV2_5 }, UMASS_WPROTO_BBB, UMASS_CPROTO_ISD_ATA, 0, @@ -502,9 +500,8 @@ umass_fixup_sony(struct umass_softc *sc) usb_interface_descriptor_t *id; id = usbd_get_interface_descriptor(sc->sc_iface); - if (id->bInterfaceSubClass == 0xff) { - sc->sc_cmd = UMASS_CPROTO_RBC; - } + if (id->bInterfaceSubClass == 0xff) + sc->sc_cmd = UMASS_CPROTO_SCSI; } Static void |