diff options
| author | Paul Irofti <pirofti@cvs.openbsd.org> | 2009-11-23 01:33:09 +0000 |
|---|---|---|
| committer | Paul Irofti <pirofti@cvs.openbsd.org> | 2009-11-23 01:33:09 +0000 |
| commit | d35f3535dd91e047e8d26d34438cc4e0a6b1666d (patch) | |
| tree | 16169bb42088aa668322c33c05e9463783538d7e /sys/dev | |
| parent | a25a111db6a5fdbc1444fb27ec537c4393c713d7 (diff) | |
Fix pckbd and acpihpet suspend/resume cases to fit with the future framework
that's going to get in really soon.
Okay mlarkin@, deraadt@.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/acpi/acpihpet.c | 11 | ||||
| -rw-r--r-- | sys/dev/pckbc/pckbd.c | 12 |
2 files changed, 9 insertions, 14 deletions
diff --git a/sys/dev/acpi/acpihpet.c b/sys/dev/acpi/acpihpet.c index ff34331ddec..29c167471b3 100644 --- a/sys/dev/acpi/acpihpet.c +++ b/sys/dev/acpi/acpihpet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpihpet.c,v 1.9 2009/10/13 19:33:16 pirofti Exp $ */ +/* $OpenBSD: acpihpet.c,v 1.10 2009/11/23 01:33:08 pirofti Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -71,12 +71,9 @@ acpihpet_activate(struct device *self, int act) struct acpihpet_softc *sc = (struct acpihpet_softc *) self; switch(act) { - case DVACT_ACTIVATE: - if (!cold) - bus_space_write_4(sc->sc_iot, sc->sc_ioh, - HPET_CONFIGURATION, 1); - break; - case DVACT_DEACTIVATE: + case DVACT_RESUME: + bus_space_write_4(sc->sc_iot, sc->sc_ioh, + HPET_CONFIGURATION, 1); break; } diff --git a/sys/dev/pckbc/pckbd.c b/sys/dev/pckbc/pckbd.c index 6a4c833fc57..907a5f76262 100644 --- a/sys/dev/pckbc/pckbd.c +++ b/sys/dev/pckbc/pckbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pckbd.c,v 1.21 2009/10/13 19:33:16 pirofti Exp $ */ +/* $OpenBSD: pckbd.c,v 1.22 2009/11/23 01:33:08 pirofti Exp $ */ /* $NetBSD: pckbd.c,v 1.24 2000/06/05 22:20:57 sommerfeld Exp $ */ /*- @@ -418,13 +418,11 @@ int pckbd_activate(struct device *self, int act) { switch (act) { - case DVACT_ACTIVATE: - if (!cold) - pckbd_enable(self, 1); + case DVACT_RESUME: + pckbd_enable(self, 1); break; - case DVACT_DEACTIVATE: - if (!cold) - pckbd_enable(self, 0); + case DVACT_SUSPEND: + pckbd_enable(self, 0); break; } return (0); |