summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/i386/apm/apm.c87
-rw-r--r--sys/i386/bios/apm.c87
-rw-r--r--sys/i386/include/apm_bios.h29
3 files changed, 140 insertions, 63 deletions
diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c
index 8815143..39c1601 100644
--- a/sys/i386/apm/apm.c
+++ b/sys/i386/apm/apm.c
@@ -15,7 +15,7 @@
*
* Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $Id: apm.c,v 1.63 1997/11/04 17:37:52 nate Exp $
+ * $Id: apm.c,v 1.64 1997/11/10 14:38:08 nate Exp $
*/
#include <sys/param.h>
@@ -37,7 +37,7 @@
#include <i386/apm/apm_setup.h>
static int apm_display __P((int newstate));
-static int apm_int __P((u_long *eax, u_long *ebx, u_long *ecx));
+static int apm_int __P((u_long *eax, u_long *ebx, u_long *ecx, u_long *edx));
static void apm_resume __P((void));
/* static data */
@@ -109,8 +109,8 @@ struct addr48 {
static int apm_errno;
-int
-apm_int(u_long *eax, u_long *ebx, u_long *ecx)
+static int
+apm_int(u_long *eax, u_long *ebx, u_long *ecx, u_long *edx)
{
struct apm_bios_arg apa;
int cf;
@@ -118,10 +118,12 @@ apm_int(u_long *eax, u_long *ebx, u_long *ecx)
apa.eax = *eax;
apa.ebx = *ebx;
apa.ecx = *ecx;
+ apa.edx = *edx;
cf = apm_bios_call(&apa);
*eax = apa.eax;
*ebx = apa.ebx;
*ecx = apa.ecx;
+ *edx = apa.edx;
apm_errno = ((*eax) >> 8) & 0xff;
return cf;
}
@@ -133,7 +135,7 @@ apm_enable_disable_pm(int enable)
{
struct apm_softc *sc = &apm_softc;
- u_long eax, ebx, ecx;
+ u_long eax, ebx, ecx, edx;
eax = (APM_BIOS << 8) | APM_ENABLEDISABLEPM;
@@ -142,19 +144,19 @@ apm_enable_disable_pm(int enable)
else
ebx = 0xffff; /* APM version 1.0 only */
ecx = enable;
- return apm_int(&eax, &ebx, &ecx);
+ return apm_int(&eax, &ebx, &ecx, &edx);
}
static void
apm_driver_version(int version)
{
- u_long eax, ebx, ecx;
+ u_long eax, ebx, ecx, edx;
/* First try APM 1.2 */
eax = (APM_BIOS << 8) | APM_DRVVERSION;
ebx = 0x0;
ecx = version;
- if(!apm_int(&eax, &ebx, &ecx))
+ if(!apm_int(&eax, &ebx, &ecx, &edx))
apm_version = eax & 0xffff;
}
@@ -162,25 +164,25 @@ apm_driver_version(int version)
static int
apm_engage_disengage_pm(int engage)
{
- u_long eax, ebx, ecx;
+ u_long eax, ebx, ecx, edx;
eax = (APM_BIOS << 8) | APM_ENGAGEDISENGAGEPM;
ebx = PMDV_ALLDEV;
ecx = engage;
- return(apm_int(&eax, &ebx, &ecx));
+ return(apm_int(&eax, &ebx, &ecx, &edx));
}
/* get PM event */
static u_int
apm_getevent(void)
{
- u_long eax, ebx, ecx;
+ u_long eax, ebx, ecx, edx;
eax = (APM_BIOS << 8) | APM_GETPMEVENT;
ebx = 0;
ecx = 0;
- if (apm_int(&eax, &ebx, &ecx))
+ if (apm_int(&eax, &ebx, &ecx, &edx))
return PMEV_NOEVENT;
return ebx & 0xffff;
@@ -190,13 +192,13 @@ apm_getevent(void)
static int
apm_suspend_system(void)
{
- u_long eax, ebx, ecx;
+ u_long eax, ebx, ecx, edx;
eax = (APM_BIOS << 8) | APM_SETPWSTATE;
ebx = PMDV_ALLDEV;
ecx = PMST_SUSPEND;
- if (apm_int(&eax, &ebx, &ecx)) {
+ if (apm_int(&eax, &ebx, &ecx, &edx)) {
printf("Entire system suspend failure: errcode = %ld\n",
0xff & (eax >> 8));
return 1;
@@ -213,12 +215,12 @@ apm_suspend_system(void)
static int
apm_display(int newstate)
{
- u_long eax, ebx, ecx;
+ u_long eax, ebx, ecx, edx;
eax = (APM_BIOS << 8) | APM_SETPWSTATE;
ebx = PMDV_DISP0;
ecx = newstate ? PMST_APMENABLED:PMST_SUSPEND;
- if (apm_int(&eax, &ebx, &ecx)) {
+ if (apm_int(&eax, &ebx, &ecx, &edx)) {
printf("Display off failure: errcode = %ld\n",
0xff & (eax >> 8));
return 1;
@@ -232,14 +234,14 @@ apm_display(int newstate)
void
apm_power_off(void)
{
- u_long eax, ebx, ecx;
+ u_long eax, ebx, ecx, edx;
if (!apm_softc.active)
return;
eax = (APM_BIOS << 8) | APM_SETPWSTATE;
ebx = PMDV_ALLDEV;
ecx = PMST_OFF;
- apm_int(&eax, &ebx, &ecx);
+ apm_int(&eax, &ebx, &ecx, &edx);
}
/* APM Battery low handler */
@@ -426,21 +428,30 @@ static int
apm_get_info(apm_info_t aip)
{
struct apm_softc *sc = &apm_softc;
- u_long eax, ebx, ecx;
+ u_long eax, ebx, ecx, edx;
eax = (APM_BIOS << 8) | APM_GETPWSTATUS;
ebx = PMDV_ALLDEV;
ecx = 0;
- if (apm_int(&eax, &ebx, &ecx))
+ if (apm_int(&eax, &ebx, &ecx, &edx))
return 1;
- aip->ai_acline = (ebx >> 8) & 0xff;
- aip->ai_batt_stat = ebx & 0xff;
- aip->ai_batt_life = ecx & 0xff;
- aip->ai_major = (u_int)sc->majorversion;
- aip->ai_minor = (u_int)sc->minorversion;
- aip->ai_status = (u_int)sc->active;
+ aip->ai_infoversion = 0;
+ aip->ai_acline = (ebx >> 8) & 0xff;
+ aip->ai_batt_stat = ebx & 0xff;
+ aip->ai_batt_life = ecx & 0xff;
+ aip->ai_major = (u_int)sc->majorversion;
+ aip->ai_minor = (u_int)sc->minorversion;
+ aip->ai_status = (u_int)sc->active;
+ edx &= 0xffff;
+ if (edx == 0xffff) /* Time is unknown */
+ aip->ai_batt_time = -1;
+ else if (edx & 0x8000) /* Time is in minutes */
+ aip->ai_batt_time = (edx & 0x7fff) * 60;
+ else /* Time is in seconds */
+ aip->ai_batt_time = edx;
+ bzero(aip->ai_spare, sizeof aip->ai_spare);
return 0;
}
@@ -453,11 +464,11 @@ apm_cpu_idle(void)
struct apm_softc *sc = &apm_softc;
if (sc->active) {
- u_long eax, ebx, ecx;
+ u_long eax, ebx, ecx, edx;
eax = (APM_BIOS <<8) | APM_CPUIDLE;
ecx = ebx = 0;
- apm_int(&eax, &ebx, &ecx);
+ apm_int(&eax, &ebx, &ecx, &edx);
}
/*
* Some APM implementation halts CPU in BIOS, whenever
@@ -485,11 +496,11 @@ apm_cpu_busy(void)
* necessary.
*/
if (sc->slow_idle_cpu && sc->active) {
- u_long eax, ebx, ecx;
+ u_long eax, ebx, ecx, edx;
eax = (APM_BIOS <<8) | APM_CPUBUSY;
ecx = ebx = 0;
- apm_int(&eax, &ebx, &ecx);
+ apm_int(&eax, &ebx, &ecx, &edx);
}
}
@@ -830,6 +841,22 @@ apmioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p)
else
error = EINVAL;
break;
+ case APMIO_GETINFO_OLD:
+ {
+ struct apm_info info;
+ apm_info_old_t aiop;
+
+ if (apm_get_info(&info))
+ error = ENXIO;
+ aiop = (apm_info_old_t)addr;
+ aiop->ai_major = info.ai_major;
+ aiop->ai_minor = info.ai_minor;
+ aiop->ai_acline = info.ai_acline;
+ aiop->ai_batt_stat = info.ai_batt_stat;
+ aiop->ai_batt_life = info.ai_batt_life;
+ aiop->ai_status = info.ai_status;
+ }
+ break;
case APMIO_GETINFO:
if (apm_get_info((apm_info_t)addr))
error = ENXIO;
diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c
index 8815143..39c1601 100644
--- a/sys/i386/bios/apm.c
+++ b/sys/i386/bios/apm.c
@@ -15,7 +15,7 @@
*
* Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $Id: apm.c,v 1.63 1997/11/04 17:37:52 nate Exp $
+ * $Id: apm.c,v 1.64 1997/11/10 14:38:08 nate Exp $
*/
#include <sys/param.h>
@@ -37,7 +37,7 @@
#include <i386/apm/apm_setup.h>
static int apm_display __P((int newstate));
-static int apm_int __P((u_long *eax, u_long *ebx, u_long *ecx));
+static int apm_int __P((u_long *eax, u_long *ebx, u_long *ecx, u_long *edx));
static void apm_resume __P((void));
/* static data */
@@ -109,8 +109,8 @@ struct addr48 {
static int apm_errno;
-int
-apm_int(u_long *eax, u_long *ebx, u_long *ecx)
+static int
+apm_int(u_long *eax, u_long *ebx, u_long *ecx, u_long *edx)
{
struct apm_bios_arg apa;
int cf;
@@ -118,10 +118,12 @@ apm_int(u_long *eax, u_long *ebx, u_long *ecx)
apa.eax = *eax;
apa.ebx = *ebx;
apa.ecx = *ecx;
+ apa.edx = *edx;
cf = apm_bios_call(&apa);
*eax = apa.eax;
*ebx = apa.ebx;
*ecx = apa.ecx;
+ *edx = apa.edx;
apm_errno = ((*eax) >> 8) & 0xff;
return cf;
}
@@ -133,7 +135,7 @@ apm_enable_disable_pm(int enable)
{
struct apm_softc *sc = &apm_softc;
- u_long eax, ebx, ecx;
+ u_long eax, ebx, ecx, edx;
eax = (APM_BIOS << 8) | APM_ENABLEDISABLEPM;
@@ -142,19 +144,19 @@ apm_enable_disable_pm(int enable)
else
ebx = 0xffff; /* APM version 1.0 only */
ecx = enable;
- return apm_int(&eax, &ebx, &ecx);
+ return apm_int(&eax, &ebx, &ecx, &edx);
}
static void
apm_driver_version(int version)
{
- u_long eax, ebx, ecx;
+ u_long eax, ebx, ecx, edx;
/* First try APM 1.2 */
eax = (APM_BIOS << 8) | APM_DRVVERSION;
ebx = 0x0;
ecx = version;
- if(!apm_int(&eax, &ebx, &ecx))
+ if(!apm_int(&eax, &ebx, &ecx, &edx))
apm_version = eax & 0xffff;
}
@@ -162,25 +164,25 @@ apm_driver_version(int version)
static int
apm_engage_disengage_pm(int engage)
{
- u_long eax, ebx, ecx;
+ u_long eax, ebx, ecx, edx;
eax = (APM_BIOS << 8) | APM_ENGAGEDISENGAGEPM;
ebx = PMDV_ALLDEV;
ecx = engage;
- return(apm_int(&eax, &ebx, &ecx));
+ return(apm_int(&eax, &ebx, &ecx, &edx));
}
/* get PM event */
static u_int
apm_getevent(void)
{
- u_long eax, ebx, ecx;
+ u_long eax, ebx, ecx, edx;
eax = (APM_BIOS << 8) | APM_GETPMEVENT;
ebx = 0;
ecx = 0;
- if (apm_int(&eax, &ebx, &ecx))
+ if (apm_int(&eax, &ebx, &ecx, &edx))
return PMEV_NOEVENT;
return ebx & 0xffff;
@@ -190,13 +192,13 @@ apm_getevent(void)
static int
apm_suspend_system(void)
{
- u_long eax, ebx, ecx;
+ u_long eax, ebx, ecx, edx;
eax = (APM_BIOS << 8) | APM_SETPWSTATE;
ebx = PMDV_ALLDEV;
ecx = PMST_SUSPEND;
- if (apm_int(&eax, &ebx, &ecx)) {
+ if (apm_int(&eax, &ebx, &ecx, &edx)) {
printf("Entire system suspend failure: errcode = %ld\n",
0xff & (eax >> 8));
return 1;
@@ -213,12 +215,12 @@ apm_suspend_system(void)
static int
apm_display(int newstate)
{
- u_long eax, ebx, ecx;
+ u_long eax, ebx, ecx, edx;
eax = (APM_BIOS << 8) | APM_SETPWSTATE;
ebx = PMDV_DISP0;
ecx = newstate ? PMST_APMENABLED:PMST_SUSPEND;
- if (apm_int(&eax, &ebx, &ecx)) {
+ if (apm_int(&eax, &ebx, &ecx, &edx)) {
printf("Display off failure: errcode = %ld\n",
0xff & (eax >> 8));
return 1;
@@ -232,14 +234,14 @@ apm_display(int newstate)
void
apm_power_off(void)
{
- u_long eax, ebx, ecx;
+ u_long eax, ebx, ecx, edx;
if (!apm_softc.active)
return;
eax = (APM_BIOS << 8) | APM_SETPWSTATE;
ebx = PMDV_ALLDEV;
ecx = PMST_OFF;
- apm_int(&eax, &ebx, &ecx);
+ apm_int(&eax, &ebx, &ecx, &edx);
}
/* APM Battery low handler */
@@ -426,21 +428,30 @@ static int
apm_get_info(apm_info_t aip)
{
struct apm_softc *sc = &apm_softc;
- u_long eax, ebx, ecx;
+ u_long eax, ebx, ecx, edx;
eax = (APM_BIOS << 8) | APM_GETPWSTATUS;
ebx = PMDV_ALLDEV;
ecx = 0;
- if (apm_int(&eax, &ebx, &ecx))
+ if (apm_int(&eax, &ebx, &ecx, &edx))
return 1;
- aip->ai_acline = (ebx >> 8) & 0xff;
- aip->ai_batt_stat = ebx & 0xff;
- aip->ai_batt_life = ecx & 0xff;
- aip->ai_major = (u_int)sc->majorversion;
- aip->ai_minor = (u_int)sc->minorversion;
- aip->ai_status = (u_int)sc->active;
+ aip->ai_infoversion = 0;
+ aip->ai_acline = (ebx >> 8) & 0xff;
+ aip->ai_batt_stat = ebx & 0xff;
+ aip->ai_batt_life = ecx & 0xff;
+ aip->ai_major = (u_int)sc->majorversion;
+ aip->ai_minor = (u_int)sc->minorversion;
+ aip->ai_status = (u_int)sc->active;
+ edx &= 0xffff;
+ if (edx == 0xffff) /* Time is unknown */
+ aip->ai_batt_time = -1;
+ else if (edx & 0x8000) /* Time is in minutes */
+ aip->ai_batt_time = (edx & 0x7fff) * 60;
+ else /* Time is in seconds */
+ aip->ai_batt_time = edx;
+ bzero(aip->ai_spare, sizeof aip->ai_spare);
return 0;
}
@@ -453,11 +464,11 @@ apm_cpu_idle(void)
struct apm_softc *sc = &apm_softc;
if (sc->active) {
- u_long eax, ebx, ecx;
+ u_long eax, ebx, ecx, edx;
eax = (APM_BIOS <<8) | APM_CPUIDLE;
ecx = ebx = 0;
- apm_int(&eax, &ebx, &ecx);
+ apm_int(&eax, &ebx, &ecx, &edx);
}
/*
* Some APM implementation halts CPU in BIOS, whenever
@@ -485,11 +496,11 @@ apm_cpu_busy(void)
* necessary.
*/
if (sc->slow_idle_cpu && sc->active) {
- u_long eax, ebx, ecx;
+ u_long eax, ebx, ecx, edx;
eax = (APM_BIOS <<8) | APM_CPUBUSY;
ecx = ebx = 0;
- apm_int(&eax, &ebx, &ecx);
+ apm_int(&eax, &ebx, &ecx, &edx);
}
}
@@ -830,6 +841,22 @@ apmioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p)
else
error = EINVAL;
break;
+ case APMIO_GETINFO_OLD:
+ {
+ struct apm_info info;
+ apm_info_old_t aiop;
+
+ if (apm_get_info(&info))
+ error = ENXIO;
+ aiop = (apm_info_old_t)addr;
+ aiop->ai_major = info.ai_major;
+ aiop->ai_minor = info.ai_minor;
+ aiop->ai_acline = info.ai_acline;
+ aiop->ai_batt_stat = info.ai_batt_stat;
+ aiop->ai_batt_life = info.ai_batt_life;
+ aiop->ai_status = info.ai_status;
+ }
+ break;
case APMIO_GETINFO:
if (apm_get_info((apm_info_t)addr))
error = ENXIO;
diff --git a/sys/i386/include/apm_bios.h b/sys/i386/include/apm_bios.h
index 59752c2..9ea25d1 100644
--- a/sys/i386/include/apm_bios.h
+++ b/sys/i386/include/apm_bios.h
@@ -12,7 +12,7 @@
*
* Aug, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
*
- * $Id: apm_bios.h,v 1.17 1997/03/29 11:07:12 phk Exp $
+ * $Id: apm_bios.h,v 1.18 1997/06/15 02:02:53 wollman Exp $
*/
#ifndef _MACHINE_APM_BIOS_H_
@@ -187,13 +187,35 @@ void apm_power_off(void);
#if !defined(ASSEMBLER) && !defined(INITIALIZER)
-typedef struct apm_info {
+/*
+ * Old apm_info structure, returned by the APMIO_GETINFO_OLD ioctl. This
+ * is for backward compatibility with old executables.
+ */
+typedef struct apm_info_old {
u_int ai_major; /* APM major version */
u_int ai_minor; /* APM minor version */
u_int ai_acline; /* AC line status */
u_int ai_batt_stat; /* Battery status */
u_int ai_batt_life; /* Remaining battery life */
u_int ai_status; /* Status of APM support (enabled/disabled) */
+} *apm_info_old_t;
+
+/*
+ * Structure returned by the APMIO_GETINFO ioctl.
+ *
+ * In the comments below, the parenthesized numbers indicate the minimum
+ * value of ai_infoversion for which each field is valid.
+ */
+typedef struct apm_info {
+ u_int ai_infoversion; /* Indicates which fields are valid */
+ u_int ai_major; /* APM major version (0) */
+ u_int ai_minor; /* APM minor version (0) */
+ u_int ai_acline; /* AC line status (0) */
+ u_int ai_batt_stat; /* Battery status (0) */
+ u_int ai_batt_life; /* Remaining battery life in percent (0) */
+ int ai_batt_time; /* Remaining battery time in seconds (0) */
+ u_int ai_status; /* True if enabled (0) */
+ u_int ai_spare[8]; /* For future expansion */
} *apm_info_t;
struct apm_bios_arg {
@@ -206,13 +228,14 @@ struct apm_bios_arg {
};
#define APMIO_SUSPEND _IO('P', 1)
-#define APMIO_GETINFO _IOR('P', 2, struct apm_info)
+#define APMIO_GETINFO_OLD _IOR('P', 2, struct apm_info_old)
#define APMIO_ENABLE _IO('P', 5)
#define APMIO_DISABLE _IO('P', 6)
#define APMIO_HALTCPU _IO('P', 7)
#define APMIO_NOTHALTCPU _IO('P', 8)
#define APMIO_DISPLAY _IOW('P', 9, int)
#define APMIO_BIOS _IOWR('P', 10, struct apm_bios_arg)
+#define APMIO_GETINFO _IOR('P', 11, struct apm_info)
#endif /* !ASSEMBLER && !INITIALIZER */
OpenPOWER on IntegriCloud