*
* [1] battery must be quite badly degraded
*/
+/*
+ * Copyright (C) 2004 Ian Jackson <ian@davenant.greenend.org.uk>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 3,
+ * or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, consult the Free Software
+ * Foundation's website at www.fsf.org, or the GNU Project website at
+ * www.gnu.org.
+ */
#include <stdio.h>
#include <assert.h>
typedef struct batinfo_field {
const char *file;
const char *label;
+ const char *acpi_label;
+ double acpi_conversion_factor;
unsigned long *valuep;
const char *unit;
const char *enumarray[10];
} batinfo_field;
-#define QUANTITY_FIELDS \
- QF(info, design_capacity, "mWh") \
- QF(info, last_full_capacity, "mWh") \
- QF(state, present_rate, "mW") \
- QF(state, remaining_capacity, "mWh") \
- QF(alarm, alarm, "mWh")
+#define QUANTITY_FIELDS \
+ QF(info, design_capacity, "mWh", energy_full_design, 1e-3) \
+ QF(info, last_full_capacity, "mWh", energy_full, 1e-3) \
+ QF(state, present_rate, "mW", power_now, 1e-3) \
+ QF(state, remaining_capacity, "mWh", energy_now, 1e-3) \
+ QF(alarm, alarm, "mWh", alarm, 1e-3)
-#define QF(f,l,u) static unsigned long thisbat_##f##_##l;
+#define QF(f,l,u,a,ac) static unsigned long thisbat_##f##_##l;
QUANTITY_FIELDS
#undef QF
static const batinfo_field fields[]= {
#define E(f,l) #f, #l, &thisbat_##f##_##l, 0
#define QF(f,l,u) { #f, #l, &thisbat_##f##_##l, u },
- { E(alarm, present), { "no", "yes" } },
- { E(info, present), { "no", "yes" } },
- { E(state,present), { "no", "yes" } },
+ { E(alarm, present), 0,0, { "no", "yes" } },
+ { E(info, present), 0,0, { "no", "yes" } },
+ { E(state,present), 0,0, { "no", "yes" } },
{ E(state,charging_state), { "discharging", "charging", "charged" } },
QUANTITY_FIELDS /* take care re charging_state values order - */
{ 0 } /* if you must change it, search for CHGST_... */
}
if (!(thisbat_alarm_present==0 ||
- thisbat_info_present==0 ||
- thisbat_state_present==0)) {
+ thisbat_state_present==0 || thisbat_info_present==0)) {
if (thisbat_alarm_present == VAL_NOTFOUND)
thisbat_alarm_present= 1;