From: asterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Mon, 27 Apr 2009 14:01:04 +0000 (+0000)
Subject: Refactor code to build and run on both sam7x and sam7s cpu.
X-Git-Tag: 2.1.0~10
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=dea9ab69a9f41d054f499e3f15636ea84afb5f8b;p=bertos.git

Refactor code to build and run on both sam7x and sam7s cpu.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2672 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/examples/at91sam7x/at91sam7x.c b/examples/at91sam7x/at91sam7x.c
index aaec740d..ffc83c4c 100644
--- a/examples/at91sam7x/at91sam7x.c
+++ b/examples/at91sam7x/at91sam7x.c
@@ -36,14 +36,14 @@
  * \author Daniele Basile <asterix@develer.com>
  *
  * \brief Simple BeRTOS test on AT91SAM7X-EK evaluation board.
- * 
+ *
  * This short program shows you a simple demo of some BeRTOS feature:
- * 
+ *
  * - Debug system
  * - Timer interrupt
  * - Serial
  * - Cooperative BeRTOS Kernel
- * 
+ *
  */
 
 #include "cfg/cfg_ser.h"
@@ -51,6 +51,8 @@
 
 #include <kern/proc.h>
 
+#include <cpu/detect.h>
+
 #include <drv/timer.h>
 #include <drv/sysirq_at91.h>
 #include <drv/ser.h>
@@ -59,40 +61,81 @@
 
 Timer leds_timer;
 Serial ser_fd;
-int roll = 0;
+
+enum
+{
+	FORWARD,
+	BACKWARD,
+};
+
+int direction = FORWARD;
+
+static void leds_init(void)
+{
+	#if CPU_ARM_AT91SAM7X256
+		/* Set PB19..22 connected to PIOB */
+		PIOB_PER  = 0x780000;
+		/* Set PB19..22 as output */
+		PIOB_OER  = 0x780000;
+
+		/* Set PB19..22 to 1 to turn off leds */
+		PIOB_SODR  = 0x780000;
+
+		/* turn first led on (PB19) */
+		PIOB_CODR  = 0x80000;
+	#elif CPU_ARM_AT91SAM7S256
+		/* Set PA0..3 connected to PIOA */
+		PIOA_PER  = 0x0000001f;
+		/* Set PA0..3 as output */
+		PIOA_OER  = 0x0000001f;
+
+		/* Set PA0..3 to 1 to turn off leds */
+		PIOA_SODR  = 0x0000000f;
+		/* turn first led on (PA0) */
+		PIOA_CODR  = 0x00000001;
+	#endif
+}
+
+#if CPU_ARM_AT91SAM7X256
+	#define GET_PIO_STATUS()  (~PIOB_ODSR & 0x780000)
+	#define LAST_LED                        0x200000
+	#define FIRST_LED                       0x100000
+	#define SET_PIO_BITS                    PIOB_SODR
+	#define CLEAR_PIO_BITS                  PIOB_CODR
+	#define AT91SAM7_MSG      "BeRTOS is run on AT91SAM7X256..\n"
+#elif CPU_ARM_AT91SAM7S256
+	#define GET_PIO_STATUS()  (~PIOA_ODSR & 0x0000000f)
+	#define LAST_LED                        0x00000004
+	#define FIRST_LED                       0x00000002
+	#define SET_PIO_BITS                    PIOA_SODR
+	#define CLEAR_PIO_BITS                  PIOA_CODR
+	#define AT91SAM7_MSG      "BeRTOS is run on AT91SAM7S256..\n"
+#endif
 
 /*
- * Supercar leds effect..
+ * Knight Rider leds effect..
  */
 static void leds_toggle(void)
 {
-	uint32_t a = (~PIOB_ODSR & 0x780000);
+	uint32_t led_status = GET_PIO_STATUS();
 
 	// Turn on led in forward direction
-	if (roll == 1)
+	if (direction == FORWARD)
 	{
-		if(a == 0x200000)
-			roll = 2;
+		if(led_status == LAST_LED)
+			direction = BACKWARD;
 
-		PIOB_SODR = a;
-		PIOB_CODR = a << 1;
+		SET_PIO_BITS = led_status;
+		CLEAR_PIO_BITS = led_status << 1;
 	}
 	// Turn on led in backward direction
-	else if (roll == 2)
+	else if (direction == BACKWARD)
 	{
-		if(a == 0x100000)
-			roll = 1;
+		if(led_status == FIRST_LED)
+			direction = FORWARD;
 
-		PIOB_SODR = a;
-		PIOB_CODR = a >> 1;
-	}
-	// Start to turn on first led
-	else
-	{
-		PIOB_SODR  = 0x780000;
-		/* turn first led on */
-		PIOB_CODR  = 0x80000;
-		roll = 1;
+		SET_PIO_BITS = led_status;
+		CLEAR_PIO_BITS = led_status >> 1;
 	}
 
 	/* Wait for interval time */
@@ -107,6 +150,7 @@ int main(void)
 	kdbg_init();
 	timer_init();
 	proc_init();
+	leds_init();
 
 	ASSERT(!IRQ_ENABLED());
 
@@ -118,21 +162,6 @@ int main(void)
 	IRQ_ENABLE;
 	ASSERT(IRQ_ENABLED());
 
-	/* Disable all pullups */
-	PIOB_PUDR = 0xffffffff;
-	/* Set PB0..3 connected to PIOA */
-	PIOB_PER  = 0x780000;
-	/* Set PB0..3 as output */
-	PIOB_OER  = 0x780000;
-	/* Disable multidrive on all pins */
-	PIOB_MDDR = 0xffffffff;
-
-	/* Set PA0..3 to 1 to turn off leds */
-	PIOB_SODR  = 0x780000;
-	
-	/* turn first led on */
-	PIOB_CODR  = 0x80000;
-
 	/*
 	 * Register timer and arm timer interupt.
 	 */
@@ -148,6 +177,9 @@ int main(void)
 	else
 		kfile_printf(&ser_fd.fd, "ProcTest..FAIL!\n");
 
+
+	kputs(AT91SAM7_MSG);
+
 	// Main loop
 	for(;;)
 	{