From e1059a9b15ec52c0605e5128adc916f2169b9d1b Mon Sep 17 00:00:00 2001
From: Mariano Alvira <mar@devl.org>
Date: Mon, 22 Jun 2009 12:35:39 -0400
Subject: [PATCH] updated to use the leds on the RedBee hardware and made it a
 little more general.

Signed-off-by: Mariano Alvira <mar@devl.org>
---
 include/led.h       | 13 +++++++++++++
 tests/blink-blue.c  |  7 +++++--
 tests/blink-green.c |  7 +++++--
 tests/blink-red.c   |  7 +++++--
 tests/blink-white.c |  7 +++++--
 tests/rftest-rx.c   |  9 ++++++---
 tests/rftest-tx.c   |  8 +++++---
 tests/tmr-ints.c    |  3 ++-
 tests/tmr.c         |  7 +++++--
 9 files changed, 51 insertions(+), 17 deletions(-)
 create mode 100644 include/led.h

diff --git a/include/led.h b/include/led.h
new file mode 100644
index 000000000..ce2798a48
--- /dev/null
+++ b/include/led.h
@@ -0,0 +1,13 @@
+#ifndef LED_H
+#define LED_H
+
+#define LED_RED   ((1 << 23) | (1 << 8))
+#define LED_GREEN ((1 << 24) | (1 << 9))
+#define LED_BLUE  ((1 << 25) | (1 << 10))
+
+#define LED_YELLOW (LED_RED  | LED_GREEN           )
+#define LED_PURPLE (LED_RED  |             LED_BLUE)
+#define LED_CYAN   (           LED_GREEN | LED_BLUE)
+#define LED_WHITE  (LED_RED  | LED_GREEN | LED_BLUE)
+
+#endif
diff --git a/tests/blink-blue.c b/tests/blink-blue.c
index c732d9193..06699279d 100644
--- a/tests/blink-blue.c
+++ b/tests/blink-blue.c
@@ -6,17 +6,20 @@
 
 #include "embedded_types.h"
 #include "isr.h"
+#include "led.h"
+
+#define LED_BITS LED_BLUE
 
 __attribute__ ((section ("startup")))
 void main(void) {
 	
-	*(volatile uint32_t *)GPIO_PAD_DIR0 = 0x00000400;
+	*(volatile uint32_t *)GPIO_PAD_DIR0 = LED_BITS;
 
 	volatile uint32_t i;
 
 	while(1) {
 
-		*(volatile uint32_t *)GPIO_DATA0 = 0x00000400;
+		*(volatile uint32_t *)GPIO_DATA0 = LED_BITS;
 		
 		for(i=0; i<DELAY; i++) { continue; }
 
diff --git a/tests/blink-green.c b/tests/blink-green.c
index 3531ea4f5..9d74038da 100644
--- a/tests/blink-green.c
+++ b/tests/blink-green.c
@@ -6,17 +6,20 @@
 
 #include "embedded_types.h"
 #include "isr.h"
+#include "led.h"
+
+#define LED_BITS LED_GREEN
 
 __attribute__ ((section ("startup")))
 void main(void) {
 	
-	*(volatile uint32_t *)GPIO_PAD_DIR0 = 0x00000200;
+	*(volatile uint32_t *)GPIO_PAD_DIR0 = LED_BITS;
 
 	volatile uint32_t i;
 
 	while(1) {
 
-		*(volatile uint32_t *)GPIO_DATA0 = 0x00000200;
+		*(volatile uint32_t *)GPIO_DATA0 = LED_BITS;
 		
 		for(i=0; i<DELAY; i++) { continue; }
 
diff --git a/tests/blink-red.c b/tests/blink-red.c
index bdb9d44bf..93464601b 100644
--- a/tests/blink-red.c
+++ b/tests/blink-red.c
@@ -6,15 +6,18 @@
 
 #include "embedded_types.h"
 #include "isr.h"
+#include "led.h"
+
+#define LED_BITS LED_RED
 
 __attribute__ ((section ("startup"))) void main(void) {
-	*(volatile uint32_t *)GPIO_PAD_DIR0 = 0x00000100;
+	*(volatile uint32_t *)GPIO_PAD_DIR0 = LED_BITS;
 
 	volatile uint32_t i;
 
 	while(1) {
 
-		*(volatile uint32_t *)GPIO_DATA0 = 0x00000100;
+		*(volatile uint32_t *)GPIO_DATA0 = LED_BITS;
 		
 		for(i=0; i<DELAY; i++) { continue; }
 
diff --git a/tests/blink-white.c b/tests/blink-white.c
index 87d456d12..352eb7868 100644
--- a/tests/blink-white.c
+++ b/tests/blink-white.c
@@ -6,17 +6,20 @@
 
 #include "embedded_types.h"
 #include "isr.h"
+#include "led.h"
+
+#define LED_BITS LED_WHITE
 
 __attribute__ ((section ("startup")))
 void main(void) {
 	
-	*(volatile uint32_t *)GPIO_PAD_DIR0 = 0x00000700;
+	*(volatile uint32_t *)GPIO_PAD_DIR0 = LED_BITS;
 
 	volatile uint32_t i;
 
 	while(1) {
 
-		*(volatile uint32_t *)GPIO_DATA0 = 0x00000700;
+		*(volatile uint32_t *)GPIO_DATA0 = LED_BITS;
 		
 		for(i=0; i<DELAY; i++) { continue; }
 
diff --git a/tests/rftest-rx.c b/tests/rftest-rx.c
index e2c2a1491..35b527d9e 100644
--- a/tests/rftest-rx.c
+++ b/tests/rftest-rx.c
@@ -65,7 +65,10 @@ void dump_regs(uint32_t base, uint32_t len) {
 
 volatile uint8_t led;
 
-#define led_on() do  { led = 1; reg(GPIO_DATA0) = 0x00000200; } while(0);
+#include "led.h"
+#define LED LED_GREEN
+
+#define led_on() do  { led = 1; reg(GPIO_DATA0) = LED; } while(0);
 #define led_off() do { led = 0; reg(GPIO_DATA0) = 0x00000000; } while(0);
 
 void toggle_led(void) {
@@ -85,7 +88,7 @@ void main(void) {
 	uint32_t tmp;
 	uint16_t status;
 
-	*(volatile uint32_t *)GPIO_PAD_DIR0 = 0x00000200;
+	*(volatile uint32_t *)GPIO_PAD_DIR0 = LED;
 	led_on();
 	
 	/* Restore UART regs. to default */
@@ -112,7 +115,7 @@ void main(void) {
 	init_phy();
 
 	set_power(0x0f); /* 0dbm */
-	set_channel(0); /* channel 11 */
+	set_channel(1); /* channel 11 */
 
         reg(MACA_CONTROL) = SMAC_MACA_CNTL_INIT_STATE;
 	for(i=0; i<DELAY; i++) { continue; }
diff --git a/tests/rftest-tx.c b/tests/rftest-tx.c
index c4f609a4e..1ae29c154 100644
--- a/tests/rftest-tx.c
+++ b/tests/rftest-tx.c
@@ -92,7 +92,9 @@ void dump_regs(uint32_t base, uint32_t len) {
 
 volatile uint8_t led;
 
-#define led_on() do  { led = 1; reg(GPIO_DATA0) = 0x00000100; } while(0);
+#include "led.h"
+#define LED LED_RED
+#define led_on() do  { led = 1; reg(GPIO_DATA0) = LED; } while(0);
 #define led_off() do { led = 0; reg(GPIO_DATA0) = 0x00000000; } while(0);
 
 void toggle_led(void) {
@@ -121,7 +123,7 @@ void main(void) {
 	uint32_t tmp;
 	uint16_t status;
 
-	*(volatile uint32_t *)GPIO_PAD_DIR0 = 0x00000100;
+	*(volatile uint32_t *)GPIO_PAD_DIR0 = LED;
 	led_on();
 	
 	/* Restore UART regs. to default */
@@ -149,7 +151,7 @@ void main(void) {
 	init_phy();
 
 	set_power(0x0f); /* 0dbm */
-	set_channel(0); /* channel 11 */
+	set_channel(1); /* channel 11 */
 
         reg(MACA_CONTROL) = SMAC_MACA_CNTL_INIT_STATE;
 	for(i=0; i<DELAY; i++) { continue; }
diff --git a/tests/tmr-ints.c b/tests/tmr-ints.c
index e93b142e1..130e31cff 100644
--- a/tests/tmr-ints.c
+++ b/tests/tmr-ints.c
@@ -50,10 +50,11 @@
 //#include "sys-interrupt.h"
 
 #include "isr.h"
+#include "led.h"
 
 volatile uint8_t led;
 
-#define LED_VAL 0x00000300
+#define LED_VAL LED_PURPLE
 #define led_init() do { reg32(GPIO_PAD_DIR0) = LED_VAL; } while(0);
 #define led_on() do  { led = 1; reg32(GPIO_DATA0) = LED_VAL; } while(0);
 #define led_off() do { led = 0; reg32(GPIO_DATA0) = 0x00000000; } while(0);
diff --git a/tests/tmr.c b/tests/tmr.c
index 348cc4fd0..4cf822dc9 100644
--- a/tests/tmr.c
+++ b/tests/tmr.c
@@ -7,12 +7,15 @@
 #include "embedded_types.h"
 #include "utils.h"
 #include "timer.h"
+#include "led.h"
+
+#define LED LED_YELLOW
 
 __attribute__ ((section ("startup")))
 void main(void) {
 
 	/* pin direction */
-	reg32(GPIO_PAD_DIR0) = 0x00000500;
+	reg32(GPIO_PAD_DIR0) = LED;
 
 	/* timer setup */
 	/* CTRL */
@@ -37,7 +40,7 @@ void main(void) {
 	while(1) {
 
 		/* blink on */
-		reg32(GPIO_DATA0) = 0x00000500;
+		reg32(GPIO_DATA0) = LED;
 		
 		while((reg16(TMR0_SCTRL)>>15) == 0) { continue; }
 		reg16(TMR0_SCTRL) = 0; /*clear bit 15, and all the others --- should be ok, but clearly not "the right thing to do" */