1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
|
From 3a51673c05142b99f8db6a0bd9b8e4b806efeb72 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Mon, 8 Jul 2019 17:53:25 +0200
Subject: [PATCH 1/7] Extend battery handling on OpenBSD (#351)
If acpibat watts value is not available, try current (for batteries
that report in amps), then convert to watts.
originally submitted by @jcs
---
src/print_battery_info.c | 47 ++++++++++++++++++++++++++++++++++++++--
1 file changed, 45 insertions(+), 2 deletions(-)
diff --git a/src/print_battery_info.c b/src/print_battery_info.c
index 1c51624..e2a790c 100644
--- a/src/print_battery_info.c
+++ b/src/print_battery_info.c
@@ -20,6 +20,8 @@
#include <dev/acpica/acpiio.h>
#include <sys/sysctl.h>
#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <sys/sensors.h>
#endif
#if defined(__DragonFly__)
@@ -31,6 +33,7 @@
#include <sys/fcntl.h>
#include <sys/ioctl.h>
#include <sys/types.h>
+#include <sys/sensors.h>
#endif
#if defined(__NetBSD__)
@@ -269,11 +272,16 @@ static bool slurp_battery_info(struct battery_info *batt_info, yajl_gen json_gen
#elif defined(__OpenBSD__)
/*
* We're using apm(4) here, which is the interface to acpi(4) on amd64/i386 and
- * the generic interface on macppc/sparc64/zaurus, instead of using sysctl(3) and
- * probing acpi(4) devices.
+ * the generic interface on macppc/sparc64/zaurus. Machines that have ACPI
+ * battery sensors gain some extra information.
*/
struct apm_power_info apm_info;
+ struct sensordev sensordev;
+ struct sensor sensor;
+ size_t sdlen, slen;
int apm_fd;
+ int dev, mib[5] = {CTL_HW, HW_SENSORS, 0, 0, 0};
+ int volts = 0;
apm_fd = open("/dev/apm", O_RDONLY);
if (apm_fd < 0) {
@@ -311,6 +319,41 @@ static bool slurp_battery_info(struct battery_info *batt_info, yajl_gen json_gen
if (batt_info->status != CS_CHARGING) {
batt_info->seconds_remaining = apm_info.minutes_left * 60;
}
+
+ /* If acpibat* are present, check sensors for data not present via APM. */
+ batt_info->present_rate = 0;
+ sdlen = sizeof(sensordev);
+ slen = sizeof(sensor);
+
+ for (dev = 0;; dev++) {
+ mib[2] = dev;
+ if (sysctl(mib, 3, &sensordev, &sdlen, NULL, 0) == -1) {
+ break;
+ }
+ /* 'path' is the node within the full path */
+ if (BEGINS_WITH(sensordev.xname, "acpibat")) {
+ /* power0 */
+ mib[3] = SENSOR_WATTS;
+ mib[4] = 0;
+ if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1) {
+ /* try current0 */
+ mib[3] = SENSOR_AMPS;
+ if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1)
+ continue;
+ volts = sensor.value;
+
+ /* we also need current voltage to convert amps to watts */
+ mib[3] = SENSOR_VOLTS_DC;
+ mib[4] = 1;
+ if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1)
+ continue;
+
+ batt_info->present_rate += (((float)volts / 1000.0) * ((float)sensor.value / 1000.0));
+ } else {
+ batt_info->present_rate += sensor.value;
+ }
+ }
+ }
#elif defined(__NetBSD__)
/*
* Using envsys(4) via sysmon(4).
--
2.26.2
|
GitWeb