summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Nagy <robert@cvs.openbsd.org>2008-06-15 03:44:32 +0000
committerRobert Nagy <robert@cvs.openbsd.org>2008-06-15 03:44:32 +0000
commite2b288c5da87c94f6e35c274a8ff25c7000099fd (patch)
treea70269f76322491f2a9f9830fde3678ec5f2b67c
parent6674dd287eb43509ec3f0dd3ef3627b4c93520f1 (diff)
if we are trying to attach to ehci(4) notify the user to disable it
because it does not support isochronous transfers yet. we hope that we can remove this as soon as possible. discussed with deraadt@
-rw-r--r--sys/dev/usb/uvideo.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c
index d2ee8c5615d..13907588f6b 100644
--- a/sys/dev/usb/uvideo.c
+++ b/sys/dev/usb/uvideo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvideo.c,v 1.35 2008/06/13 18:04:56 mglocker Exp $ */
+/* $OpenBSD: uvideo.c,v 1.36 2008/06/15 03:44:31 robert Exp $ */
/*
* Copyright (c) 2008 Robert Nagy <robert@openbsd.org>
@@ -36,8 +36,11 @@
#include <sys/poll.h>
#include <uvm/uvm.h>
+#include <machine/bus.h>
+
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
+#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/uvideo.h>
@@ -320,6 +323,12 @@ uvideo_attach(struct device * parent, struct device * self, void *aux)
sc->sc_udev = uaa->device;
+ if (uaa->device->bus->usbrev == USBREV_2_0) {
+ printf("%s: ehci(4) does not support isochronous transfers "
+ "yet, disable it.\n", DEVNAME(sc));
+ return;
+ }
+
/* get the config descriptor */
cdesc = usbd_get_config_descriptor(sc->sc_udev);
if (cdesc == NULL) {