diff options
| author | Rafaël Carré <rafael.carre@gmail.com> | 2012-01-08 01:43:16 +0000 |
|---|---|---|
| committer | Rafaël Carré <rafael.carre@gmail.com> | 2012-01-08 01:43:16 +0000 |
| commit | 85528242844b71ac45e5331363a48a2956c38275 (patch) | |
| tree | 10d8af9068c4f12b2f8f673f3a835bb3211c2f0e /apps/debug_menu.c | |
| parent | 2737a66471a640d83aba07578bd67b811a340034 (diff) | |
| download | rockbox-85528242844b71ac45e5331363a48a2956c38275.tar.gz rockbox-85528242844b71ac45e5331363a48a2956c38275.zip | |
ascodec-target.h: remove
move prototypes to ascodec.h
move code to ascodec*.c
YPR0: use adc-as3514.c instead of duplicating it
TODO: merge as3514.h and ascodec.h ?
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31626 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/debug_menu.c')
| -rw-r--r-- | apps/debug_menu.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 2a742408d2..e940d24fb0 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
| @@ -108,11 +108,8 @@ | |||
| 108 | #include "debug-target.h" | 108 | #include "debug-target.h" |
| 109 | #endif | 109 | #endif |
| 110 | 110 | ||
| 111 | #if defined(SANSA_E200) || defined(SANSA_C200) || defined(PHILIPS_SA9200) \ | 111 | #if defined(HAVE_AS3514) && defined(CONFIG_CHARGING) |
| 112 | || (CONFIG_CPU == AS3525 && defined(CONFIG_CHARGING)) \ | ||
| 113 | || CONFIG_CPU == AS3525v2 | ||
| 114 | #include "ascodec.h" | 112 | #include "ascodec.h" |
| 115 | #include "as3514.h" | ||
| 116 | #endif | 113 | #endif |
| 117 | 114 | ||
| 118 | #ifdef IPOD_NANO2G | 115 | #ifdef IPOD_NANO2G |
| @@ -1129,8 +1126,7 @@ static bool view_battery(void) | |||
| 1129 | lcd_puts(0, line++, "T Battery: ?"); | 1126 | lcd_puts(0, line++, "T Battery: ?"); |
| 1130 | } | 1127 | } |
| 1131 | 1128 | ||
| 1132 | #elif defined(SANSA_E200) || defined(SANSA_C200) || CONFIG_CPU == AS3525 || \ | 1129 | #if defined(HAVE_AS3514) && defined(CONFIG_CHARGING) |
| 1133 | CONFIG_CPU == AS3525v2 | ||
| 1134 | static const char * const chrgstate_strings[] = | 1130 | static const char * const chrgstate_strings[] = |
| 1135 | { | 1131 | { |
| 1136 | [CHARGE_STATE_DISABLED - CHARGE_STATE_DISABLED]= "Disabled", | 1132 | [CHARGE_STATE_DISABLED - CHARGE_STATE_DISABLED]= "Disabled", |