diff options
author | Michael Giacomelli <giac2000@hotmail.com> | 2009-06-29 19:08:03 +0000 |
---|---|---|
committer | Michael Giacomelli <giac2000@hotmail.com> | 2009-06-29 19:08:03 +0000 |
commit | 23248a75b8c735d8dd1f93ce59b843be31f64bfb (patch) | |
tree | f170fc6fd0a9f1ff0b73d4965b703cd8d2c7d0f8 /firmware | |
parent | 3537397f3650d2b999da04b45d64cd7c14f90e66 (diff) | |
download | rockbox-23248a75b8c735d8dd1f93ce59b843be31f64bfb.tar.gz rockbox-23248a75b8c735d8dd1f93ce59b843be31f64bfb.zip |
Clean up nested defines in powermngt.h while I'm at it.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21568 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/powermgmt.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h index c5b137cab4..deeed06bd4 100644 --- a/firmware/export/powermgmt.h +++ b/firmware/export/powermgmt.h | |||
@@ -88,21 +88,17 @@ extern unsigned int power_thread_inputs; | |||
88 | #define CURRENT_BACKLIGHT 1 /* additional current when backlight always on */ | 88 | #define CURRENT_BACKLIGHT 1 /* additional current when backlight always on */ |
89 | #endif | 89 | #endif |
90 | 90 | ||
91 | #ifdef HAVE_RECORDING | 91 | #if defined(HAVE_RECORDING) && !defined(CURRENT_RECORD) |
92 | #ifndef CURRENT_RECORD | ||
93 | #define CURRENT_RECORD 1 /* additional recording current */ | 92 | #define CURRENT_RECORD 1 /* additional recording current */ |
94 | #endif | 93 | #endif /* HAVE_RECORDING && !CURRENT_RECORD*/ |
95 | #endif /* HAVE_RECORDING */ | ||
96 | 94 | ||
97 | #ifndef CURRENT_USB | 95 | #ifndef CURRENT_USB |
98 | #define CURRENT_USB 1 /* usual current in mA in USB mode */ | 96 | #define CURRENT_USB 1 /* usual current in mA in USB mode */ |
99 | #endif | 97 | #endif |
100 | 98 | ||
101 | #ifdef HAVE_REMOTE_LCD | 99 | #if defined(HAVE_REMOTE_LCD) && !defined(CURRENT_REMOTE) |
102 | #ifndef CURRENT_REMOTE | ||
103 | #define CURRENT_REMOTE 1 /* additional current when remote connected */ | 100 | #define CURRENT_REMOTE 1 /* additional current when remote connected */ |
104 | #endif /* CURRENT_REMOTE */ | 101 | #endif /* CURRENT_REMOTE && !HAVE_REMOTE_LCD */ |
105 | #endif /* HAVE_REMOTE_LCD */ | ||
106 | 102 | ||
107 | #if CONFIG_CHARGING | 103 | #if CONFIG_CHARGING |
108 | #ifndef CURRENT_MAX_CHG | 104 | #ifndef CURRENT_MAX_CHG |