battery: OS split
Quentin Rameau quinq@fifth.space
Mon, 30 Apr 2018 15:14:32 +0200
3 files changed,
34 insertions(+),
35 deletions(-)
A
components/OpenBSD/battery.c
@@ -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); +}
M
components/battery.c
→
components/Linux/battery.c
@@ -2,19 +2,11 @@ /* See LICENSE file for copyright and license details. */
#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 @@ snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/capacity");
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 @@ }
} return (i == LEN(map)) ? "?" : map[i].symbol; } -#endif