Deleted Added
full compact
ehci_pci.c (198501) ehci_pci.c (199057)
1/*-
2 * Copyright (c) 1998 The NetBSD Foundation, Inc.
3 * All rights reserved.
4 *
5 * This code is derived from software contributed to The NetBSD Foundation
6 * by Lennart Augustsson (augustss@carlstedt.se) at
7 * Carlstedt Research & Technology.
8 *

--- 22 unchanged lines hidden (view full) ---

31 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
32 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
33 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
34 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
35 * POSSIBILITY OF SUCH DAMAGE.
36 */
37
38#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1998 The NetBSD Foundation, Inc.
3 * All rights reserved.
4 *
5 * This code is derived from software contributed to The NetBSD Foundation
6 * by Lennart Augustsson (augustss@carlstedt.se) at
7 * Carlstedt Research & Technology.
8 *

--- 22 unchanged lines hidden (view full) ---

31 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
32 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
33 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
34 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
35 * POSSIBILITY OF SUCH DAMAGE.
36 */
37
38#include <sys/cdefs.h>
39__FBSDID("$FreeBSD: head/sys/dev/usb/controller/ehci_pci.c 198501 2009-10-26 21:47:16Z thompsa $");
39__FBSDID("$FreeBSD: head/sys/dev/usb/controller/ehci_pci.c 199057 2009-11-08 20:44:55Z thompsa $");
40
41/*
42 * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller.
43 *
44 * The EHCI 1.0 spec can be found at
45 * http://developer.intel.com/technology/usb/download/ehci-r10.pdf
46 * and the USB 2.0 spec at
47 * http://www.usb.org/developers/docs/usb_20.zip

--- 265 unchanged lines hidden (view full) ---

313 * NOTE: some EHCI USB controllers have the wrong USB
314 * revision number. It appears those controllers are
315 * fully compliant so we just ignore this value in
316 * some common cases.
317 */
318 device_printf(self, "pre-2.0 USB revision (ignored)\n");
319 /* fallthrough */
320 case PCI_USB_REV_2_0:
40
41/*
42 * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller.
43 *
44 * The EHCI 1.0 spec can be found at
45 * http://developer.intel.com/technology/usb/download/ehci-r10.pdf
46 * and the USB 2.0 spec at
47 * http://www.usb.org/developers/docs/usb_20.zip

--- 265 unchanged lines hidden (view full) ---

313 * NOTE: some EHCI USB controllers have the wrong USB
314 * revision number. It appears those controllers are
315 * fully compliant so we just ignore this value in
316 * some common cases.
317 */
318 device_printf(self, "pre-2.0 USB revision (ignored)\n");
319 /* fallthrough */
320 case PCI_USB_REV_2_0:
321 sc->sc_bus.usbrev = USB_REV_2_0;
322 break;
323 default:
324 /* Quirk for Parallels Desktop 4.0 */
325 device_printf(self, "USB revision is unknown. Assuming v2.0.\n");
321 break;
322 default:
323 /* Quirk for Parallels Desktop 4.0 */
324 device_printf(self, "USB revision is unknown. Assuming v2.0.\n");
326 sc->sc_bus.usbrev = USB_REV_2_0;
327 break;
325 break;
328 }
329
330 rid = PCI_CBMEM;
331 sc->sc_io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid,
332 RF_ACTIVE);
333 if (!sc->sc_io_res) {
334 device_printf(self, "Could not map memory\n");
335 goto error;

--- 241 unchanged lines hidden ---
326 }
327
328 rid = PCI_CBMEM;
329 sc->sc_io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid,
330 RF_ACTIVE);
331 if (!sc->sc_io_res) {
332 device_printf(self, "Could not map memory\n");
333 goto error;

--- 241 unchanged lines hidden ---