summaryrefslogtreecommitdiff
path: root/firmware/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/drivers')
-rw-r--r--firmware/drivers/ata.c6
-rw-r--r--firmware/drivers/led.c5
2 files changed, 5 insertions, 6 deletions
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;
71int ata_device; /* device 0 (master) or 1 (slave) */ 71int ata_device; /* device 0 (master) or 1 (slave) */
72 72
73int ata_spinup_time = 0; 73int ata_spinup_time = 0;
74#if defined(CONFIG_LED) && (CONFIG_LED == LED_REAL) 74#if (CONFIG_LED == LED_REAL)
75static bool ata_led_enabled = true; 75static bool ata_led_enabled = true;
76static bool ata_led_on = false; 76static bool ata_led_on = false;
77#endif 77#endif
@@ -152,7 +152,7 @@ STATICIRAM int wait_for_end_of_transfer(void)
152 return (ATA_ALT_STATUS & (STATUS_RDY|STATUS_DRQ)) == STATUS_RDY; 152 return (ATA_ALT_STATUS & (STATUS_RDY|STATUS_DRQ)) == STATUS_RDY;
153} 153}
154 154
155#if defined(CONFIG_LED) && (CONFIG_LED == LED_REAL) 155#if (CONFIG_LED == LED_REAL)
156/* Conditionally block LED access for the ATA driver, so the LED can be 156/* Conditionally block LED access for the ATA driver, so the LED can be
157 * (mis)used for other purposes */ 157 * (mis)used for other purposes */
158static void ata_led(bool on) 158static void ata_led(bool on)
@@ -1003,7 +1003,7 @@ int ata_init(void)
1003 return 0; 1003 return 0;
1004} 1004}
1005 1005
1006#if defined(CONFIG_LED) && (CONFIG_LED == LED_REAL) 1006#if (CONFIG_LED == LED_REAL)
1007void ata_set_led_enabled(bool enabled) 1007void ata_set_led_enabled(bool enabled)
1008{ 1008{
1009 ata_led_enabled = enabled; 1009 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 @@
23#include "system.h" 23#include "system.h"
24#include "kernel.h" 24#include "kernel.h"
25 25
26#if (defined(CONFIG_LED) && (CONFIG_LED == LED_REAL)) 26#if (CONFIG_LED == LED_REAL)
27 27
28void led(bool on) 28void led(bool on)
29{ 29{
@@ -37,8 +37,7 @@ void led(bool on)
37 } 37 }
38} 38}
39 39
40#elif (defined(CONFIG_LED) && (CONFIG_LED == LED_VIRTUAL)) \ 40#elif (CONFIG_LED == LED_VIRTUAL) || defined(HAVE_REMOTE_LCD)
41 || defined(HAVE_REMOTE_LCD)
42 41
43static bool current; 42static bool current;
44static long last_on; /* timestamp of switching off */ 43static long last_on; /* timestamp of switching off */