enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 13
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

Enlightenment - BSD - Cleanup sysctl code for batteries.

This commit is contained in:
Al 'netstar' Poole 2017-01-27 18:28:19 -06:00 committed by Stephen 'Okra' Houston
parent d55164d0e0
commit 82af16c32b
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/modules/battery/e_mod_sysctl.c
View File

@ -11,7 +11,7 @@
#include "e.h" #include "e.h"
#include "e_mod_main.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(); static int _battery_sysctl_battery_update();
extern Eina_List *device_batteries; extern Eina_List *device_batteries;
@ -160,7 +160,7 @@ _battery_sysctl_stop(void)
} }
static Eina_Bool static Eina_Bool
_battery_sysctl_battery_update_poll(void *data) _battery_sysctl_battery_update_poll(void *data EINA_UNUSED)
{ {
_battery_sysctl_battery_update(); _battery_sysctl_battery_update();
return EINA_TRUE; return EINA_TRUE;
@ -201,7 +201,7 @@ _battery_sysctl_battery_update()
} }
/* This is a workaround because there's an ACPI bug */ /* 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 */ /* last full capacity */
bat->mib[3] = 8; bat->mib[3] = 8;
@ -219,9 +219,11 @@ _battery_sysctl_battery_update()
charge = (double)s.value; charge = (double)s.value;
} }
} }
bat->got_prop = 1;
_time = ecore_time_get(); _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->charge_rate = ((charge - bat->current_charge) / (_time - bat->last_update));
bat->last_update = _time; bat->last_update = _time;
bat->current_charge = charge; bat->current_charge = charge;
@ -328,12 +330,13 @@ _battery_sysctl_battery_update()
#endif #endif
} }
if (bat) if (bat)
{ {
if (bat->got_prop) if (bat->got_prop)
_battery_device_update(); _battery_device_update();
bat->got_prop = 1; bat->got_prop = 1;
} }
return 1;
} }

10
src/modules/sysinfo/batman/batman_sysctl.c
View File

@ -10,7 +10,7 @@
#include "batman.h" #include "batman.h"
#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) #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 #endif
static int _batman_sysctl_battery_update(Instance *inst); 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__) #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
static Eina_Bool static Eina_Bool
_batman_sysctl_battery_update_poll(void *data) _batman_sysctl_battery_update_poll(void *data EINA_UNUSED)
{ {
Instance *inst = data; Instance *inst = data;
_batman_sysctl_battery_update(inst); _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 */ /* 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 */ /* last full capacity */
bat->mib[3] = 8; bat->mib[3] = 8;
@ -225,6 +225,8 @@ _batman_sysctl_battery_update(Instance *inst)
charge = (double)s.value; charge = (double)s.value;
} }
} }
bat->got_prop = 1;
_time = ecore_time_get(); _time = ecore_time_get();
if ((bat->got_prop) && (charge != bat->current_charge)) if ((bat->got_prop) && (charge != bat->current_charge))
@ -340,7 +342,7 @@ _batman_sysctl_battery_update(Instance *inst)
_batman_device_update(bat->inst); _batman_device_update(bat->inst);
bat->got_prop = 1; bat->got_prop = 1;
} }
return 0; return 1;
} }