Page MenuHomeFreeBSD
Files F135373293

D13823.id37716.diff
No OneTemporary
Actions

D13823.id37716.diff
View Options

Index: sys/conf/files.i386
===================================================================
--- sys/conf/files.i386
+++ sys/conf/files.i386
@@ -520,7 +520,6 @@
i386/ibcs2/ibcs2_xenix.c optional ibcs2
i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2
i386/ibcs2/imgact_coff.c optional ibcs2
-i386/isa/pmtimer.c optional pmtimer
i386/isa/prof_machdep.c optional profiling-routine
i386/linux/imgact_linux.c optional compat_linux
i386/linux/linux_dummy.c optional compat_linux
Index: sys/i386/bios/apm.c
===================================================================
--- sys/i386/bios/apm.c
+++ sys/i386/bios/apm.c
@@ -16,6 +16,32 @@
* Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*/
+/*-
+ * Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -205,7 +231,7 @@
apm_driver_version(int version)
{
struct apm_softc *sc = &apm_softc;
-
+
sc->bios.r.eax = (APM_BIOS << 8) | APM_DRVVERSION;
sc->bios.r.ebx = 0x0;
sc->bios.r.ecx = version;
@@ -220,28 +246,28 @@
return (1);
}
-
+
/* engage/disengage power management (APM 1.1 or later) */
static int
apm_engage_disengage_pm(int engage)
{
struct apm_softc *sc = &apm_softc;
-
+
sc->bios.r.eax = (APM_BIOS << 8) | APM_ENGAGEDISENGAGEPM;
sc->bios.r.ebx = PMDV_ALLDEV;
sc->bios.r.ecx = engage;
sc->bios.r.edx = 0;
return (apm_bioscall());
}
-
+
/* get PM event */
static u_int
apm_getevent(void)
{
struct apm_softc *sc = &apm_softc;
-
+
sc->bios.r.eax = (APM_BIOS << 8) | APM_GETPMEVENT;
-
+
sc->bios.r.ebx = 0;
sc->bios.r.ecx = 0;
sc->bios.r.edx = 0;
@@ -249,18 +275,18 @@
return (PMEV_NOEVENT);
return (sc->bios.r.ebx & 0xffff);
}
-
+
/* suspend entire system */
static int
apm_suspend_system(int state)
{
struct apm_softc *sc = &apm_softc;
-
+
sc->bios.r.eax = (APM_BIOS << 8) | APM_SETPWSTATE;
sc->bios.r.ebx = PMDV_ALLDEV;
sc->bios.r.ecx = state;
sc->bios.r.edx = 0;
-
+
if (apm_bioscall()) {
printf("Entire system suspend failure: errcode = %d\n",
0xff & (sc->bios.r.eax >> 8));
@@ -280,7 +306,7 @@
apm_display(int newstate)
{
struct apm_softc *sc = &apm_softc;
-
+
sc->bios.r.eax = (APM_BIOS << 8) | APM_SETPWSTATE;
sc->bios.r.ebx = PMDV_DISP0;
sc->bios.r.ecx = newstate ? PMST_APMENABLED:PMST_SUSPEND;
@@ -331,12 +357,10 @@
static struct apmhook *
apm_add_hook(struct apmhook **list, struct apmhook *ah)
{
- int s;
struct apmhook *p, *prev;
APM_DPRINT("Add hook \"%s\"\n", ah->ah_name);
- s = splhigh();
if (ah == NULL)
panic("illegal apm_hook!");
prev = NULL;
@@ -351,17 +375,14 @@
ah->ah_next = prev->ah_next;
prev->ah_next = ah;
}
- splx(s);
return ah;
}
static void
apm_del_hook(struct apmhook **list, struct apmhook *ah)
{
- int s;
struct apmhook *p, *prev;
- s = splhigh();
prev = NULL;
for (p = *list; p != NULL; prev = p, p = p->ah_next)
if (p == ah)
@@ -374,7 +395,6 @@
else
*list = p->ah_next;
nosuchnode:
- splx(s);
}
@@ -468,7 +488,7 @@
sc->standbys = sc->standby_countdown = 0;
/*
- * As far as standby, we don't need to execute
+ * As far as standby, we don't need to execute
* all of suspend hooks.
*/
if (apm_suspend_system(PMST_STANDBY) == 0)
@@ -1047,6 +1067,60 @@
} while (apm_event != PMEV_NOEVENT);
}
+static struct timeval suspend_time;
+static struct timeval diff_time;
+
+static int
+atc_rtc_suspend(void *arg __unused)
+{
+
+ microtime(&diff_time);
+ inittodr(0);
+ microtime(&suspend_time);
+ timevalsub(&diff_time, &suspend_time);
+ return (0);
+}
+
+static int
+atc_rtc_resume(void *arg __unused)
+{
+ u_int second, minute, hour;
+ struct timeval resume_time, tmp_time;
+
+ /* modified for adjkerntz */
+ timer_restore(); /* restore the all timers */
+ inittodr(0); /* adjust time to RTC */
+ microtime(&resume_time);
+ getmicrotime(&tmp_time);
+ timevaladd(&tmp_time, &diff_time);
+
+#ifdef FIXME
+ /* XXX THIS DOESN'T WORK!!! */
+ time = tmp_time;
+#endif
+
+#ifdef PMTIMER_FIXUP_CALLTODO
+ /* Calculate the delta time suspended */
+ timevalsub(&resume_time, &suspend_time);
+ /* Fixup the calltodo list with the delta time. */
+ adjust_timeout_calltodo(&resume_time);
+ /*
+ * We've already calculated resume_time to be the delta between
+ * the suspend and the resume.
+ */
+ second = resume_time.tv_sec;
+#else /* !PMTIMER_FIXUP_CALLTODO */
+ second = resume_time.tv_sec - suspend_time.tv_sec;
+#endif /* PMTIMER_FIXUP_CALLTODO */
+ hour = second / 3600;
+ second %= 3600;
+ minute = second / 60;
+ second %= 60;
+ log(LOG_NOTICE, "wakeup from sleeping state (slept %02d:%02d:%02d)\n",
+ hour, minute, second);
+ return (0);
+}
+
/*
* Attach APM:
*
@@ -1128,7 +1202,7 @@
}
/* Power the system off using APM */
- EVENTHANDLER_REGISTER(shutdown_final, apm_power_off, NULL,
+ EVENTHANDLER_REGISTER(shutdown_final, apm_power_off, NULL,
SHUTDOWN_PRI_LAST);
/* Register APM again to pass the correct argument of pm_func. */
@@ -1142,6 +1216,15 @@
UID_ROOT, GID_OPERATOR, 0664, "apm");
make_dev(&apm_cdevsw, APMDEV_CTL,
UID_ROOT, GID_OPERATOR, 0660, "apmctl");
+
+ sc->sc_suspend.ah_fun = apm_rtc_suspend;
+ sc->sc_suspend.ah_arg = sc;
+ apm_hook_establish(APM_HOOK_SUSPEND, &sc->sc_suspend);
+
+ sc->sc_resume.ah_fun = apm_rtc_suspend;
+ sc->sc_resume.ah_arg = sc;
+ apm_hook_establish(APM_HOOK_RESUME, &sc->sc_resume);
+
return 0;
}
Index: sys/i386/conf/GENERIC
===================================================================
--- sys/i386/conf/GENERIC
+++ sys/i386/conf/GENERIC
@@ -207,8 +207,6 @@
# Power management support (see NOTES for more options)
#device apm
-# Add suspend/resume support for the i8254.
-device pmtimer
# PCCARD (PCMCIA) support
# PCMCIA and cardbus bridge support
Index: sys/i386/conf/NOTES
===================================================================
--- sys/i386/conf/NOTES
+++ sys/i386/conf/NOTES
@@ -774,7 +774,6 @@
# smapi: System Management Application Program Interface driver
# smbios: DMI/SMBIOS entry point
# vpd: Vital Product Data kernel interface
-# pmtimer: Adjust system timer at wakeup time
# pbio: Parallel (8255 PPI) basic I/O (mode 0) port (e.g. Advantech PCL-724)
# asmc: Apple System Management Controller
# si: Specialix International SI/XIO or SX intelligent serial card driver
@@ -808,7 +807,6 @@
device smapi
device smbios
device vpd
-device pmtimer
device pbio
hint.pbio.0.at="isa"
hint.pbio.0.port="0x360"
Index: sys/i386/isa/pmtimer.c
===================================================================
--- sys/i386/isa/pmtimer.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2000 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/*
- * Timer device driver for power management events.
- * The code for suspend/resume is derived from APM device driver.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bus.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/power.h>
-#include <sys/syslog.h>
-#include <machine/clock.h>
-
-#include <isa/isavar.h>
-
-static devclass_t pmtimer_devclass;
-
-/* reject any PnP devices for now */
-static struct isa_pnp_id pmtimer_ids[] = {
- {0}
-};
-
-static void
-pmtimer_identify(driver_t *driver, device_t parent)
-{
- device_t child;
-
- /*
- * Only add a child if one doesn't exist already.
- */
- child = devclass_get_device(pmtimer_devclass, 0);
- if (child == NULL) {
- child = BUS_ADD_CHILD(parent, 0, "pmtimer", 0);
- if (child == NULL)
- panic("pmtimer_identify");
- }
-}
-
-static int
-pmtimer_probe(device_t dev)
-{
-
- if (ISA_PNP_PROBE(device_get_parent(dev), dev, pmtimer_ids) == ENXIO)
- return (ENXIO);
-
- /* only one instance always */
- return (device_get_unit(dev));
-}
-
-static struct timeval suspend_time;
-static struct timeval diff_time;
-
-static int
-pmtimer_suspend(device_t dev)
-{
-
- if (power_pm_get_type() == POWER_PM_TYPE_ACPI)
- return (0);
-
- microtime(&diff_time);
- inittodr(0);
- microtime(&suspend_time);
- timevalsub(&diff_time, &suspend_time);
- return (0);
-}
-
-static int
-pmtimer_resume(device_t dev)
-{
- u_int second, minute, hour;
- struct timeval resume_time, tmp_time;
-
- if (power_pm_get_type() == POWER_PM_TYPE_ACPI)
- return (0);
-
- /* modified for adjkerntz */
- timer_restore(); /* restore the all timers */
- inittodr(0); /* adjust time to RTC */
- microtime(&resume_time);
- getmicrotime(&tmp_time);
- timevaladd(&tmp_time, &diff_time);
-
-#ifdef FIXME
- /* XXX THIS DOESN'T WORK!!! */
- time = tmp_time;
-#endif
-
-#ifdef PMTIMER_FIXUP_CALLTODO
- /* Calculate the delta time suspended */
- timevalsub(&resume_time, &suspend_time);
- /* Fixup the calltodo list with the delta time. */
- adjust_timeout_calltodo(&resume_time);
- /*
- * We've already calculated resume_time to be the delta between
- * the suspend and the resume.
- */
- second = resume_time.tv_sec;
-#else /* !PMTIMER_FIXUP_CALLTODO */
- second = resume_time.tv_sec - suspend_time.tv_sec;
-#endif /* PMTIMER_FIXUP_CALLTODO */
- hour = second / 3600;
- second %= 3600;
- minute = second / 60;
- second %= 60;
- log(LOG_NOTICE, "wakeup from sleeping state (slept %02d:%02d:%02d)\n",
- hour, minute, second);
- return (0);
-}
-
-static device_method_t pmtimer_methods[] = {
- /* Device interface */
- DEVMETHOD(device_identify, pmtimer_identify),
- DEVMETHOD(device_probe, pmtimer_probe),
- DEVMETHOD(device_attach, bus_generic_attach),
- DEVMETHOD(device_suspend, pmtimer_suspend),
- DEVMETHOD(device_resume, pmtimer_resume),
- { 0, 0 }
-};
-
-static driver_t pmtimer_driver = {
- "pmtimer",
- pmtimer_methods,
- 1, /* no softc */
-};
-
-DRIVER_MODULE(pmtimer, isa, pmtimer_driver, pmtimer_devclass, 0, 0);

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 10, 5:41 AM (14 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25098570
Default Alt Text
D13823.id37716.diff (12 KB)

Event Timeline