[src/netbsd-3]: src/sys/dev/hpc Pull up revision 1.3 (requested by nakayama i...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/22eee961ecf3
branches:  netbsd-3
changeset: 576853:22eee961ecf3
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Aug 04 18:32:40 2005 +0000

description:
Pull up revision 1.3 (requested by nakayama in ticket #637):
Get AC/battery state via config_hook_call if hooks are registered.

diffstat:

 sys/dev/hpc/hpcapm.c |  23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diffs (47 lines):

diff -r d72abc4f2fc8 -r 22eee961ecf3 sys/dev/hpc/hpcapm.c
--- a/sys/dev/hpc/hpcapm.c      Thu Aug 04 18:31:25 2005 +0000
+++ b/sys/dev/hpc/hpcapm.c      Thu Aug 04 18:32:40 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hpcapm.c,v 1.2 2005/02/27 00:26:59 perry Exp $ */
+/*     $NetBSD: hpcapm.c,v 1.2.2.1 2005/08/04 18:32:40 tron Exp $      */
 
 /*
  * Copyright (c) 2000 Takemura Shin
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcapm.c,v 1.2 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcapm.c,v 1.2.2.1 2005/08/04 18:32:40 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -370,12 +370,25 @@
 hpcapm_get_powstat(void *scx, struct apm_power_info *pinfo)
 {
        struct apmhpc_softc *sc;
+       int val;
 
        sc = scx;
 
-       pinfo->ac_state = sc->ac_state;
-       pinfo->battery_state = sc->battery_state;
-       pinfo->battery_life = sc->battery_life;
+       if (config_hook_call(CONFIG_HOOK_GET,
+                            CONFIG_HOOK_ACADAPTER, &val) != -1)
+               pinfo->ac_state = val;
+       else
+               pinfo->ac_state = sc->ac_state;
+       if (config_hook_call(CONFIG_HOOK_GET,
+                            CONFIG_HOOK_CHARGE, &val) != -1)
+               pinfo->battery_state = val;
+       else
+               pinfo->battery_state = sc->battery_state;
+       if (config_hook_call(CONFIG_HOOK_GET,
+                            CONFIG_HOOK_BATTERYVAL, &val) != -1)
+               pinfo->battery_life = val;
+       else
+               pinfo->battery_life = sc->battery_life;
        return (0);
 }