diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-02-18 01:10:42 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-02-18 01:10:42 +0000 |
commit | c2f05592ee1ba8399b64b5f63669c0eaa8cb8e0e (patch) | |
tree | 839dc8e03702a3413ccc2860bd9d801e3fe902d9 | |
parent | eff0dc3e13063a8d63710dfb8e48abf960bc0a33 (diff) | |
download | rockbox-c2f05592ee1ba8399b64b5f63669c0eaa8cb8e0e.tar.gz rockbox-c2f05592ee1ba8399b64b5f63669c0eaa8cb8e0e.zip |
more CONFIG_LED fixes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12376 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/drivers/led.c | 5 | ||||
-rw-r--r-- | firmware/panic.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/firmware/drivers/led.c b/firmware/drivers/led.c index a9be9399c8..2799b7cd8c 100644 --- a/firmware/drivers/led.c +++ b/firmware/drivers/led.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include "system.h" | 23 | #include "system.h" |
24 | #include "kernel.h" | 24 | #include "kernel.h" |
25 | 25 | ||
26 | #if CONFIG_LED == LED_REAL | 26 | #if (defined(CONFIG_LED) && (CONFIG_LED == LED_REAL)) |
27 | 27 | ||
28 | void led(bool on) | 28 | void led(bool on) |
29 | { | 29 | { |
@@ -37,7 +37,8 @@ void led(bool on) | |||
37 | } | 37 | } |
38 | } | 38 | } |
39 | 39 | ||
40 | #elif (CONFIG_LED == LED_VIRTUAL) || defined(HAVE_REMOTE_LCD) | 40 | #elif (defined(CONFIG_LED) && (CONFIG_LED == LED_VIRTUAL)) \ |
41 | || defined(HAVE_REMOTE_LCD) | ||
41 | 42 | ||
42 | static bool current; | 43 | static bool current; |
43 | static long last_on; /* timestamp of switching off */ | 44 | static long last_on; /* timestamp of switching off */ |
diff --git a/firmware/panic.c b/firmware/panic.c index aaac9ba87b..8d6b0e5bb5 100644 --- a/firmware/panic.c +++ b/firmware/panic.c | |||
@@ -39,7 +39,7 @@ void panicf( const char *fmt, ...) | |||
39 | va_list ap; | 39 | va_list ap; |
40 | 40 | ||
41 | #ifndef SIMULATOR | 41 | #ifndef SIMULATOR |
42 | #if CONFIG_LED == LED_REAL | 42 | #if (defined(CONFIG_LED) && (CONFIG_LED == LED_REAL)) |
43 | bool state = false; | 43 | bool state = false; |
44 | int i = 0; | 44 | int i = 0; |
45 | #endif | 45 | #endif |
@@ -90,7 +90,7 @@ void panicf( const char *fmt, ...) | |||
90 | while (1) | 90 | while (1) |
91 | { | 91 | { |
92 | #ifndef SIMULATOR | 92 | #ifndef SIMULATOR |
93 | #if CONFIG_LED == LED_REAL | 93 | #if (defined(CONFIG_LED) && (CONFIG_LED == LED_REAL)) |
94 | if (--i <= 0) | 94 | if (--i <= 0) |
95 | { | 95 | { |
96 | state = !state; | 96 | state = !state; |