From owner-svn-src-all@FreeBSD.ORG  Tue Jan  6 09:03:02 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A46F71065686;
	Tue,  6 Jan 2009 09:03:02 +0000 (UTC)
	(envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 936828FC32;
	Tue,  6 Jan 2009 09:03:02 +0000 (UTC)
	(envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n06932bH026407;
	Tue, 6 Jan 2009 09:03:02 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n06932hZ026405;
	Tue, 6 Jan 2009 09:03:02 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <200901060903.n06932hZ026405@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Tue, 6 Jan 2009 09:03:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186808 - head/sys/dev/usb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2009 09:03:03 -0000

Author: trasz
Date: Tue Jan  6 09:03:02 2009
New Revision: 186808
URL: http://svn.freebsd.org/changeset/base/186808

Log:
  Add workaround for Parallels 4.0.  Without it, ehci and uhci drivers
  would fail to attach due to unsupported USB revision.  It should have
  no effect when running on a real hardware.
  
  Reviewed by:	imp
  Approved by:	rwatson (mentor)

Modified:
  head/sys/dev/usb/ehci_pci.c
  head/sys/dev/usb/uhci_pci.c

Modified: head/sys/dev/usb/ehci_pci.c
==============================================================================
--- head/sys/dev/usb/ehci_pci.c	Tue Jan  6 06:47:53 2009	(r186807)
+++ head/sys/dev/usb/ehci_pci.c	Tue Jan  6 09:03:02 2009	(r186808)
@@ -315,6 +315,14 @@ ehci_pci_attach(device_t self)
 			device_printf(self, "Quirk for CS5536 USB 2.0 enabled\n");
 			break;
 		}
+
+		/*
+		 * Quirk for Parallels Desktop 4.0.
+		 */
+		if (pci_get_devid(self) == PCI_EHCI_DEVICEID_ICH6) {
+			sc->sc_bus.usbrev = USBREV_2_0;
+			break;
+		}
 		sc->sc_bus.usbrev = USBREV_UNKNOWN;
 		return ENXIO;
 	case PCI_USBREV_2_0:

Modified: head/sys/dev/usb/uhci_pci.c
==============================================================================
--- head/sys/dev/usb/uhci_pci.c	Tue Jan  6 06:47:53 2009	(r186807)
+++ head/sys/dev/usb/uhci_pci.c	Tue Jan  6 09:03:02 2009	(r186808)
@@ -389,6 +389,12 @@ uhci_pci_attach(device_t self)
 		break;
 	}
 
+	/*
+	 * Quirk for Parallels Desktop 4.0.
+	 */
+	if (pci_get_devid(self) == PCI_UHCI_DEVICEID_ICH6_A)
+		sc->sc_bus.usbrev = USBREV_2_0;
+
 	err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_BIO,
 	    NULL, (driver_intr_t *) uhci_intr, sc, &sc->ih);
 	if (err) {