From bd47d48c21ddcdd56b3654db78613d93739b8ce7 Mon Sep 17 00:00:00 2001
From: Jonathan Gordon <rockbox@jdgordon.info>
Date: Sun, 18 Feb 2007 05:07:19 +0000
Subject: Do the CONFIG_LED define

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12383 a1c6a512-1295-4272-9138-f99709370657
---
 firmware/drivers/ata.c   | 6 +++---
 firmware/drivers/led.c   | 5 ++---
 firmware/export/ata.h    | 2 +-
 firmware/export/config.h | 4 ++++
 firmware/panic.c         | 4 ++--
 5 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'firmware')

diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c
index c3c2531a2e..54a1b12143 100644
--- a/firmware/drivers/ata.c
+++ b/firmware/drivers/ata.c
@@ -71,7 +71,7 @@ static struct mutex ata_mtx;
 int ata_device; /* device 0 (master) or 1 (slave) */
 
 int ata_spinup_time = 0;
-#if defined(CONFIG_LED) && (CONFIG_LED == LED_REAL)
+#if (CONFIG_LED == LED_REAL)
 static bool ata_led_enabled = true;
 static bool ata_led_on = false;
 #endif
@@ -152,7 +152,7 @@ STATICIRAM int wait_for_end_of_transfer(void)
     return (ATA_ALT_STATUS & (STATUS_RDY|STATUS_DRQ)) == STATUS_RDY;
 }    
 
-#if defined(CONFIG_LED) && (CONFIG_LED == LED_REAL)
+#if (CONFIG_LED == LED_REAL)
 /* Conditionally block LED access for the ATA driver, so the LED can be
  * (mis)used for other purposes */
 static void ata_led(bool on) 
@@ -1003,7 +1003,7 @@ int ata_init(void)
     return 0;
 }
 
-#if defined(CONFIG_LED) && (CONFIG_LED == LED_REAL)
+#if (CONFIG_LED == LED_REAL)
 void ata_set_led_enabled(bool enabled) 
 {
     ata_led_enabled = enabled;
diff --git a/firmware/drivers/led.c b/firmware/drivers/led.c
index 2799b7cd8c..36748a1b18 100644
--- a/firmware/drivers/led.c
+++ b/firmware/drivers/led.c
@@ -23,7 +23,7 @@
 #include "system.h"
 #include "kernel.h"
 
-#if (defined(CONFIG_LED) && (CONFIG_LED == LED_REAL))
+#if (CONFIG_LED == LED_REAL)
 
 void led(bool on)
 {
@@ -37,8 +37,7 @@ void led(bool on)
     }
 }
 
-#elif (defined(CONFIG_LED) && (CONFIG_LED == LED_VIRTUAL)) \
-      || defined(HAVE_REMOTE_LCD)
+#elif (CONFIG_LED == LED_VIRTUAL) || defined(HAVE_REMOTE_LCD)
 
 static bool current;
 static long last_on; /* timestamp of switching off */
diff --git a/firmware/export/ata.h b/firmware/export/ata.h
index 697935cafc..d3323308e8 100644
--- a/firmware/export/ata.h
+++ b/firmware/export/ata.h
@@ -47,7 +47,7 @@ extern int ata_init(void);
 extern int ata_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf);
 extern int ata_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const void* buf);
 extern void ata_spin(void);
-#if defined(CONFIG_LED) && (CONFIG_LED == LED_REAL)
+#if (CONFIG_LED == LED_REAL)
 extern void ata_set_led_enabled(bool enabled);
 #endif
 extern unsigned short* ata_get_identify(void);
diff --git a/firmware/export/config.h b/firmware/export/config.h
index aaaac686b1..0a59c0bf89 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -226,6 +226,10 @@
 #define CONFIG_USBOTG 0
 #endif
 
+#ifndef CONFIG_LED
+#define CONFIG_LED 0
+#endif
+
 /* Enable the directory cache and tagcache in RAM if we have
  * plenty of RAM. Both features can be enabled independently. */
 #if ((defined(MEMORYSIZE) && (MEMORYSIZE > 8)) || MEM > 8) && \
diff --git a/firmware/panic.c b/firmware/panic.c
index 8d6b0e5bb5..c50bd54457 100644
--- a/firmware/panic.c
+++ b/firmware/panic.c
@@ -39,7 +39,7 @@ void panicf( const char *fmt, ...)
     va_list ap;
 
 #ifndef SIMULATOR
-#if (defined(CONFIG_LED) && (CONFIG_LED == LED_REAL))
+#if (CONFIG_LED == LED_REAL)
     bool state = false;
     int i = 0;
 #endif
@@ -90,7 +90,7 @@ void panicf( const char *fmt, ...)
     while (1)
     {
 #ifndef SIMULATOR
-#if (defined(CONFIG_LED) && (CONFIG_LED == LED_REAL))
+#if (CONFIG_LED == LED_REAL)
         if (--i <= 0)
         {
             state = !state;
-- 
cgit v1.2.3