devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

debug menu: avoid using constant variables in array initialization

Browse source 
gcc fails to consider indexes as constant when building with -O0

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27002 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2010-06-21 00:03:15 +00:00
parent 41167f0e7b
commit a2ab719d57
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
apps/debug_menu.c
View file

@ -1670,20 +1670,19 @@ static bool view_battery(void)
#elif defined(SANSA_E200) || defined(SANSA_C200) || CONFIG_CPU == AS3525 || \ #elif defined(SANSA_E200) || defined(SANSA_C200) || CONFIG_CPU == AS3525 || \
CONFIG_CPU == AS3525v2 CONFIG_CPU == AS3525v2
const int first = CHARGE_STATE_DISABLED;
static const char * const chrgstate_strings[] = static const char * const chrgstate_strings[] =
{ {
[CHARGE_STATE_DISABLED-first] = "Disabled", [CHARGE_STATE_DISABLED - CHARGE_STATE_DISABLED]= "Disabled",
[CHARGE_STATE_ERROR-first] = "Error", [CHARGE_STATE_ERROR - CHARGE_STATE_DISABLED] = "Error",
[DISCHARGING-first] = "Discharging", [DISCHARGING - CHARGE_STATE_DISABLED] = "Discharging",
[CHARGING-first] = "Charging", [CHARGING - CHARGE_STATE_DISABLED] = "Charging",
}; };
const char *str = NULL; const char *str = NULL;
lcd_putsf(0, 3, "Charger: %s", lcd_putsf(0, 3, "Charger: %s",
charger_inserted() ? "present" : "absent"); charger_inserted() ? "present" : "absent");
y = charge_state - first; y = charge_state - CHARGE_STATE_DISABLED;
if ((unsigned)y < ARRAYLEN(chrgstate_strings)) if ((unsigned)y < ARRAYLEN(chrgstate_strings))
str = chrgstate_strings[y]; str = chrgstate_strings[y];