From bd47d48c21ddcdd56b3654db78613d93739b8ce7 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon 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 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'firmware/drivers') diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c index c3c2531..54a1b12 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 2799b7c..36748a1 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 */ -- cgit v1.1