summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stapelberg <michael+x200@stapelberg.de>2008-10-24 23:45:45 +0200
committerMichael Stapelberg <michael+x200@stapelberg.de>2008-10-24 23:45:45 +0200
commit554a984fe6b8f29059cfa304778a465dce46c9d3 (patch)
tree75858c8c04a271676df26058e8304aec14d9e6ad
parentfe75f783ed8cc34d8219f9f59c30bbba2dc86738 (diff)
Add support for differently named uevent data and hint for 9pnet_fd
-rw-r--r--wmiistatus.14
-rw-r--r--wmiistatus.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/wmiistatus.1 b/wmiistatus.1
index 4a77a5f..f22d583 100644
--- a/wmiistatus.1
+++ b/wmiistatus.1
@@ -90,8 +90,10 @@ System-wide configuration file.
.SH MOUNTING WMII'S PSEUDO FILESYSTEM
As of now (October 2008, Linux 2.6.27) you can mount wmii's 9P pseudo filesystem using:
.PP
-.Vb 1
+.Vb 3
mount -t 9p -o rw,trans=unix,uname=michael,dfltuid=1000,dfltgid=50,name=michael,noauto,noextend /tmp/ns.michael.:0/wmii /mnt/wmii
+# Perhaps you need to load module 9pnet_fd if that does not work
+modprobe 9pnet_fd
.Ve
.SH SEE ALSO
diff --git a/wmiistatus.c b/wmiistatus.c
index e99625a..ffa86e3 100644
--- a/wmiistatus.c
+++ b/wmiistatus.c
@@ -189,9 +189,11 @@ static char *get_battery_info() {
(void)read(fd, buf, sizeof(buf));
for (walk = buf, last = buf; (walk-buf) < 1024; walk++)
if (*walk == '=') {
- if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL_DESIGN"))
+ if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL_DESIGN") ||
+ BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL_DESIGN"))
full_design = atoi(walk+1);
- else if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_NOW"))
+ else if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_NOW") ||
+ BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_NOW"))
remaining = atoi(walk+1);
else if (BEGINS_WITH(last, "POWER_SUPPLY_CURRENT_NOW"))
present_rate = atoi(walk+1);