diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2004-07-17 06:04:01 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2004-07-17 06:04:01 +0000 |
| commit | 787c655aab246c31a56e5845f331297ef075a875 (patch) | |
| tree | 69fea798146739968761863603ef3f99c381f80a /sys/dev/usb/umass_quirks.c | |
| parent | cd1da93fdcb77629b53207e84d167d697e2a2b78 (diff) | |
from netbsd, umass.c 1.98, umassvar.h 1.20
log message:
Remove UMASS_QUIRK_NO_START_STOP and UMASS_QUIRK_NO_MAX_LUN.
We don't have UMASS_QUIRK_NO_START_STOP so I didn't have to remove it. I
consider umass_quirks.c to be too different so I hand removed references to
the removed defines. There are some useless entries in there now which will
be cleaned up after umass is merged with netbsd.
ok deraadt@
Diffstat (limited to 'sys/dev/usb/umass_quirks.c')
| -rw-r--r-- | sys/dev/usb/umass_quirks.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/usb/umass_quirks.c b/sys/dev/usb/umass_quirks.c index 0e527fbdeee..eaa0eb21303 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.13 2004/07/09 19:14:41 deraadt Exp $ */ +/* $OpenBSD: umass_quirks.c,v 1.14 2004/07/17 06:04:00 dlg Exp $ */ /* $NetBSD: umass_quirks.c,v 1.67 2004/06/28 07:49:16 mycroft Exp $ */ /* @@ -216,7 +216,7 @@ Static const struct umass_quirk umass_quirks[] = { { { USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_S304 }, UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC, - UMASS_QUIRK_NO_MAX_LUN, + 0, 0, UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO, NULL, NULL @@ -224,7 +224,7 @@ Static const struct umass_quirk umass_quirks[] = { { { USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_X }, UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC, - UMASS_QUIRK_NO_MAX_LUN, + 0, 0, UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO, NULL, NULL @@ -232,7 +232,7 @@ Static const struct umass_quirk umass_quirks[] = { { { USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_DIMAGEA1 }, UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC, - UMASS_QUIRK_NO_MAX_LUN, + 0, 0, UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO, NULL, NULL @@ -240,7 +240,7 @@ Static const struct umass_quirk umass_quirks[] = { { { USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY }, UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC, - UMASS_QUIRK_NO_MAX_LUN, + 0, PQUIRK_NOMODESENSE | PQUIRK_NODOORLOCK | PQUIRK_NOBIGMODESENSE, UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO, NULL, NULL @@ -248,7 +248,7 @@ Static const struct umass_quirk umass_quirks[] = { { { USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY2 }, UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC, - UMASS_QUIRK_NO_MAX_LUN, + 0, PQUIRK_NOMODESENSE | PQUIRK_NODOORLOCK | PQUIRK_NOBIGMODESENSE, UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO, NULL, NULL @@ -288,7 +288,7 @@ Static const struct umass_quirk umass_quirks[] = { { { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MD1II }, UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC, - UMASS_QUIRK_NO_MAX_LUN, + 0, PQUIRK_NOMODESENSE, UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO, NULL, NULL @@ -320,7 +320,7 @@ Static const struct umass_quirk umass_quirks[] = { { { USB_VENDOR_PEN, USB_PRODUCT_PEN_USBDISK }, UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC, - UMASS_QUIRK_NO_MAX_LUN, + 0, 0, UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO, NULL, NULL |