diff options
| author | hselasky <hselasky@FreeBSD.org> | 2011-12-14 00:28:54 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2011-12-14 00:28:54 +0000 |
| commit | 7076389cec83009f9046b6c6e2695fe340a63802 (patch) | |
| tree | 56520f5d0635d8db6259b372fff280b4e6288da5 /sys/dev/usb/controller/ohci_pci.c | |
| parent | 145914e3e7153161b6dd67fdcd58c7a8201845bc (diff) | |
| download | FreeBSD-src-7076389cec83009f9046b6c6e2695fe340a63802.zip FreeBSD-src-7076389cec83009f9046b6c6e2695fe340a63802.tar.gz | |
Implement better support for USB controller suspend and resume.
This patch should remove the need for kldunload of USB
controller drivers at suspend and kldload of USB controller
drivers at resume.
This patch also fixes some build issues in avr32dci.c
MFC after: 2 weeks
Diffstat (limited to 'sys/dev/usb/controller/ohci_pci.c')
| -rw-r--r-- | sys/dev/usb/controller/ohci_pci.c | 55 |
1 files changed, 20 insertions, 35 deletions
diff --git a/sys/dev/usb/controller/ohci_pci.c b/sys/dev/usb/controller/ohci_pci.c index c8690c9..864376b 100644 --- a/sys/dev/usb/controller/ohci_pci.c +++ b/sys/dev/usb/controller/ohci_pci.c @@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$"); #include <dev/usb/usb_pci.h> #include <dev/usb/controller/ohci.h> #include <dev/usb/controller/ohcireg.h> +#include "usb_if.h" #define PCI_OHCI_VENDORID_ACERLABS 0x10b9 #define PCI_OHCI_VENDORID_AMD 0x1022 @@ -92,28 +93,13 @@ __FBSDID("$FreeBSD$"); static device_probe_t ohci_pci_probe; static device_attach_t ohci_pci_attach; static device_detach_t ohci_pci_detach; -static device_suspend_t ohci_pci_suspend; -static device_resume_t ohci_pci_resume; +static usb_take_controller_t ohci_pci_take_controller; static int -ohci_pci_suspend(device_t self) +ohci_pci_take_controller(device_t self) { - ohci_softc_t *sc = device_get_softc(self); - int err; - - err = bus_generic_suspend(self); - if (err) { - return (err); - } - ohci_suspend(sc); - return (0); -} - -static int -ohci_pci_resume(device_t self) -{ - ohci_softc_t *sc = device_get_softc(self); - uint32_t reg, int_line; + uint32_t reg; + uint32_t int_line; if (pci_get_powerstate(self) != PCI_POWERSTATE_D0) { device_printf(self, "chip is in D%d mode " @@ -124,9 +110,6 @@ ohci_pci_resume(device_t self) pci_write_config(self, PCI_CBMEM, reg, 4); pci_write_config(self, PCIR_INTLINE, int_line, 4); } - ohci_resume(sc); - - bus_generic_resume(self); return (0); } @@ -381,20 +364,22 @@ ohci_pci_detach(device_t self) return (0); } -static driver_t ohci_driver = -{ +static device_method_t ohci_pci_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, ohci_pci_probe), + DEVMETHOD(device_attach, ohci_pci_attach), + DEVMETHOD(device_detach, ohci_pci_detach), + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + DEVMETHOD(usb_take_controller, ohci_pci_take_controller), + + DEVMETHOD_END +}; + +static driver_t ohci_driver = { .name = "ohci", - .methods = (device_method_t[]){ - /* device interface */ - DEVMETHOD(device_probe, ohci_pci_probe), - DEVMETHOD(device_attach, ohci_pci_attach), - DEVMETHOD(device_detach, ohci_pci_detach), - DEVMETHOD(device_suspend, ohci_pci_suspend), - DEVMETHOD(device_resume, ohci_pci_resume), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - - DEVMETHOD_END - }, + .methods = ohci_pci_methods, .size = sizeof(struct ohci_softc), }; |
