diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2010-08-01 10:07:05 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2010-08-01 10:07:05 +0000 |
commit | 3a8e7e644bd0e67193d8b1a8340e06a9383c3d15 (patch) | |
tree | 04acfb8d346f9597459af0208bda7d1608677b0e | |
parent | 9b6d895276230fe66721bf3622af0ff17aa7a1b2 (diff) | |
download | rockbox-3a8e7e644bd0e67193d8b1a8340e06a9383c3d15.tar.gz rockbox-3a8e7e644bd0e67193d8b1a8340e06a9383c3d15.zip |
Various minor cleanups
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27647 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/backlight.c | 6 | ||||
-rw-r--r-- | firmware/sdmmc.c | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/firmware/backlight.c b/firmware/backlight.c index f9575dfdb7..1d98a0cfa7 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c | |||
@@ -973,7 +973,6 @@ void backlight_init(void) | |||
973 | 973 | ||
974 | void backlight_on(void) {} | 974 | void backlight_on(void) {} |
975 | void backlight_off(void) {} | 975 | void backlight_off(void) {} |
976 | void buttonlight_on(void) {} | ||
977 | void backlight_set_timeout(int value) {(void)value;} | 976 | void backlight_set_timeout(int value) {(void)value;} |
978 | 977 | ||
979 | bool is_backlight_on(bool ignore_always_off) | 978 | bool is_backlight_on(bool ignore_always_off) |
@@ -995,7 +994,12 @@ bool is_remote_backlight_on(bool ignore_always_off) | |||
995 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | 994 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS |
996 | void backlight_set_brightness(int val) { (void)val; } | 995 | void backlight_set_brightness(int val) { (void)val; } |
997 | #endif | 996 | #endif |
997 | |||
998 | #ifdef HAVE_BUTTONLIGHT | ||
999 | void buttonlight_on(void) {} | ||
998 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS | 1000 | #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS |
999 | void buttonlight_set_brightness(int val) { (void)val; } | 1001 | void buttonlight_set_brightness(int val) { (void)val; } |
1000 | #endif | 1002 | #endif |
1003 | #endif /* HAVE_BUTTONLIGHT */ | ||
1004 | |||
1001 | #endif /* defined(HAVE_BACKLIGHT) && defined(BACKLIGHT_FULL_INIT) */ | 1005 | #endif /* defined(HAVE_BACKLIGHT) && defined(BACKLIGHT_FULL_INIT) */ |
diff --git a/firmware/sdmmc.c b/firmware/sdmmc.c index f499ffae08..bb3820f930 100644 --- a/firmware/sdmmc.c +++ b/firmware/sdmmc.c | |||
@@ -18,13 +18,8 @@ | |||
18 | * KIND, either express or implied. | 18 | * KIND, either express or implied. |
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | #include <stdbool.h> | ||
22 | #include "config.h" | 21 | #include "config.h" |
23 | #if (CONFIG_STORAGE & STORAGE_MMC) | ||
24 | #include "ata_mmc.h" | ||
25 | #else | ||
26 | #include "sdmmc.h" | 22 | #include "sdmmc.h" |
27 | #endif | ||
28 | 23 | ||
29 | /* helper function to extract n (<=32) bits from an arbitrary position. | 24 | /* helper function to extract n (<=32) bits from an arbitrary position. |
30 | counting from MSB to LSB */ | 25 | counting from MSB to LSB */ |