From 1a1abf25f43e33dfa7d421d6c43f283763226dbd Mon Sep 17 00:00:00 2001
From: Kevin Ferrare <kevin@rockbox.org>
Date: Sun, 20 Nov 2005 01:02:14 +0000
Subject: removed old statusbar and buttonbar code

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8004 a1c6a512-1295-4272-9138-f99709370657
---
 firmware/SOURCES       |  2 --
 firmware/drivers/led.c | 54 ++++++++++++++++++++++++++++----------------------
 firmware/export/led.h  |  4 +---
 3 files changed, 31 insertions(+), 29 deletions(-)

(limited to 'firmware')

diff --git a/firmware/SOURCES b/firmware/SOURCES
index fb8ed7b6d7..e5056c54df 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -65,9 +65,7 @@ drivers/lcd-ipod.c
 drivers/lcd-h300.c
 #endif
 drivers/power.c
-#ifdef CONFIG_LED
 drivers/led.c
-#endif
 #ifndef SIMULATOR
 drivers/adc.c
 #ifdef HAVE_MMC
diff --git a/firmware/drivers/led.c b/firmware/drivers/led.c
index ca4aadac71..1e38fa63d3 100644
--- a/firmware/drivers/led.c
+++ b/firmware/drivers/led.c
@@ -23,44 +23,50 @@
 #include "system.h"
 #include "kernel.h"
 
+static bool disk_led_status;
+static long last_on; /* timestamp of switching off */
+
+
+
+void disk_led_on(void)
+{
+    disk_led_status=true;
 #if CONFIG_LED == LED_REAL
+#ifdef GMINI_ARCH
+    P2 |= 1;
+#else
+    or_b(0x40, &PBDRL);
+#endif
+#endif
+}
 
-void led(bool on)
+void disk_led_off(void)
 {
-    if ( on )
+    if(disk_led_status)
+    {
+        last_on = current_tick;/* remember for off delay */
+        disk_led_status=false;
+#if CONFIG_LED == LED_REAL
 #ifdef GMINI_ARCH
-        P2 |= 1;
-    else
         P2 &= ~1;
 #else
-    {
-        or_b(0x40, &PBDRL);
-    }
-    else
-    {
         and_b(~0x40, &PBDRL);
-    }
 #endif
+#endif
+    }
 }
 
-#elif CONFIG_LED == LED_VIRTUAL
-
-static bool current;
-static long last_on; /* timestamp of switching off */
-
 void led(bool on)
 {
-    if (current && !on) /* switching off */
-    {
-        last_on = current_tick; /* remember for off delay */
-    }
-    current = on;
+    if ( on )
+        disk_led_on();
+    else
+        disk_led_off();
 }
 
-bool led_read(int delayticks) /* read by status bar update */
+bool led_read(int delayticks)
 {
     /* reading "off" is delayed by user-supplied monoflop value */
-    return (current || TIME_BEFORE(current_tick, last_on+delayticks));
+    return (disk_led_status ||
+        TIME_BEFORE(current_tick, last_on+delayticks));
 }
-
-#endif /* CONFIG_LED */
diff --git a/firmware/export/led.h b/firmware/export/led.h
index f1b3b95447..1dad329e4b 100644
--- a/firmware/export/led.h
+++ b/firmware/export/led.h
@@ -23,8 +23,6 @@
 #include <stdbool.h>
 
 extern void led( bool on );
-#if CONFIG_LED == LED_VIRTUAL
-extern bool led_read(int delayticks); /* read for status bar */
-#endif
+extern bool led_read(int delayticks);
 
 #endif
-- 
cgit v1.2.3