diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-08-27 04:09:22 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-08-27 04:09:22 +0000 |
| commit | d387be6d508d997d7cd2ffeac58f75c47618216d (patch) | |
| tree | c5f66108585edf04cc43414ac9632c803e34db11 /sys/dev/usb | |
| parent | 787f4bab8db19e23ffad9ba4a801d990bf04121a (diff) | |
kill PWR_STANDBY (apm can use PWR_SUSPEND instead). While here, renumber
PWR_{SUSPEND,RESUME} so that they match the values of DAVCT_{SUSPEND,RESUME}
so that we can eventually (many more steps...) kill the powerhook garbage
and use the activate mechanism.
no objections
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/ehci.c | 3 | ||||
| -rw-r--r-- | sys/dev/usb/ohci.c | 3 | ||||
| -rw-r--r-- | sys/dev/usb/uhci.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index 4986271eb89..c64ada9f4ca 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci.c,v 1.106 2009/11/26 12:27:48 deraadt Exp $ */ +/* $OpenBSD: ehci.c,v 1.107 2010/08/27 04:09:20 deraadt Exp $ */ /* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */ /* @@ -1074,7 +1074,6 @@ ehci_power(int why, void *v) s = splhardusb(); switch (why) { case PWR_SUSPEND: - case PWR_STANDBY: sc->sc_bus.use_polling++; for (i = 1; i <= sc->sc_noport; i++) { diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index b73a1be666c..713b5a9344d 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci.c,v 1.95 2010/05/01 19:43:57 jsg Exp $ */ +/* $OpenBSD: ohci.c,v 1.96 2010/08/27 04:09:20 deraadt Exp $ */ /* $NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $ */ /* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */ @@ -997,7 +997,6 @@ ohci_power(int why, void *v) s = splhardusb(); switch (why) { case PWR_SUSPEND: - case PWR_STANDBY: sc->sc_bus.use_polling++; reg = OREAD4(sc, OHCI_CONTROL) & ~OHCI_HCFS_MASK; if (sc->sc_control == 0) { diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index c3adf3c8b1b..a179b25c21c 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci.c,v 1.75 2010/05/01 19:43:57 jsg Exp $ */ +/* $OpenBSD: uhci.c,v 1.76 2010/08/27 04:09:21 deraadt Exp $ */ /* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -697,7 +697,6 @@ uhci_power(int why, void *v) switch (why) { case PWR_SUSPEND: - case PWR_STANDBY: #ifdef UHCI_DEBUG if (uhcidebug > 2) uhci_dumpregs(sc); |