From: asterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Mon, 13 Jun 2011 09:05:59 +0000 (+0000)
Subject: Comply the demo project to new spi dma interface.
X-Git-Tag: 2.7.0~15
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=a646f247a4733ae12b2a5372c23e367e3048efaf;p=bertos.git

Comply the demo project to new spi dma interface.


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

diff --git a/boards/at91sam7x-ek/examples/sd_fat/main.c b/boards/at91sam7x-ek/examples/sd_fat/main.c
index c51da3e6..05c9ae01 100644
--- a/boards/at91sam7x-ek/examples/sd_fat/main.c
+++ b/boards/at91sam7x-ek/examples/sd_fat/main.c
@@ -104,7 +104,7 @@
 #include <drv/sd.h>
 #include <drv/ser.h>
 #include <drv/tmp123.h>
-#include <drv/spi_dma_at91.h>
+#include <drv/spi_dma.h>
 #include <drv/mpxx6115a.h>
 #include <drv/adc.h>
 
@@ -207,7 +207,7 @@ typedef struct INISetting
 /*
  * Static definition for application devices.
  */
-static SpiDmaAt91 spi_dma;
+static SpiDma spi_dma;
 static Serial temp_sensor_bus;
 static Serial log_port;
 static Sd sd;
diff --git a/boards/sam3n-ek/examples/display/display_user.mk b/boards/sam3n-ek/examples/display/display_user.mk
index f952df3f..4fabfb74 100644
--- a/boards/sam3n-ek/examples/display/display_user.mk
+++ b/boards/sam3n-ek/examples/display/display_user.mk
@@ -13,7 +13,7 @@ display_USER_CSRC = \
 	$(display_SRC_PATH)/bitmaps.c \
 	bertos/icons/logo.c \
 	bertos/fonts/gohu.c \
-	bertos/cpu/arm/drv/spi_dma_at91.c \
+	bertos/cpu/cortex-m3/drv/spi_dma_sam3.c \
 	#
 
 # Files included by the user.
diff --git a/boards/sam3n-ek/examples/display/main.c b/boards/sam3n-ek/examples/display/main.c
index caa70930..260ada0f 100644
--- a/boards/sam3n-ek/examples/display/main.c
+++ b/boards/sam3n-ek/examples/display/main.c
@@ -48,7 +48,7 @@
 #include <drv/kbd.h>
 #include <drv/lcd_ili9225.h>
 
-#include <cpu/arm/drv/spi_dma_at91.h>
+#include <drv/spi_dma.h>
 
 #include <gfx/gfx.h>
 #include <gfx/font.h>
@@ -79,7 +79,7 @@
 	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;
diff --git a/boards/sam3n-ek/templates/empty/main.c b/boards/sam3n-ek/templates/empty/main.c
index 698992fe..8e5fb782 100644
--- a/boards/sam3n-ek/templates/empty/main.c
+++ b/boards/sam3n-ek/templates/empty/main.c
@@ -44,7 +44,7 @@
 #include <cfg/debug.h>
 
 #include <cpu/irq.h>
-#include <cpu/arm/drv/spi_dma_at91.h>
+#include <drv/spi_dma.h>
 
 #include <drv/timer.h>
 #include <drv/kbd.h>
@@ -56,7 +56,7 @@ static Bitmap lcd_bitmap;
 /* Raster associated to the Bitmap image */
 static uint8_t raster[RAST_SIZE(LCD_WIDTH, LCD_HEIGHT)];
 /* LCD spi context with DMA access */
-struct SpiDmaAt91 spi;
+struct SpiDma spi;
 
 static void init(void)
 {
diff --git a/boards/sam3n-ek/templates/kernel/main.c b/boards/sam3n-ek/templates/kernel/main.c
index c0119e7b..55740793 100644
--- a/boards/sam3n-ek/templates/kernel/main.c
+++ b/boards/sam3n-ek/templates/kernel/main.c
@@ -44,7 +44,7 @@
 #include <cfg/debug.h>
 
 #include <cpu/irq.h>
-#include <cpu/arm/drv/spi_dma_at91.h>
+#include <drv/spi_dma.h>
 
 #include <drv/timer.h>
 #include <drv/kbd.h>
@@ -58,7 +58,7 @@ static Bitmap lcd_bitmap;
 /* Raster associated to the Bitmap image */
 static uint8_t raster[RAST_SIZE(LCD_WIDTH, LCD_HEIGHT)];
 /* LCD spi context with DMA access */
-struct SpiDmaAt91 spi;
+struct SpiDma spi;
 
 static void init(void)
 {