Comply the demo project to new spi dma interface.

[bertos.git] / boards / sam3n-ek / examples / display / main.c

diff --git a/boards/sam3n-ek/examples/display/main.c b/boards/sam3n-ek/examples/display/main.c
index b6c856e052513291195502dc3a4c99d42863b5b0..260ada0fa590c8a803d2e4886d652a627cad5374 100644 (file)
--- a/boards/sam3n-ek/examples/display/main.c
+++ b/boards/sam3n-ek/examples/display/main.c
@@ -35,21 +35,31 @@
  * \author Stefano Fedrigo <aleph@develer.com>
  */
 
+#include "bitmaps.h"
+
 #include "hw/hw_led.h"
 #include "hw/hw_lcd.h"
-#include "bitmaps.h"
+
+#include <cfg/debug.h>
 
 #include <cpu/irq.h>
+
 #include <drv/timer.h>
 #include <drv/kbd.h>
-#include <cpu/arm/drv/spi_dma_at91.h>
 #include <drv/lcd_ili9225.h>
+
+#include <drv/spi_dma.h>
+
 #include <gfx/gfx.h>
 #include <gfx/font.h>
 #include <gfx/text.h>
+
 #include <gui/menu.h>
+
 #include <icons/logo.h>
+
 #include <io/kfile.h>
+
 #include <kern/signal.h>
 #include <kern/proc.h>
 
@@ -60,16 +70,16 @@
 #define PROC_STACK_SIZE        KERN_MINSTACKSIZE * 2
 
 #if CONFIG_KERN_HEAP
-#define hp_stack NULL
-#define lp_stack NULL
-#define led_stack NULL
+       #define hp_stack NULL
+       #define lp_stack NULL
+       #define led_stack NULL
 #else
-static PROC_DEFINE_STACK(hp_stack, PROC_STACK_SIZE);
-static PROC_DEFINE_STACK(lp_stack, PROC_STACK_SIZE);
-static PROC_DEFINE_STACK(led_stack, PROC_STACK_SIZE);
+       static PROC_DEFINE_STACK(hp_stack, PROC_STACK_SIZE);
+       static PROC_DEFINE_STACK(lp_stack, PROC_STACK_SIZE);
+       static PROC_DEFINE_STACK(led_stack, PROC_STACK_SIZE);
 #endif
 
-struct SpiDmaAt91 spi;
+struct SpiDma spi;
 static uint8_t raster[RAST_SIZE(LCD_WIDTH, LCD_HEIGHT)];
 static Bitmap lcd_bitmap;
 extern Font font_gohu;
@@ -78,26 +88,6 @@ static Process *hp_proc, *lp_proc, *led_proc;
 static hptime_t start, end;
 
 
-INLINE void led_on(int idx)
-{
-       if (idx == 0)
-               LED_ON(LED_BLUE_PIN);
-       else if (idx == 1)
-               LED_ON(LED_GREEN_PIN);
-       else if (idx == 2)
-               LED_ON(LED_AMBER_PIN);
-}
-
-INLINE void led_off(int idx)
-{
-       if (idx == 0)
-               LED_OFF(LED_BLUE_PIN);
-       else if (idx == 1)
-               LED_OFF(LED_GREEN_PIN);
-       else if (idx == 2)
-               LED_OFF(LED_AMBER_PIN);
-}
-
 static bool led_blinking;
 
 static void NORETURN led_process(void)
@@ -108,14 +98,14 @@ static void NORETURN led_process(void)
        {
                if (!led_blinking)
                {
-                       led_off(0);
-                       led_off(1);
-                       led_off(2);
+                       LED_OFF(0);
+                       LED_OFF(1);
+                       LED_OFF(2);
                        sig_wait(SIG_USER0);
                }
-               led_on(i % 3);
-               led_off((i-1) % 3);
-               timer_delay(100);
+               LED_ON(i % 3);
+               LED_OFF((i-1) % 3);
+               timer_delay(200);
        }
 }
 
@@ -277,17 +267,6 @@ static void uptime(Bitmap *bm)
 /*
  * Lcd
  */
-static void setBacklight(unsigned level)
-{
-       unsigned i;
-
-       if (level > LCD_BACKLIGHT_MAX)
-               level = LCD_BACKLIGHT_MAX;
-
-       for (i = level; i <= LCD_BACKLIGHT_MAX; i++)
-               LCD_BACKLIGHT_LEVEL_UP();
-}
-
 static void setBrightness(Bitmap *bm)
 {
        while (1)
@@ -306,7 +285,7 @@ static void setBrightness(Bitmap *bm)
                {
                        if (++lcd_brightness > LCD_BACKLIGHT_MAX)
                                lcd_brightness = 0;
-                       setBacklight(lcd_brightness);
+                       lcd_setBacklight(lcd_brightness);
                }
        }
 }
@@ -361,7 +340,7 @@ int main(void)
        spi_dma_setclock(LCD_SPICLOCK);
        lcd_ili9225_init(&spi.fd);
        LCD_BACKLIGHT_INIT();
-       setBacklight(lcd_brightness);
+       lcd_setBacklight(lcd_brightness);
 
        gfx_bitmapInit(&lcd_bitmap, raster, LCD_WIDTH, LCD_HEIGHT);
        gfx_setFont(&lcd_bitmap, &font_luBS14);