summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjoe <joe@FreeBSD.org>2002-01-02 18:36:46 +0000
committerjoe <joe@FreeBSD.org>2002-01-02 18:36:46 +0000
commit74053a381aecd25f92b2ac5493551e9d60b1d3bd (patch)
tree6346e3245a05609a53e073a9f7ba8f057a199584 /sys
parentcff14677d4168b96a21fef5ec1f1a19ae1572eb2 (diff)
downloadFreeBSD-src-74053a381aecd25f92b2ac5493551e9d60b1d3bd.zip
FreeBSD-src-74053a381aecd25f92b2ac5493551e9d60b1d3bd.tar.gz
Revert part of the last commit. UIPROTO_MASS_BBB was renamed to
UIPROTO_MASS_BULK _after_ the previous change was made in NetBSD.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/usb/umass.c4
-rw-r--r--sys/dev/usb/usb.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index e0d303a..e17fc50 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -719,10 +719,10 @@ umass_match_proto(struct umass_softc *sc, usbd_interface_handle iface,
sc->proto |= PROTO_CBI;
#endif
break;
- case UIPROTO_MASS_BULK:
+ case UIPROTO_MASS_BBB:
sc->proto |= PROTO_BBB;
break;
- case UIPROTO_MASS_BULK_P:
+ case UIPROTO_MASS_BBB_P:
sc->drive = ZIP_100;
sc->proto |= PROTO_BBB;
sc->transfer_speed = UMASS_ZIP100_TRANSFER_SPEED;
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index b61bc32..6b6ee31 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
@@ -384,8 +384,8 @@ typedef struct {
#define UISUBCLASS_SCSI 6
#define UIPROTO_MASS_CBI_I 0
#define UIPROTO_MASS_CBI 1
-#define UIPROTO_MASS_BULK 2
-#define UIPROTO_MASS_BULK_P 80 /* 'P' for the Iomega Zip drive */
+#define UIPROTO_MASS_BBB 2
+#define UIPROTO_MASS_BBB_P 80 /* 'P' for the Iomega Zip drive */
#define UICLASS_HUB 0x09
#define UISUBCLASS_HUB 0
OpenPOWER on IntegriCloud