From 2cdb1f30c49ba460b0850d23ba9c85e0336af290 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 11 Sep 2018 11:57:50 -0700
Subject: altos: Add generic LED driver.

This driver uses the generic GPIO functions and allows per-LED port
and pin configuration. It supports up to 32 LEDs.

Rename SoC-specific LED drivers.

Remove enabled parameter to ao_led_init

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/attiny/ao_arch.h     |  2 ++
 src/attiny/ao_led.c      | 64 ------------------------------------------------
 src/attiny/ao_led_tiny.c | 61 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 64 deletions(-)
 delete mode 100644 src/attiny/ao_led.c
 create mode 100644 src/attiny/ao_led_tiny.c

(limited to 'src/attiny')

diff --git a/src/attiny/ao_arch.h b/src/attiny/ao_arch.h
index 84a94be7..a9c450fc 100644
--- a/src/attiny/ao_arch.h
+++ b/src/attiny/ao_arch.h
@@ -34,6 +34,8 @@
 
 #define AO_PORT_TYPE	uint8_t
 
+#define AO_LED_TYPE	uint8_t
+
 /* Various definitions to make GCC look more like SDCC */
 
 #define ao_arch_naked_declare	__attribute__((naked))
diff --git a/src/attiny/ao_led.c b/src/attiny/ao_led.c
deleted file mode 100644
index 88505490..00000000
--- a/src/attiny/ao_led.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright © 2009 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-#include "ao.h"
-
-uint8_t ao_led_enable;
-
-#define LED_PORT	PORTB
-#define LED_DDR		DDRB
-
-void
-ao_led_on(uint8_t colors)
-{
-	LED_PORT |= (colors & ao_led_enable);
-}
-
-void
-ao_led_off(uint8_t colors)
-{
-	LED_PORT &= ~(colors & ao_led_enable);
-}
-
-void
-ao_led_set(uint8_t colors)
-{
-	LED_PORT = (LED_PORT & ~(ao_led_enable)) | (colors & ao_led_enable);
-}
-
-void
-ao_led_toggle(uint8_t colors)
-{
-	LED_PORT ^= (colors & ao_led_enable);
-}
-
-void
-ao_led_for(uint8_t colors, uint16_t ticks) 
-{
-	ao_led_on(colors);
-	ao_delay(ticks);
-	ao_led_off(colors);
-}
-
-void
-ao_led_init(uint8_t enable)
-{
-	ao_led_enable = enable;
-	LED_PORT &= ~enable;
-	LED_DDR |= enable;
-}
diff --git a/src/attiny/ao_led_tiny.c b/src/attiny/ao_led_tiny.c
new file mode 100644
index 00000000..cd620f46
--- /dev/null
+++ b/src/attiny/ao_led_tiny.c
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2009 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include "ao.h"
+
+#define LED_PORT	PORTB
+#define LED_DDR		DDRB
+
+void
+ao_led_on(uint8_t colors)
+{
+	LED_PORT |= colors;
+}
+
+void
+ao_led_off(uint8_t colors)
+{
+	LED_PORT &= ~colors;
+}
+
+void
+ao_led_set(uint8_t colors)
+{
+	LED_PORT = (LED_PORT & ~LEDS_AVAILABLE) | (colors & LEDS_AVAILABLE);
+}
+
+void
+ao_led_toggle(uint8_t colors)
+{
+	LED_PORT ^= (colors & LEDS_AVAILABLE);
+}
+
+void
+ao_led_for(uint8_t colors, AO_TICK_TYPE ticks)
+{
+	ao_led_on(colors);
+	ao_delay(ticks);
+	ao_led_off(colors);
+}
+
+void
+ao_led_init(void)
+{
+	LED_PORT &= ~LEDS_AVAILABLE;
+	LED_DDR |= LEDS_AVAILABLE;
+}
-- 
cgit v1.2.3