From e2b288c5da87c94f6e35c274a8ff25c7000099fd Mon Sep 17 00:00:00 2001
From: Robert Nagy <robert@cvs.openbsd.org>
Date: Sun, 15 Jun 2008 03:44:32 +0000
Subject: 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@

---
 sys/dev/usb/uvideo.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'sys/dev/usb/uvideo.c')

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) {
-- 
cgit v1.2.3