diff options
| author | joe <joe@FreeBSD.org> | 2002-01-02 18:28:45 +0000 |
|---|---|---|
| committer | joe <joe@FreeBSD.org> | 2002-01-02 18:28:45 +0000 |
| commit | cff14677d4168b96a21fef5ec1f1a19ae1572eb2 (patch) | |
| tree | 73a1b42d48a7391ee1d021784f4b2fe6d53da6e7 /sys/dev/usb/umass.c | |
| parent | cec7ec547befb842623ced03b548a9157a372ecf (diff) | |
| download | FreeBSD-src-cff14677d4168b96a21fef5ec1f1a19ae1572eb2.zip FreeBSD-src-cff14677d4168b96a21fef5ec1f1a19ae1572eb2.tar.gz | |
Sync with NetBSD:
date: 2000/02/29 21:37:01; author: augustss; state: Exp;
Distinguish between device and interface classes.
(I finally found a document that said that they were different.)
Diffstat (limited to 'sys/dev/usb/umass.c')
| -rw-r--r-- | sys/dev/usb/umass.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 8e939f9..e0d303a 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -662,7 +662,7 @@ umass_match_proto(struct umass_softc *sc, usbd_interface_handle iface, } id = usbd_get_interface_descriptor(iface); - if (id == NULL || id->bInterfaceClass != UCLASS_MASS) + if (id == NULL || id->bInterfaceClass != UICLASS_MASS) return(UMATCH_NONE); if (UGETW(dd->idVendor) == USB_VENDOR_SONY @@ -688,18 +688,18 @@ umass_match_proto(struct umass_softc *sc, usbd_interface_handle iface, } switch (id->bInterfaceSubClass) { - case USUBCLASS_SCSI: + case UISUBCLASS_SCSI: sc->proto |= PROTO_SCSI; break; - case USUBCLASS_UFI: + case UISUBCLASS_UFI: sc->transfer_speed = UMASS_FLOPPY_TRANSFER_SPEED; sc->proto |= PROTO_UFI; break; - case USUBCLASS_RBC: + case UISUBCLASS_RBC: sc->proto |= PROTO_RBC; break; - case USUBCLASS_SFF8020I: - case USUBCLASS_SFF8070I: + case UISUBCLASS_SFF8020I: + case UISUBCLASS_SFF8070I: sc->proto |= PROTO_ATAPI; break; default: @@ -709,20 +709,20 @@ umass_match_proto(struct umass_softc *sc, usbd_interface_handle iface, } switch (id->bInterfaceProtocol) { - case UPROTO_MASS_CBI: + case UIPROTO_MASS_CBI: sc->proto |= PROTO_CBI; break; - case UPROTO_MASS_CBI_I: + case UIPROTO_MASS_CBI_I: #if CBI_I sc->proto |= PROTO_CBI_I; #else sc->proto |= PROTO_CBI; #endif break; - case UPROTO_MASS_BBB: + case UIPROTO_MASS_BULK: sc->proto |= PROTO_BBB; break; - case UPROTO_MASS_BBB_P: + case UIPROTO_MASS_BULK_P: sc->drive = ZIP_100; sc->proto |= PROTO_BBB; sc->transfer_speed = UMASS_ZIP100_TRANSFER_SPEED; |
