diff options
| author | Nick Hibma <n_hibma@FreeBSD.org> | 1999-05-01 23:30:09 +0000 |
|---|---|---|
| committer | Nick Hibma <n_hibma@FreeBSD.org> | 1999-05-01 23:30:09 +0000 |
| commit | 1a7cfd07a3373bead83c7d436fc6632ad57c732c (patch) | |
| tree | f1d193f2e2ca19d19a4468da0fedbb52a32767eb | |
| parent | ff082a67dea4a4687899b043f5d8f2a4772cbe2b (diff) | |
Notes
| -rw-r--r-- | sys/dev/usb/uhci.c | 2 | ||||
| -rw-r--r-- | sys/dev/usb/uhci_pci.c | 17 | ||||
| -rw-r--r-- | sys/pci/uhci_pci.c | 17 |
3 files changed, 34 insertions, 2 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 713eb52d8ae3..e2dabc5b4885 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -319,7 +319,9 @@ uhci_init(sc) } uhci_run(sc, 0); /* stop the controller */ +#if defined(__NetBSD__) UWRITE2(sc, UHCI_INTR, 0); /* disable interrupts */ +#endif uhci_busreset(sc); diff --git a/sys/dev/usb/uhci_pci.c b/sys/dev/usb/uhci_pci.c index 4bddf8b32786..c00a6bf8b727 100644 --- a/sys/dev/usb/uhci_pci.c +++ b/sys/dev/usb/uhci_pci.c @@ -1,4 +1,4 @@ -/* FreeBSD $Id: uhci_pci.c,v 1.5 1999/04/11 14:24:20 n_hibma Exp $ */ +/* FreeBSD $Id: uhci_pci.c,v 1.6 1999/04/16 21:22:53 peter Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,6 +37,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ +/* Universal Host Controller Interface + * + * UHCI spec: http://www.intel.com/ + */ + +/* The low level controller code for UHCI has been split into + * PCI probes and UHCI specific code. This was done to facilitate the + * sharing of code between *BSD's + */ + #include "opt_bus.h" #include <sys/param.h> @@ -47,6 +57,9 @@ #include <sys/device.h> #include <sys/proc.h> #include <sys/queue.h> +#if defined(__FreeBSD__) +#include <machine/bus_pio.h> +#endif #include <machine/bus.h> #include <sys/rman.h> #include <machine/resource.h> @@ -135,6 +148,8 @@ uhci_pci_attach(device_t dev) sc->iot = rman_get_bustag(res); sc->ioh = rman_get_bushandle(res); + bus_space_write_2(sc->iot, sc->ioh, UHCI_INTR, 0); /* disable interrupts */ + rid = 0; res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, RF_SHAREABLE | RF_ACTIVE); diff --git a/sys/pci/uhci_pci.c b/sys/pci/uhci_pci.c index 4bddf8b32786..c00a6bf8b727 100644 --- a/sys/pci/uhci_pci.c +++ b/sys/pci/uhci_pci.c @@ -1,4 +1,4 @@ -/* FreeBSD $Id: uhci_pci.c,v 1.5 1999/04/11 14:24:20 n_hibma Exp $ */ +/* FreeBSD $Id: uhci_pci.c,v 1.6 1999/04/16 21:22:53 peter Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -37,6 +37,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ +/* Universal Host Controller Interface + * + * UHCI spec: http://www.intel.com/ + */ + +/* The low level controller code for UHCI has been split into + * PCI probes and UHCI specific code. This was done to facilitate the + * sharing of code between *BSD's + */ + #include "opt_bus.h" #include <sys/param.h> @@ -47,6 +57,9 @@ #include <sys/device.h> #include <sys/proc.h> #include <sys/queue.h> +#if defined(__FreeBSD__) +#include <machine/bus_pio.h> +#endif #include <machine/bus.h> #include <sys/rman.h> #include <machine/resource.h> @@ -135,6 +148,8 @@ uhci_pci_attach(device_t dev) sc->iot = rman_get_bustag(res); sc->ioh = rman_get_bushandle(res); + bus_space_write_2(sc->iot, sc->ioh, UHCI_INTR, 0); /* disable interrupts */ + rid = 0; res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, RF_SHAREABLE | RF_ACTIVE); |