summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorAidan MacDonald <amachronic@protonmail.com>2021-11-30 00:06:33 +0000
committerAidan MacDonald <amachronic@protonmail.com>2021-12-05 14:18:32 -0500
commit6ff1a935b923b69d34d18e68af612297912c806b (patch)
tree6026d07765d9235118c039ce2afa4d5560d29950 /firmware
parentd93a3cac50d966227e9c9d77391bf47b2a858fb1 (diff)
downloadrockbox-6ff1a935b923b69d34d18e68af612297912c806b.tar.gz
rockbox-6ff1a935b923b69d34d18e68af612297912c806b.zip
powermgmt: Remove an unnecessary function
Remove battery_read_info() which is a simple wrapper function only used by debug screens. Use the polling functions directly to save a bit of code size. Change-Id: I2919f78105bab186f6933dc1823f9fa67fe74f3e
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/powermgmt.h4
-rw-r--r--firmware/powermgmt.c16
-rw-r--r--firmware/target/coldfire/debug-coldfire.c5
3 files changed, 3 insertions, 22 deletions
diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h
index 329e64d653..a4b924915c 100644
--- a/firmware/export/powermgmt.h
+++ b/firmware/export/powermgmt.h
@@ -149,10 +149,6 @@ unsigned int input_millivolts(void); /* voltage that device is running from */
void reset_battery_filter(int millivolts);
#endif /* HAVE_BATTERY_SWITCH || HAVE_RESET_BATTERY_FILTER */
-
-/* read unfiltered battery info */
-void battery_read_info(int *voltage, int *level);
-
/* Tells if the battery level is safe for disk writes */
bool battery_level_safe(void);
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 8e47b19721..313486889e 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -145,22 +145,6 @@ static void battery_status_update(void);
static int runcurrent(void);
#endif
-void battery_read_info(int *voltage, int *level)
-{
- int millivolts = _battery_voltage();
- int percent;
-
- if (voltage)
- *voltage = millivolts;
-
- if (level) {
- percent = _battery_level();
- if (percent < 0)
- percent = voltage_to_battery_level(millivolts);
- *level = percent;
- }
-}
-
#if BATTERY_TYPES_COUNT > 1
void set_battery_type(int type)
{
diff --git a/firmware/target/coldfire/debug-coldfire.c b/firmware/target/coldfire/debug-coldfire.c
index ef44a82176..56f1bbe1a7 100644
--- a/firmware/target/coldfire/debug-coldfire.c
+++ b/firmware/target/coldfire/debug-coldfire.c
@@ -144,7 +144,7 @@ bool dbg_ports(void)
adc_buttons = adc_read(ADC_BUTTONS);
adc_remote = adc_read(ADC_REMOTE);
- battery_read_info(&adc_battery_voltage, &adc_battery_level);
+
#if defined(IAUDIO_X5) || defined(IAUDIO_M5) || defined(IRIVER_H300_SERIES)
lcd_putsf(0, line++, "ADC_BUTTONS (%c): %02x",
button_scan_enabled() ? '+' : '-', adc_buttons);
@@ -162,7 +162,8 @@ bool dbg_ports(void)
adc_read(ADC_REMOTEDETECT));
#endif
- battery_read_info(&adc_battery_voltage, &adc_battery_level);
+ adc_battery_voltage = _battery_voltage();
+ adc_battery_level = battery_level();
lcd_putsf(0, line++, "Batt: %d.%03dV %d%% ", adc_battery_voltage / 1000,
adc_battery_voltage % 1000, adc_battery_level);