diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-05-23 03:23:02 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-05-23 03:23:02 +0000 |
| commit | 919eeefecc1cb34d2918ba0ee1c3624a9f326def (patch) | |
| tree | f7f71bbb26ba66851279c2e98da8ff38cf9bea6b /sys/dev/pci/uhci_pci.c | |
| parent | 9a602279ea7954459111471ffe3834823a8b9685 (diff) | |
ehci support; hacked into working shape by jonathon@gateway.zenbu.net
Diffstat (limited to 'sys/dev/pci/uhci_pci.c')
| -rw-r--r-- | sys/dev/pci/uhci_pci.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/dev/pci/uhci_pci.c b/sys/dev/pci/uhci_pci.c index 6b1a6f070ad..fe7b9ee38d4 100644 --- a/sys/dev/pci/uhci_pci.c +++ b/sys/dev/pci/uhci_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci_pci.c,v 1.15 2003/08/11 02:21:28 mickey Exp $ */ +/* $OpenBSD: uhci_pci.c,v 1.16 2004/05/23 03:23:00 deraadt Exp $ */ /* $NetBSD: uhci_pci.c,v 1.24 2002/10/02 16:51:58 thorpej Exp $ */ /* @@ -48,6 +48,7 @@ #include <machine/bus.h> #include <dev/pci/pcivar.h> +#include <dev/pci/usb_pci.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> @@ -63,6 +64,7 @@ int uhci_pci_detach(device_ptr_t, int); struct uhci_pci_softc { uhci_softc_t sc; + struct usb_pci sc_pci; pci_chipset_tag_t sc_pc; pcitag_t sc_tag; void *sc_ih; /* interrupt vectoring */ @@ -183,6 +185,7 @@ uhci_pci_attach(struct device *parent, struct device *self, void *aux) return; } + usb_pci_add(&sc->sc_pci, pa, &sc->sc.sc_bus); /* Attach usb device. */ sc->sc.sc_child = config_found((void *)sc, &sc->sc.sc_bus, usbctlprint); @@ -205,6 +208,7 @@ uhci_pci_detach(device_ptr_t self, int flags) bus_space_unmap(sc->sc.iot, sc->sc.ioh, sc->sc.sc_size); sc->sc.sc_size = 0; } + usb_pci_rem(&sc->sc_pci); return (0); } |