wifi: Fix order and add missing header

[slstatus.git] / components / battery.c

diff --git a/components/battery.c b/components/battery.c
index 327d576..a63b9d0 100644 (file)
--- a/components/battery.c
+++ b/components/battery.c
@@ -16,20 +16,7 @@
 
                snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
                         bat, "/capacity");
 
                snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
                         bat, "/capacity");

-               return (pscanf(path, "%i", &perc) == 1) ?
-                      bprintf("%d", perc) : NULL;
-       }
-
-       const char *
-       battery_power(const char *bat)
-       {
-               int watts;
-               char path[PATH_MAX];
-
-               snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
-                        bat, "/power_now");
-               return (pscanf(path, "%i", &watts) == 1) ?
-                      bprintf("%d", (watts + 500000) / 1000000) : NULL;
+               return (pscanf(path, "%i", &perc) == 1) ? bprintf("%d", perc) : NULL;

        }
 
        const char *
        }
 
        const char *


@@ -41,8 +28,6 @@
                } map[] = {
                        { "Charging",    "+" },
                        { "Discharging", "-" },
                } map[] = {
                        { "Charging",    "+" },
                        { "Discharging", "-" },

-                       { "Full",        "=" },
-                       { "Unknown",     "/" },

                };
                size_t i;
                char path[PATH_MAX], state[12];
                };
                size_t i;
                char path[PATH_MAX], state[12];


@@ -101,7 +86,6 @@
                } map[] = {
                        { APM_AC_ON,      "+" },
                        { APM_AC_OFF,     "-" },
                } map[] = {
                        { APM_AC_ON,      "+" },
                        { APM_AC_OFF,     "-" },

-                       { APM_AC_UNKNOWN, "/" },

                };
 
                fd = open("/dev/apm", O_RDONLY);
                };
 
                fd = open("/dev/apm", O_RDONLY);