* implimant CONFIG_HOOK_PMEVENT_BATTERY&CONFIG_HOOK_PMEVENT_AC
based apm state transition. - change CONFIG_HOOK_PMEVENT_BATTERY message. XXX: currentry none send these events.
This commit is contained in:
sato
parent
4a49026fe0
commit
1ed5e58cb7
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: apmdev.c,v 1.3 2000/10/27 08:19:37 sato Exp $ */
|
||||
/* $NetBSD: apmdev.c,v 1.4 2000/12/29 08:12:09 sato Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
|
||||
|
|
@ -246,9 +246,9 @@ apm_power_print(sc, pi)
|
|||
struct apm_power_info *pi;
|
||||
{
|
||||
|
||||
if (APM_BATT_LIFE(regs) != APM_BATT_LIFE_UNKNOWN) {
|
||||
if (pi->battery_life != APM_BATT_LIFE_UNKNOWN) {
|
||||
printf("%s: battery life expectancy: %d%%\n",
|
||||
sc->sc_dev.dv_xname, APM_BATT_LIFE(regs));
|
||||
sc->sc_dev.dv_xname, pi->battery_life);
|
||||
}
|
||||
printf("%s: A/C state: ", sc->sc_dev.dv_xname);
|
||||
switch (pi->ac_state) {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
/* $NetBSD: hpcapm.c,v 1.4 2000/10/04 13:53:55 uch Exp $ */
|
||||
/* $NetBSD: hpcapm.c,v 1.5 2000/12/29 08:12:08 sato Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2000 Takemura Shin
|
||||
* Copyright (c) 2000 SATO Kazumi
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
|
@ -29,6 +30,7 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/systm.h>
|
||||
|
||||
#include <arch/hpcmips/dev/apm/apmvar.h>
|
||||
|
|
@ -86,8 +88,14 @@ struct apmhpc_softc {
|
|||
void *sc_apmdev;
|
||||
volatile unsigned int events;
|
||||
volatile int power_state;
|
||||
volatile int battery_state;
|
||||
volatile int ac_state;
|
||||
config_hook_tag sc_standby_hook;
|
||||
config_hook_tag sc_suspend_hook;
|
||||
config_hook_tag sc_battery_hook;
|
||||
config_hook_tag sc_ac_hook;
|
||||
int battery_life;
|
||||
int minutes_left;
|
||||
};
|
||||
|
||||
struct apm_accessops hpcapm_accessops = {
|
||||
|
|
@ -131,6 +139,10 @@ hpcapm_attach(parent, self, aux)
|
|||
|
||||
sc->events = 0;
|
||||
sc->power_state = APM_SYS_READY;
|
||||
sc->battery_state = APM_BATT_FLAG_UNKNOWN;
|
||||
sc->ac_state = APM_AC_UNKNOWN;
|
||||
sc->battery_life = APM_BATT_LIFE_UNKNOWN;
|
||||
sc->minutes_left = 0;
|
||||
sc->sc_standby_hook = config_hook(CONFIG_HOOK_PMEVENT,
|
||||
CONFIG_HOOK_PMEVENT_STANDBYREQ,
|
||||
CONFIG_HOOK_EXCLUSIVE,
|
||||
|
|
@ -140,6 +152,16 @@ hpcapm_attach(parent, self, aux)
|
|||
CONFIG_HOOK_EXCLUSIVE,
|
||||
hpcapm_hook, sc);
|
||||
|
||||
sc->sc_battery_hook = config_hook(CONFIG_HOOK_PMEVENT,
|
||||
CONFIG_HOOK_PMEVENT_BATTERY,
|
||||
CONFIG_HOOK_SHARE,
|
||||
hpcapm_hook, sc);
|
||||
|
||||
sc->sc_battery_hook = config_hook(CONFIG_HOOK_PMEVENT,
|
||||
CONFIG_HOOK_PMEVENT_AC,
|
||||
CONFIG_HOOK_SHARE,
|
||||
hpcapm_hook, sc);
|
||||
|
||||
aaa.accessops = &hpcapm_accessops;
|
||||
aaa.accesscookie = sc;
|
||||
aaa.apm_detail = 0x0102;
|
||||
|
|
@ -156,9 +178,12 @@ hpcapm_hook(ctx, type, id, msg)
|
|||
{
|
||||
struct apmhpc_softc *sc;
|
||||
int s;
|
||||
int charge;
|
||||
|
||||
sc = ctx;
|
||||
|
||||
if (type != CONFIG_HOOK_PMEVENT)
|
||||
return 1;
|
||||
s = splhigh();
|
||||
switch (id) {
|
||||
case CONFIG_HOOK_PMEVENT_STANDBYREQ:
|
||||
|
|
@ -176,6 +201,77 @@ hpcapm_hook(ctx, type, id, msg)
|
|||
sc->events |= (1 << APM_NORMAL_RESUME);
|
||||
}
|
||||
break;
|
||||
case CONFIG_HOOK_PMEVENT_BATTERY:
|
||||
switch (*(int *)msg) {
|
||||
case CONFIG_HOOK_BATT_CRITICAL:
|
||||
DPRINTF(("hpcapm: battery state critical\n"));
|
||||
charge = sc->battery_state&APM_BATT_FLAG_CHARGING;
|
||||
sc->battery_state = APM_BATT_FLAG_CRITICAL;
|
||||
sc->battery_state |= charge;
|
||||
sc->battery_life = 0;
|
||||
break;
|
||||
case CONFIG_HOOK_BATT_LOW:
|
||||
DPRINTF(("hpcapm: battery state low\n"));
|
||||
charge = sc->battery_state&APM_BATT_FLAG_CHARGING;
|
||||
sc->battery_state = APM_BATT_FLAG_LOW;
|
||||
sc->battery_state |= charge;
|
||||
break;
|
||||
case CONFIG_HOOK_BATT_HIGH:
|
||||
DPRINTF(("hpcapm: battery state high\n"));
|
||||
charge = sc->battery_state&APM_BATT_FLAG_CHARGING;
|
||||
sc->battery_state = APM_BATT_FLAG_HIGH;
|
||||
sc->battery_state |= charge;
|
||||
break;
|
||||
case CONFIG_HOOK_BATT_20P:
|
||||
DPRINTF(("hpcapm: battery life 20%%\n"));
|
||||
sc->battery_life = 20;
|
||||
break;
|
||||
case CONFIG_HOOK_BATT_50P:
|
||||
DPRINTF(("hpcapm: battery life 50%%\n"));
|
||||
sc->battery_life = 50;
|
||||
break;
|
||||
case CONFIG_HOOK_BATT_80P:
|
||||
DPRINTF(("hpcapm: battery life 80%%\n"));
|
||||
sc->battery_life = 80;
|
||||
break;
|
||||
case CONFIG_HOOK_BATT_100P:
|
||||
DPRINTF(("hpcapm: battery life 100%%\n"));
|
||||
sc->battery_life = 100;
|
||||
break;
|
||||
case CONFIG_HOOK_BATT_UNKNOWN:
|
||||
DPRINTF(("hpcapm: battery state unknown\n"));
|
||||
sc->battery_state = APM_BATT_FLAG_UNKNOWN;
|
||||
sc->battery_life = APM_BATT_LIFE_UNKNOWN;
|
||||
break;
|
||||
case CONFIG_HOOK_BATT_NO_SYSTEM_BATTERY:
|
||||
DPRINTF(("hpcapm: battery state no system battery?\n"));
|
||||
sc->battery_state = APM_BATT_FLAG_NO_SYSTEM_BATTERY;
|
||||
sc->battery_life = APM_BATT_LIFE_UNKNOWN;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case CONFIG_HOOK_PMEVENT_AC:
|
||||
switch (*(int *)msg) {
|
||||
case CONFIG_HOOK_AC_OFF:
|
||||
DPRINTF(("hpcapm: ac not connect\n"));
|
||||
sc->battery_state &= ~APM_BATT_FLAG_CHARGING;
|
||||
sc->ac_state = APM_AC_OFF;
|
||||
break;
|
||||
case CONFIG_HOOK_AC_ON_CHARGE:
|
||||
DPRINTF(("hpcapm: charging\n"));
|
||||
sc->battery_state |= APM_BATT_FLAG_CHARGING;
|
||||
sc->ac_state = APM_AC_ON;
|
||||
break;
|
||||
case CONFIG_HOOK_AC_ON_NOCHARGE:
|
||||
DPRINTF(("hpcapm: ac connect\n"));
|
||||
sc->battery_state &= ~APM_BATT_FLAG_CHARGING;
|
||||
sc->ac_state = APM_AC_ON;
|
||||
break;
|
||||
case CONFIG_HOOK_AC_UNKNOWN:
|
||||
sc->ac_state = APM_AC_UNKNOWN;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
splx(s);
|
||||
|
||||
|
|
@ -221,7 +317,43 @@ hpcapm_set_powstate(scx, devid, powstat)
|
|||
break;
|
||||
case APM_SYS_STANDBY:
|
||||
DPRINTF(("hpcapm: set power state STANDBY\n"));
|
||||
s = splhigh();
|
||||
config_hook_call(CONFIG_HOOK_PMEVENT,
|
||||
CONFIG_HOOK_PMEVENT_HARDPOWER,
|
||||
(void *)PWR_STANDBY);
|
||||
sc->power_state = APM_SYS_STANDBY;
|
||||
#if NVRIP > 0
|
||||
if (platid_match(&platid, &platid_mask_CPU_MIPS_VR_41XX)) {
|
||||
/*
|
||||
* disable all interrupts except PIU interrupt
|
||||
*/
|
||||
vrip_intr_suspend();
|
||||
_spllower(~MIPS_INT_MASK_0);
|
||||
|
||||
/*
|
||||
* STANDBY instruction puts the CPU into power saveing
|
||||
* state until some interrupt occuer.
|
||||
* It sleeps until you push the power button.
|
||||
*/
|
||||
__asm(".set noreorder");
|
||||
__asm(__CONCAT(".word ",___STRING(VR_OPCODE_STANDBY)));
|
||||
__asm("nop");
|
||||
__asm("nop");
|
||||
__asm("nop");
|
||||
__asm("nop");
|
||||
__asm("nop");
|
||||
__asm(".set reorder");
|
||||
|
||||
splhigh();
|
||||
vrip_intr_resume();
|
||||
delay(1000); /* 1msec */
|
||||
}
|
||||
#endif
|
||||
config_hook_call(CONFIG_HOOK_PMEVENT,
|
||||
CONFIG_HOOK_PMEVENT_HARDPOWER,
|
||||
(void *)PWR_RESUME);
|
||||
DPRINTF(("hpcapm: resume\n"));
|
||||
splx(s);
|
||||
break;
|
||||
case APM_SYS_SUSPEND:
|
||||
DPRINTF(("hpcapm: set power state SUSPEND...\n"));
|
||||
|
|
@ -254,6 +386,7 @@ hpcapm_set_powstate(scx, devid, powstat)
|
|||
|
||||
splhigh();
|
||||
vrip_intr_resume();
|
||||
delay(1000); /* 1msec */
|
||||
}
|
||||
#endif /* NVRIP > 0 */
|
||||
#ifdef TX39XX
|
||||
|
|
@ -290,8 +423,9 @@ hpcapm_get_powstat(scx, pinfo)
|
|||
|
||||
sc = scx;
|
||||
|
||||
memset(pinfo, 0, sizeof(*pinfo));
|
||||
|
||||
pinfo->ac_state = sc->ac_state;
|
||||
pinfo->battery_state = sc->battery_state;
|
||||
pinfo->battery_life = sc->battery_life;
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: config_hook.h,v 1.10 2000/12/27 12:04:02 sato Exp $ */
|
||||
/* $NetBSD: config_hook.h,v 1.11 2000/12/29 08:12:09 sato Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999
|
||||
|
|
@ -231,10 +231,12 @@ int config_hook_call __P((int type, long id, void *msg));
|
|||
* CONFIG_HOOK_BATTERY event value
|
||||
*/
|
||||
#define CONFIG_HOOK_BATT_CRITICAL 0
|
||||
#define CONFIG_HOOK_BATT_LOW 1
|
||||
#define CONFIG_HOOK_BATT_1BY4 2
|
||||
#define CONFIG_HOOK_BATT_HALF 3
|
||||
#define CONFIG_HOOK_BATT_3BY4 4
|
||||
#define CONFIG_HOOK_BATT_FULL 5
|
||||
#define CONFIG_HOOK_BATT_UNKNOWN 6
|
||||
#define CONFIG_HOOK_BATT_20P 1
|
||||
#define CONFIG_HOOK_BATT_LOW 2
|
||||
#define CONFIG_HOOK_BATT_50P 3
|
||||
#define CONFIG_HOOK_BATT_HIGH 4
|
||||
#define CONFIG_HOOK_BATT_80P 5
|
||||
#define CONFIG_HOOK_BATT_100P 6
|
||||
#define CONFIG_HOOK_BATT_UNKNOWN 7
|
||||
#define CONFIG_HOOK_BATT_NO_SYSTEM_BATTERY 8
|
||||
#endif /* _CONFIG_HOOK_H_ */
|
||||
|
|
|
|||
Loading…
Reference in New Issue