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 | |
| parent | 3537397f3650d2b999da04b45d64cd7c14f90e66 (diff) | |
| download | rockbox-23248a75b8c735d8dd1f93ce59b843be31f64bfb.zip rockbox-23248a75b8c735d8dd1f93ce59b843be31f64bfb.tar.gz rockbox-23248a75b8c735d8dd1f93ce59b843be31f64bfb.tar.bz2 rockbox-23248a75b8c735d8dd1f93ce59b843be31f64bfb.tar.xz | |
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
| -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 c5b137c..deeed06 100644 --- a/firmware/export/powermgmt.h +++ b/firmware/export/powermgmt.h @@ -88,21 +88,17 @@ extern unsigned int power_thread_inputs; #define CURRENT_BACKLIGHT 1 /* additional current when backlight always on */ #endif -#ifdef HAVE_RECORDING -#ifndef CURRENT_RECORD +#if defined(HAVE_RECORDING) && !defined(CURRENT_RECORD) #define CURRENT_RECORD 1 /* additional recording current */ -#endif -#endif /* HAVE_RECORDING */ +#endif /* HAVE_RECORDING && !CURRENT_RECORD*/ #ifndef CURRENT_USB #define CURRENT_USB 1 /* usual current in mA in USB mode */ #endif -#ifdef HAVE_REMOTE_LCD -#ifndef CURRENT_REMOTE +#if defined(HAVE_REMOTE_LCD) && !defined(CURRENT_REMOTE) #define CURRENT_REMOTE 1 /* additional current when remote connected */ -#endif /* CURRENT_REMOTE */ -#endif /* HAVE_REMOTE_LCD */ +#endif /* CURRENT_REMOTE && !HAVE_REMOTE_LCD */ #if CONFIG_CHARGING #ifndef CURRENT_MAX_CHG |