From b4b314c1cabfe1d0c79c134ab65c5b3b0ca046f3 Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Wed, 15 Sep 2004 01:39:10 +0000 Subject: [PATCH] Convert timeout ==> callout_*. Note that ACPI doesn't support detach / unloading, therefore no callout_stop is used. --- sys/dev/acpica/acpi.c | 6 ++++-- sys/dev/acpica/acpivar.h | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 6010a71d25..fd05da470b 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.95.2.1 2003/08/22 20:49:20 jhb Exp $ - * $DragonFly: src/sys/dev/acpica/Attic/acpi.c,v 1.6 2004/05/19 22:52:40 dillon Exp $ + * $DragonFly: src/sys/dev/acpica/Attic/acpi.c,v 1.7 2004/09/15 01:39:10 joerg Exp $ */ #include "opt_acpi.h" @@ -332,6 +332,7 @@ acpi_attach(device_t dev) sc = device_get_softc(dev); bzero(sc, sizeof(*sc)); sc->acpi_dev = dev; + callout_init(&sc->acpi_sleep_timer); #ifdef ACPI_DEBUGGER debugpoint = getenv("debug.acpi.debugger"); @@ -1437,7 +1438,8 @@ acpi_SetSleepState(struct acpi_softc *sc, int state) } if (sc->acpi_sleep_disabled) - timeout(acpi_sleep_enable, (caddr_t)sc, hz * ACPI_MINIMUM_AWAKETIME); + callout_reset(&sc->acpi_sleep_timer, hz * ACPI_MINIMUM_AWAKETIME, + acpi_sleep_enable, sc); return_ACPI_STATUS(status); } diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index f0037460c4..7ed928fc46 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.43.2.1 2003/08/22 20:49:20 jhb Exp $ - * $DragonFly: src/sys/dev/acpica/Attic/acpivar.h,v 1.2 2004/02/13 00:25:17 joerg Exp $ + * $DragonFly: src/sys/dev/acpica/Attic/acpivar.h,v 1.3 2004/09/15 01:39:10 joerg Exp $ */ #include "bus_if.h" @@ -44,6 +44,7 @@ struct acpi_softc { device_t acpi_dev; dev_t acpi_dev_t; + struct callout acpi_sleep_timer; struct resource *acpi_irq; int acpi_irq_rid; void *acpi_irq_handle; -- 2.41.0