Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

in sme_battery_check(), explicitely check whether the battery is

Browse Source 
present before using the values read, and clean up the logics
a bit to make it more understandable
This commit is contained in:
drochner 2008-06-11 17:40:06 +00:00
parent 733bb117b5
commit 96a9f67868
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/dev/sysmon/sysmon_envsys_events.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sysmon_envsys_events.c,v 1.54 2008/04/02 11:19:22 xtraeme Exp $ */
/* $NetBSD: sysmon_envsys_events.c,v 1.55 2008/06/11 17:40:06 drochner Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.54 2008/04/02 11:19:22 xtraeme Exp $");
__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys_events.c,v 1.55 2008/06/11 17:40:06 drochner Exp $");
#include <sys/param.h>
#include <sys/types.h>
@ -681,9 +681,8 @@ sme_battery_check(void)
{
struct sysmon_envsys *sme;
envsys_data_t *edata;
bool battery, batterycap, batterycharge;
battery = batterycap = batterycharge = false;
int batteriesfound = 0;
bool present, batterycap, batterycharge;
/*
* Check for battery devices and its state.
@ -692,10 +691,21 @@ sme_battery_check(void)
if (sme->sme_class != SME_CLASS_BATTERY)
continue;
present = true;
TAILQ_FOREACH(edata, &sme->sme_sensors_list, sensors_head) {
if (edata->units == ENVSYS_INDICATOR &&
!edata->value_cur) {
present = false;
break;
}
}
if (!present)
continue;
/*
* We've found a battery device...
*/
battery = true;
batteriesfound++;
batterycap = batterycharge = false;
TAILQ_FOREACH(edata, &sme->sme_sensors_list, sensors_head) {
if (edata->units == ENVSYS_BATTERY_CAPACITY) {
batterycap = true;
@ -707,9 +717,11 @@ sme_battery_check(void)
return false;
}
}
if (!batterycap || !batterycharge)
return false;
}
if (!battery || !batterycap || !batterycharge)
if (!batteriesfound)
return false;
/*