From: lottaviano <lottaviano@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Fri, 5 Nov 2010 08:32:48 +0000 (+0000)
Subject: sam3n port: create hw files for lcd and leds.
X-Git-Tag: 2.6.0~5^2~17
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=42c64eab961cf2370a2e75358ff5e77162544b7d;p=bertos.git

sam3n port: create hw files for lcd and leds.

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

diff --git a/boards/sam3n-ek/examples/display/main.c b/boards/sam3n-ek/examples/display/main.c
index 7eccf43c..b6c856e0 100644
--- a/boards/sam3n-ek/examples/display/main.c
+++ b/boards/sam3n-ek/examples/display/main.c
@@ -35,6 +35,10 @@
  * \author Stefano Fedrigo <aleph@develer.com>
  */
 
+#include "hw/hw_led.h"
+#include "hw/hw_lcd.h"
+#include "bitmaps.h"
+
 #include <cpu/irq.h>
 #include <drv/timer.h>
 #include <drv/kbd.h>
@@ -49,20 +53,6 @@
 #include <kern/signal.h>
 #include <kern/proc.h>
 
-#include "hw/hw_spi.h"
-#include "bitmaps.h"
-
-
-// Lcd
-#define LCD_BACKLIGHT_MAX  15
-#define LCD_BACKLIGHT_PIN  BV(13)    // Port C
-#define LCD_SPICLOCK       12000000  // Minimum cycle len = 80 ns according specs
-
-// Leds
-#define LED_BLUE_PIN       BV(23)  // Port A
-#define LED_AMBER_PIN      BV(25)  // Port A
-#define LED_GREEN_PIN      BV(14)  // Port B
-
 // Keyboard
 #define KEY_MASK (K_LEFT | K_RIGHT)
 
@@ -88,38 +78,24 @@ static Process *hp_proc, *lp_proc, *led_proc;
 static hptime_t start, end;
 
 
-/*
- * Leds
- */
-static void led_init(void)
-{
-	PIOA_SODR = LED_BLUE_PIN | LED_AMBER_PIN;
-	PIOA_OER = LED_BLUE_PIN | LED_AMBER_PIN;
-	PIOA_PER = LED_BLUE_PIN | LED_AMBER_PIN;
-
-	PIOB_SODR = LED_GREEN_PIN;
-	PIOB_OER = LED_GREEN_PIN;
-	PIOB_PER = LED_GREEN_PIN;
-}
-
 INLINE void led_on(int idx)
 {
 	if (idx == 0)
-		PIOA_CODR = LED_BLUE_PIN;
+		LED_ON(LED_BLUE_PIN);
 	else if (idx == 1)
-		PIOB_CODR = LED_GREEN_PIN;
+		LED_ON(LED_GREEN_PIN);
 	else if (idx == 2)
-		PIOA_CODR = LED_AMBER_PIN;
+		LED_ON(LED_AMBER_PIN);
 }
 
 INLINE void led_off(int idx)
 {
 	if (idx == 0)
-		PIOA_SODR = LED_BLUE_PIN;
+		LED_OFF(LED_BLUE_PIN);
 	else if (idx == 1)
-		PIOB_SODR = LED_GREEN_PIN;
+		LED_OFF(LED_GREEN_PIN);
 	else if (idx == 2)
-		PIOA_SODR = LED_AMBER_PIN;
+		LED_OFF(LED_AMBER_PIN);
 }
 
 static bool led_blinking;
@@ -301,13 +277,6 @@ static void uptime(Bitmap *bm)
 /*
  * Lcd
  */
-static void initBacklight(void)
-{
-	PIOC_OER = LCD_BACKLIGHT_PIN;
-	PIOC_SODR = LCD_BACKLIGHT_PIN;
-	PIOC_PER = LCD_BACKLIGHT_PIN;
-}
-
 static void setBacklight(unsigned level)
 {
 	unsigned i;
@@ -316,15 +285,7 @@ static void setBacklight(unsigned level)
 		level = LCD_BACKLIGHT_MAX;
 
 	for (i = level; i <= LCD_BACKLIGHT_MAX; i++)
-	{
-		PIOC_CODR = LCD_BACKLIGHT_PIN;
-		PIOC_CODR = LCD_BACKLIGHT_PIN;
-		PIOC_CODR = LCD_BACKLIGHT_PIN;
-
-		PIOC_SODR = LCD_BACKLIGHT_PIN;
-		PIOC_SODR = LCD_BACKLIGHT_PIN;
-		PIOC_SODR = LCD_BACKLIGHT_PIN;
-	}
+		LCD_BACKLIGHT_LEVEL_UP();
 }
 
 static void setBrightness(Bitmap *bm)
@@ -392,14 +353,14 @@ int main(void)
 	IRQ_ENABLE;
 
 	kdbg_init();
-	led_init();
+	LED_INIT();
 	timer_init();
 	proc_init();
 
 	spi_dma_init(&spi);
 	spi_dma_setclock(LCD_SPICLOCK);
 	lcd_ili9225_init(&spi.fd);
-	initBacklight();
+	LCD_BACKLIGHT_INIT();
 	setBacklight(lcd_brightness);
 
 	gfx_bitmapInit(&lcd_bitmap, raster, LCD_WIDTH, LCD_HEIGHT);
diff --git a/boards/sam3n-ek/hw/hw_lcd.h b/boards/sam3n-ek/hw/hw_lcd.h
new file mode 100644
index 00000000..8aaacee9
--- /dev/null
+++ b/boards/sam3n-ek/hw/hw_lcd.h
@@ -0,0 +1,59 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2010 Develer S.r.l. (http://www.develer.com/)
+ *
+ * -->
+ *
+ * \brief Atmel SAM3N-EK testcase
+ *
+ * \author Luca Ottaviano <lottaviano@develer.com>
+ */
+
+#define LCD_BACKLIGHT_MAX  15
+#define LCD_BACKLIGHT_PIN  BV(13)    // Port C
+#define LCD_SPICLOCK       12000000  // Minimum cycle len = 80 ns according specs
+
+#define LCD_BACKLIGHT_INIT() \
+	do { \
+		PIOC_OER = LCD_BACKLIGHT_PIN; \
+		PIOC_SODR = LCD_BACKLIGHT_PIN; \
+		PIOC_PER = LCD_BACKLIGHT_PIN; \
+	} while(0)
+
+#define LCD_BACKLIGHT_LEVEL_UP() \
+	do \
+	{ \
+		PIOC_CODR = LCD_BACKLIGHT_PIN; \
+		PIOC_CODR = LCD_BACKLIGHT_PIN; \
+		PIOC_CODR = LCD_BACKLIGHT_PIN; \
+		PIOC_SODR = LCD_BACKLIGHT_PIN; \
+		PIOC_SODR = LCD_BACKLIGHT_PIN; \
+		PIOC_SODR = LCD_BACKLIGHT_PIN; \
+	} while(0)
+
diff --git a/boards/sam3n-ek/hw/hw_led.h b/boards/sam3n-ek/hw/hw_led.h
new file mode 100644
index 00000000..c441a0f0
--- /dev/null
+++ b/boards/sam3n-ek/hw/hw_led.h
@@ -0,0 +1,61 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos 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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2010 Develer S.r.l. (http://www.develer.com/)
+ * All Rights Reserved.
+ * -->
+ *
+ * \brief Led on/off macros.
+ *
+ * \author Luca Ottaviano <lottaviano@develer.com>
+ */
+
+#ifndef HW_LED_H
+#define HW_LED_H
+
+#include <cfg/macros.h>
+
+// Leds
+#define LED_BLUE_PIN       BV(23)  // Port A
+#define LED_AMBER_PIN      BV(25)  // Port A
+#define LED_GREEN_PIN      BV(14)  // Port B
+
+#define LED_ON(led)  (PIOA_CODR = led)
+#define LED_OFF(led)  (PIOA_SODR = led)
+
+#define LED_INIT() \
+	do { \
+		PIOA_SODR = LED_BLUE_PIN | LED_AMBER_PIN; \
+		PIOA_OER = LED_BLUE_PIN | LED_AMBER_PIN; \
+		PIOA_PER = LED_BLUE_PIN | LED_AMBER_PIN; \
+		PIOB_SODR = LED_GREEN_PIN; \
+		PIOB_OER = LED_GREEN_PIN; \
+		PIOB_PER = LED_GREEN_PIN; \
+	} while(0)
+
+#endif /* HW_LED_H */