diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2010-06-21 00:03:15 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-06-21 00:03:15 +0000 |
commit | a2ab719d57c2da0a66ece6d6ab1e2eb2a9192413 (patch) | |
tree | 66145a3c22f86f2f97bc8c8a7ff7cc8fa4965e08 /apps/debug_menu.c | |
parent | 41167f0e7b610d82e656e25feca8598361d65a44 (diff) | |
download | rockbox-a2ab719d57c2da0a66ece6d6ab1e2eb2a9192413.tar.gz rockbox-a2ab719d57c2da0a66ece6d6ab1e2eb2a9192413.zip |
debug menu: avoid using constant variables in array initialization
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
Diffstat (limited to 'apps/debug_menu.c')
-rw-r--r-- | apps/debug_menu.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 9b4ba51815..8da022453d 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -1670,20 +1670,19 @@ static bool view_battery(void) | |||
1670 | 1670 | ||
1671 | #elif defined(SANSA_E200) || defined(SANSA_C200) || CONFIG_CPU == AS3525 || \ | 1671 | #elif defined(SANSA_E200) || defined(SANSA_C200) || CONFIG_CPU == AS3525 || \ |
1672 | CONFIG_CPU == AS3525v2 | 1672 | CONFIG_CPU == AS3525v2 |
1673 | const int first = CHARGE_STATE_DISABLED; | ||
1674 | static const char * const chrgstate_strings[] = | 1673 | static const char * const chrgstate_strings[] = |
1675 | { | 1674 | { |
1676 | [CHARGE_STATE_DISABLED-first] = "Disabled", | 1675 | [CHARGE_STATE_DISABLED - CHARGE_STATE_DISABLED]= "Disabled", |
1677 | [CHARGE_STATE_ERROR-first] = "Error", | 1676 | [CHARGE_STATE_ERROR - CHARGE_STATE_DISABLED] = "Error", |
1678 | [DISCHARGING-first] = "Discharging", | 1677 | [DISCHARGING - CHARGE_STATE_DISABLED] = "Discharging", |
1679 | [CHARGING-first] = "Charging", | 1678 | [CHARGING - CHARGE_STATE_DISABLED] = "Charging", |
1680 | }; | 1679 | }; |
1681 | const char *str = NULL; | 1680 | const char *str = NULL; |
1682 | 1681 | ||
1683 | lcd_putsf(0, 3, "Charger: %s", | 1682 | lcd_putsf(0, 3, "Charger: %s", |
1684 | charger_inserted() ? "present" : "absent"); | 1683 | charger_inserted() ? "present" : "absent"); |
1685 | 1684 | ||
1686 | y = charge_state - first; | 1685 | y = charge_state - CHARGE_STATE_DISABLED; |
1687 | if ((unsigned)y < ARRAYLEN(chrgstate_strings)) | 1686 | if ((unsigned)y < ARRAYLEN(chrgstate_strings)) |
1688 | str = chrgstate_strings[y]; | 1687 | str = chrgstate_strings[y]; |
1689 | 1688 | ||