From 1f2750668268c947febadaaf4376a2ffa130432b Mon Sep 17 00:00:00 2001
From: batt <batt@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Fri, 4 Apr 2008 14:00:32 +0000
Subject: [PATCH] Update at91sam7 demo to new directory layout.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1215 38d2e660-2303-0410-9eaa-f027e97ec537
---
 app/at91sam7s/appconfig.h    |  6 ++++--
 app/at91sam7s/at91sam7s.mk   | 34 +++++++++++++++++-----------------
 bertos/cpu/arm/io/at91sam7.h |  3 +++
 bertos/drv/kdebug.c          |  3 ---
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/app/at91sam7s/appconfig.h b/app/at91sam7s/appconfig.h
index 501b0776..13e0171b 100644
--- a/app/at91sam7s/appconfig.h
+++ b/app/at91sam7s/appconfig.h
@@ -113,10 +113,10 @@
 	#define CONFIG_UART1_RXBUFSIZE  64
 
 	/** [bytes] Size of the outbound FIFO buffer for SPI port (AVR only). */
-	#define CONFIG_SPI_TXBUFSIZE	16
+	#define CONFIG_SPI0_TXBUFSIZE	16
 
 	/** [bytes] Size of the inbound FIFO buffer for SPI port (AVR only). */
-	#define CONFIG_SPI_RXBUFSIZE	32
+	#define CONFIG_SPI0_RXBUFSIZE	32
 
 	/** SPI data order (AVR only). */
 	#define CONFIG_SPI_DATA_ORDER	SER_MSB_FIRST
@@ -214,5 +214,7 @@
 /// Disable tests.
 #define CONFIG_TEST 0
 
+#define CONFIG_FAST_MEM 0
+
 
 #endif /* APPCONFIG_COMMON_H */
diff --git a/app/at91sam7s/at91sam7s.mk b/app/at91sam7s/at91sam7s.mk
index e346ceb0..c8ea600e 100644
--- a/app/at91sam7s/at91sam7s.mk
+++ b/app/at91sam7s/at91sam7s.mk
@@ -17,34 +17,34 @@ TRG += at91sam7s
 
 at91sam7s_CSRC = \
 	app/at91sam7s/at91sam7s.c \
-	drv/timer.c \
-	drv/ser.c \
-	cpu/arm/drv/sysirq_at91.c \
-	cpu/arm/drv/ser_at91.c \
-	mware/event.c \
-	mware/formatwr.c \
-	mware/hex.c \
-	kern/kfile.c \
-	kern/proc.c \
-	kern/proc_test.c \
-	kern/monitor.c \
-	kern/signal.c
+	bertos/drv/timer.c \
+	bertos/drv/ser.c \
+	bertos/cpu/arm/drv/sysirq_at91.c \
+	bertos/cpu/arm/drv/ser_at91.c \
+	bertos/mware/event.c \
+	bertos/mware/formatwr.c \
+	bertos/mware/hex.c \
+	bertos/kern/kfile.c \
+	bertos/kern/proc.c \
+	bertos/kern/proc_test.c \
+	bertos/kern/monitor.c \
+	bertos/kern/signal.c
 
 at91sam7s_CPPASRC = \
-	cpu/arm/hw/crtat91sam7_rom.S \
-	kern/switch_arm.S
+	bertos/cpu/arm/hw/crtat91sam7_rom.S \
+	bertos/kern/switch_arm.S
 
 at91sam7s_CROSS = arm-elf-
 
 at91sam7s_CPPAFLAGS = -O0 -g -gdwarf-2 -g -gen-debug
-at91sam7s_CPPFLAGS = -O0 -D'ARCH=0' -D__ARM_AT91SAM7S256__ -g3 -gdwarf-2 -fverbose-asm -Iapp/at91sam7s/hw -Iapp/at91sam7s -Icpu/arm
-at91sam7s_LDFLAGS = -nostartfiles -T cpu/arm/scripts/at91sam7_256_ram.ld -Wl,--no-warn-mismatch
+at91sam7s_CPPFLAGS = -O0 -D'ARCH=0' -D__ARM_AT91SAM7S256__ -g3 -gdwarf-2 -fverbose-asm -Iapp/at91sam7s/hw -Iapp/at91sam7s -Ibertos/cpu/arm
+at91sam7s_LDFLAGS = -nostartfiles -T bertos/cpu/arm/scripts/at91sam7_256_ram.ld -Wl,--no-warn-mismatch
 
 at91sam7s_CPU = arm7tdmi
 
 # Debug stuff
 ifeq ($(at91sam7s_DEBUG),1)
 	at91sam7s_CFLAGS += -D_DEBUG
-	at91sam7s_CSRC += drv/kdebug.c
+	at91sam7s_CSRC += bertos/drv/kdebug.c
 endif
 
diff --git a/bertos/cpu/arm/io/at91sam7.h b/bertos/cpu/arm/io/at91sam7.h
index 978c9e34..807a5e6a 100644
--- a/bertos/cpu/arm/io/at91sam7.h
+++ b/bertos/cpu/arm/io/at91sam7.h
@@ -310,6 +310,9 @@
 #if CPU_ARM_AT91SAM7X256 || CPU_ARM_AT91SAM7X128
 	#define TWD  10
 	#define TWCK 11
+#elif CPU_ARM_AT91SAM7S256
+	#define TWD  3
+	#define TWCK 4
 #else
 	#error No TWI pin names definition for selected ARM CPU
 #endif
diff --git a/bertos/drv/kdebug.c b/bertos/drv/kdebug.c
index c461b728..3b2c18bd 100644
--- a/bertos/drv/kdebug.c
+++ b/bertos/drv/kdebug.c
@@ -46,9 +46,6 @@
 #include <cfg/debug.h>
 
 #include <appconfig.h>
-#warning what about these?
-//#include <hw_cpu.h>     /* for CLOCK_FREQ */
-//#include <hw_ser.h>     /* Required for bus macros overrides */
 
 #include <mware/formatwr.h> /* for _formatted_write() */
 #include <mware/pgm.h>
-- 
2.25.1