diff options
| author | n_hibma <n_hibma@FreeBSD.org> | 2000-05-14 17:25:33 +0000 |
|---|---|---|
| committer | n_hibma <n_hibma@FreeBSD.org> | 2000-05-14 17:25:33 +0000 |
| commit | 3e77629ca5af5fa1c96b3b870abc8e91023e978a (patch) | |
| tree | 3f45e05eb25be46e540c1f59e8612680d09b20cb /sys/dev/usb | |
| parent | 47d5b4051e7bac0ff16c116df992756c7ab288f3 (diff) | |
| download | FreeBSD-src-3e77629ca5af5fa1c96b3b870abc8e91023e978a.zip FreeBSD-src-3e77629ca5af5fa1c96b3b870abc8e91023e978a.tar.gz | |
Make some if's cleaner. Add a define for the Zip 250.
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/umass.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 0fbf2a5..2bee2ab 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -582,14 +582,16 @@ umass_match_proto(struct umass_softc *sc, usbd_interface_handle iface, /* Revisions < 1.28 do not handle the inerrupt endpoint * very well. */ - if (UGETW(dd->bcdDevice) < 0x128) + if (UGETW(dd->bcdDevice) < 0x128) { sc->proto = PROTO_UFI | PROTO_CBI; - else + } else { #if CBI_I sc->proto = PROTO_UFI | PROTO_CBI_I; #else sc->proto = PROTO_UFI | PROTO_CBI; #endif + } + /* * Revisions < 1.28 do not have the TEST UNIT READY command * Revisions == 1.28 have a broken TEST UNIT READY @@ -599,11 +601,9 @@ umass_match_proto(struct umass_softc *sc, usbd_interface_handle iface, sc->quirks |= RS_NO_CLEAR_UA; sc->transfer_speed = UMASS_FLOPPY_TRANSFER_SPEED; - return(UMATCH_VENDOR_PRODUCT_REV); + return(UMATCH_VENDOR_PRODUCT); } - - id = usbd_get_interface_descriptor(iface); if (id == NULL || id->bInterfaceClass != UCLASS_MASS) return(UMATCH_NONE); |
