From 555299af9f0ee71c1ad86a6c6846748861be458b Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Wed, 10 Mar 2021 18:10:00 -0500 Subject: hosted: Consolidate the code that polls the battery charging status affects all hiby targets, fiiom3k, and ibasso dx50/dx90 As well as deduplicating a small pile of code, this also implements hysteresis so we're not doing a sysfs read/lookup multiple times back-to-back every time the power management tick fires. Change-Id: I2f7672acbb36341becf67e07960c24c681270d09 --- firmware/target/hosted/fiio/power-fiio.c | 24 ------------------------ firmware/target/hosted/fiio/power-fiio.h | 3 --- firmware/target/hosted/fiio/powermgmt-fiio.c | 11 ----------- 3 files changed, 38 deletions(-) (limited to 'firmware/target/hosted/fiio') diff --git a/firmware/target/hosted/fiio/power-fiio.c b/firmware/target/hosted/fiio/power-fiio.c index a2b19ce550..086c3bc9cb 100644 --- a/firmware/target/hosted/fiio/power-fiio.c +++ b/firmware/target/hosted/fiio/power-fiio.c @@ -37,30 +37,6 @@ const char * const sysfs_bat_voltage = const char * const sysfs_bat_capacity = "/sys/class/power_supply/battery/capacity"; -const char * const sysfs_bat_status = - "/sys/class/power_supply/battery/status"; - -const char * const sysfs_pow_supply = - "/sys/class/power_supply/ac/online"; - -unsigned int fiio_power_input_status(void) -{ - int present = 0; - sysfs_get_int(sysfs_pow_supply, &present); - - usb_enable(present ? true : false); - - return present ? POWER_INPUT_USB_CHARGER : POWER_INPUT_NONE; -} - -bool fiio_power_charging_status(void) -{ - char buf[12] = {0}; - sysfs_get_string(sysfs_bat_status, buf, sizeof(buf)); - - return (strncmp(buf, "Charging", 8) == 0); -} - unsigned int fiio_power_get_battery_voltage(void) { int battery_voltage; diff --git a/firmware/target/hosted/fiio/power-fiio.h b/firmware/target/hosted/fiio/power-fiio.h index c3085e9569..47143a3f67 100644 --- a/firmware/target/hosted/fiio/power-fiio.h +++ b/firmware/target/hosted/fiio/power-fiio.h @@ -23,9 +23,6 @@ #include #include "config.h" -unsigned int fiio_power_input_status(void); -bool fiio_power_charging_status(void); unsigned int fiio_power_get_battery_voltage(void); unsigned int fiio_power_get_battery_capacity(void); #endif /* _POWER_FIIO_H_ */ - diff --git a/firmware/target/hosted/fiio/powermgmt-fiio.c b/firmware/target/hosted/fiio/powermgmt-fiio.c index b7c1b5fde2..da6305d9c4 100644 --- a/firmware/target/hosted/fiio/powermgmt-fiio.c +++ b/firmware/target/hosted/fiio/powermgmt-fiio.c @@ -44,12 +44,6 @@ const unsigned short const percent_to_volt_charge[11] = 3485, 3780, 3836, 3857, 3890, 3930, 3986, 4062, 4158, 4185, 4196 }; -unsigned int power_input_status(void) -{ - /* POWER_INPUT_USB_CHARGER, POWER_INPUT_NONE */ - return fiio_power_input_status(); -} - int _battery_voltage(void) { return fiio_power_get_battery_voltage(); @@ -61,8 +55,3 @@ int _battery_level(void) return fiio_power_get_battery_capacity(); } #endif - -bool charging_state(void) -{ - return fiio_power_charging_status(); -} -- cgit v1.2.3