okra pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=82af16c32b47e4d2d7f59443d0610257af7b923d
commit 82af16c32b47e4d2d7f59443d0610257af7b923d Author: Al 'netstar' Poole <[email protected]> Date: Fri Jan 27 18:28:19 2017 -0600 Enlightenment - BSD - Cleanup sysctl code for batteries. --- src/modules/battery/e_mod_sysctl.c | 23 +++++++++++++---------- src/modules/sysinfo/batman/batman_sysctl.c | 10 ++++++---- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/modules/battery/e_mod_sysctl.c b/src/modules/battery/e_mod_sysctl.c index b149207..96b9216 100644 --- a/src/modules/battery/e_mod_sysctl.c +++ b/src/modules/battery/e_mod_sysctl.c @@ -11,7 +11,7 @@ #include "e.h" #include "e_mod_main.h" -static Eina_Bool _battery_sysctl_battery_update_poll(void *data); +static Eina_Bool _battery_sysctl_battery_update_poll(void *data EINA_UNUSED); static int _battery_sysctl_battery_update(); extern Eina_List *device_batteries; @@ -160,7 +160,7 @@ _battery_sysctl_stop(void) } static Eina_Bool -_battery_sysctl_battery_update_poll(void *data) +_battery_sysctl_battery_update_poll(void *data EINA_UNUSED) { _battery_sysctl_battery_update(); return EINA_TRUE; @@ -201,7 +201,7 @@ _battery_sysctl_battery_update() } /* This is a workaround because there's an ACPI bug */ - if (charge == 0 || bat->last_full_charge == 0) + if ((EINA_FLT_EQ(charge ==, 0.0)) || (EINA_FLT_EQ(bat->last_full_charge ==, 0.0))) { /* last full capacity */ bat->mib[3] = 8; @@ -219,9 +219,11 @@ _battery_sysctl_battery_update() charge = (double)s.value; } } + + bat->got_prop = 1; _time = ecore_time_get(); - if ((bat->got_prop) && (charge != bat->current_charge)) + if ((bat->got_prop) && (!EINA_FLT_EQ(charge, bat->current_charge))) bat->charge_rate = ((charge - bat->current_charge) / (_time - bat->last_update)); bat->last_update = _time; bat->current_charge = charge; @@ -328,12 +330,13 @@ _battery_sysctl_battery_update() #endif } - if (bat) - { - if (bat->got_prop) - _battery_device_update(); - bat->got_prop = 1; - } + if (bat) + { + if (bat->got_prop) + _battery_device_update(); + bat->got_prop = 1; + } + return 1; } diff --git a/src/modules/sysinfo/batman/batman_sysctl.c b/src/modules/sysinfo/batman/batman_sysctl.c index 7dd5688..f8e5227 100644 --- a/src/modules/sysinfo/batman/batman_sysctl.c +++ b/src/modules/sysinfo/batman/batman_sysctl.c @@ -10,7 +10,7 @@ #include "batman.h" #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) -static Eina_Bool _batman_sysctl_battery_update_poll(void *data); +static Eina_Bool _batman_sysctl_battery_update_poll(void *data EINA_UNUSED); #endif static int _batman_sysctl_battery_update(Instance *inst); @@ -163,7 +163,7 @@ _batman_sysctl_stop(void) #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) static Eina_Bool -_batman_sysctl_battery_update_poll(void *data) +_batman_sysctl_battery_update_poll(void *data EINA_UNUSED) { Instance *inst = data; _batman_sysctl_battery_update(inst); @@ -207,7 +207,7 @@ _batman_sysctl_battery_update(Instance *inst) } /* This is a workaround because there's an ACPI bug */ - if (charge == 0 || bat->last_full_charge == 0) + if ((EINA_FLT_EQ(charge, 0.0)) || (EINA_FLT_EQ(bat->last_full_charge, 0.0))) { /* last full capacity */ bat->mib[3] = 8; @@ -225,6 +225,8 @@ _batman_sysctl_battery_update(Instance *inst) charge = (double)s.value; } } + + bat->got_prop = 1; _time = ecore_time_get(); if ((bat->got_prop) && (charge != bat->current_charge)) @@ -340,7 +342,7 @@ _batman_sysctl_battery_update(Instance *inst) _batman_device_update(bat->inst); bat->got_prop = 1; } - return 0; + return 1; } --
