em/slstatus
1
0
Fork 0
Code Releases Activity

battery: OS split

Browse Source
This commit is contained in:
Quentin Rameau 2018-04-30 15:14:32 +02:00 committed by Aaron Marcher
parent 92ab9ef52e
commit 720569bd56
3 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -7,7 +7,7 @@ include config.mk
REQ = util
COM =\
components/battery\
components/$(OS)/battery \
components/cpu\
components/datetime\
components/disk\

35
components/battery.c → components/Linux/battery.c
View File

@ -2,19 +2,11 @@
#include <errno.h>
#include <stdio.h>
#include <string.h>
#if defined(__linux__)
#include <limits.h>
#include <string.h>
#elif defined(__OpenBSD__)
#include <sys/ioctl.h>
#include <fcntl.h>
#include <unistd.h>
#include <machine/apmvar.h>
#endif
#include "../util.h"
#include "../../util.h"
#if defined(__linux__)
const char *
battery_perc(const char *bat)
{
@ -25,31 +17,7 @@ battery_perc(const char *bat)
return (pscanf(path, "%i", &perc) == 1) ?
bprintf("%d", perc) : NULL;
}
#elif defined(__OpenBSD__)
const char *
battery_perc(const char *null)
{
struct apm_power_info apm_info;
int fd;
fd = open("/dev/apm", O_RDONLY);
if (fd < 0) {
fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
return NULL;
}
if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
fprintf(stderr, "ioctl 'APM_IOC_GETPOWER': %s\n", strerror(errno));
close(fd);
return NULL;
}
close(fd);
return bprintf("%d", apm_info.battery_life);
}
#endif
#if defined(__linux__)
const char *
battery_power(const char *bat)
{
@ -88,4 +56,3 @@ battery_state(const char *bat)
}
return (i == LEN(map)) ? "?" : map[i].symbol;
}
#endif

32
components/OpenBSD/battery.c Normal file
View File

@ -0,0 +1,32 @@
/* See LICENSE file for copyright and license details. */
#include <errno.h>
#include <stdio.h>
#include <string.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#include <unistd.h>
#include <machine/apmvar.h>
#include "../../util.h"
const char *
battery_perc(const char *null)
{
struct apm_power_info apm_info;
int fd;
fd = open("/dev/apm", O_RDONLY);
if (fd < 0) {
fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
return NULL;
}
if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
fprintf(stderr, "ioctl 'APM_IOC_GETPOWER': %s\n", strerror(errno));
close(fd);
return NULL;
}
close(fd);
return bprintf("%d", apm_info.battery_life);
}