Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

powermgmt: Remove an unnecessary function

Browse source 
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
This commit is contained in:
Aidan MacDonald 2021-11-30 00:06:33 +00:00
parent d93a3cac50
commit 6ff1a935b9
4 changed files with 9 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/debug_menu.c
View file

@ -849,7 +849,7 @@ static bool tsc2100_debug(void)
static bool view_battery(void) static bool view_battery(void)
{ {
int view = 0; int view = 0;
int i, x, y, z, y1, y2, grid, graph; int i, x, y, y1, y2, grid, graph;
unsigned short maxv, minv; unsigned short maxv, minv;
lcd_setfont(FONT_SYSFIXED); lcd_setfont(FONT_SYSFIXED);
@ -944,11 +944,12 @@ static bool view_battery(void)
#else #else
lcd_puts(0, 0, "Power status: unknown"); lcd_puts(0, 0, "Power status: unknown");
#endif #endif
battery_read_info(&y, &z);
y = _battery_voltage();
if (y > 0) if (y > 0)
lcd_putsf(0, 1, "Battery: %d.%03d V (%d %%)", y / 1000, y % 1000, z); lcd_putsf(0, 1, "Battery: %d.%03d V (%d %%)", y / 1000, y % 1000, battery_level());
else if (z > 0) else
lcd_putsf(0, 1, "Battery: %d %%", z); lcd_putsf(0, 1, "Battery: %d %%", _battery_level());
#ifdef ADC_EXT_POWER #ifdef ADC_EXT_POWER
y = (adc_read(ADC_EXT_POWER) * EXT_SCALE_FACTOR) / 1000; y = (adc_read(ADC_EXT_POWER) * EXT_SCALE_FACTOR) / 1000;
lcd_putsf(0, 2, "External: %d.%03d V", y / 1000, y % 1000); lcd_putsf(0, 2, "External: %d.%03d V", y / 1000, y % 1000);

4
firmware/export/powermgmt.h
View file

@ -149,10 +149,6 @@ unsigned int input_millivolts(void); /* voltage that device is running from */
void reset_battery_filter(int millivolts); void reset_battery_filter(int millivolts);
#endif /* HAVE_BATTERY_SWITCH || HAVE_RESET_BATTERY_FILTER */ #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 */ /* Tells if the battery level is safe for disk writes */
bool battery_level_safe(void); bool battery_level_safe(void);

16
firmware/powermgmt.c
View file

@ -145,22 +145,6 @@ static void battery_status_update(void);
static int runcurrent(void); static int runcurrent(void);
#endif #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 #if BATTERY_TYPES_COUNT > 1
void set_battery_type(int type) void set_battery_type(int type)
{ {

5
firmware/target/coldfire/debug-coldfire.c
View file

@ -144,7 +144,7 @@ bool dbg_ports(void)
adc_buttons = adc_read(ADC_BUTTONS); adc_buttons = adc_read(ADC_BUTTONS);
adc_remote = adc_read(ADC_REMOTE); 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) #if defined(IAUDIO_X5) || defined(IAUDIO_M5) || defined(IRIVER_H300_SERIES)
lcd_putsf(0, line++, "ADC_BUTTONS (%c): %02x", lcd_putsf(0, line++, "ADC_BUTTONS (%c): %02x",
button_scan_enabled() ? '+' : '-', adc_buttons); button_scan_enabled() ? '+' : '-', adc_buttons);
@ -162,7 +162,8 @@ bool dbg_ports(void)
adc_read(ADC_REMOTEDETECT)); adc_read(ADC_REMOTEDETECT));
#endif #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, lcd_putsf(0, line++, "Batt: %d.%03dV %d%% ", adc_battery_voltage / 1000,
adc_battery_voltage % 1000, adc_battery_level); adc_battery_voltage % 1000, adc_battery_level);