From 626fc0c49d8ba16ccd126d5329faeb3351088cdf Mon Sep 17 00:00:00 2001
From: asterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Thu, 24 Jan 2008 14:28:33 +0000
Subject: [PATCH] Add support for at91sam7x.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1059 38d2e660-2303-0410-9eaa-f027e97ec537
---
 cpu/arm/drv/kdebug_at91.c |  2 +-
 cpu/arm/drv/ser_at91.c    | 10 +++++-----
 cpu/arm/io/at91.h         |  5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/cpu/arm/drv/kdebug_at91.c b/cpu/arm/drv/kdebug_at91.c
index a5ec8343..64b3845f 100644
--- a/cpu/arm/drv/kdebug_at91.c
+++ b/cpu/arm/drv/kdebug_at91.c
@@ -76,7 +76,7 @@ INLINE void kdbg_hw_init(void)
 		DBGU_MR =  US_CHMODE_NORMAL | US_CHRL_8 | US_PAR_NO | US_NBSTOP_1;
 		/* Enable DBGU transmitter. */
 		DBGU_CR = BV(US_TXEN);
-		#if !CPU_ARM_AT91SAM7S256
+		#if !CPU_ARM_AT91SAM7S256 && !CPU_ARM_AT91SAM7X256
 			#warning Check Debug Unit AT91 pins on datasheet!
 		#endif
 		/* Disable PIO on DGBU tx pin. */
diff --git a/cpu/arm/drv/ser_at91.c b/cpu/arm/drv/ser_at91.c
index 14027e89..9f3ed4b9 100644
--- a/cpu/arm/drv/ser_at91.c
+++ b/cpu/arm/drv/ser_at91.c
@@ -101,17 +101,17 @@
 	 *
 	 * - Disable GPIO on USART0 tx/rx pins
 	 * - Reset USART0
-	 * - Set serial param: mode Normal, 8bit data, 1bit stop
+	 * - Set serial param: mode Normal, 8bit data, 1bit stop, parity none
 	 * - Enable both the receiver and the transmitter
 	 * - Enable only the RX complete interrupt
 	 */
-	#if !CPU_ARM_AT91SAM7S256
+	#if !CPU_ARM_AT91SAM7S256 && !CPU_ARM_AT91SAM7X256
 		#warning Check USART0 pins!
 	#endif
 	#define SER_UART0_BUS_TXINIT do { \
 		PIOA_PDR = BV(RXD0) | BV(TXD0); \
 		US0_CR = BV(US_RSTRX) | BV(US_RSTTX); \
-		US0_MR = US_CHMODE_NORMAL | US_CHRL_8 | US_NBSTOP_1; \
+		US0_MR = US_CHMODE_NORMAL | US_CHRL_8 | US_NBSTOP_1 | US_PAR_NO; \
 		US0_CR = BV(US_RXEN) | BV(US_TXEN); \
 		US0_IER = BV(US_RXRDY); \
 	} while (0)
@@ -173,13 +173,13 @@
 
 #ifndef SER_UART1_BUS_TXINIT
 	/** \sa SER_UART1_BUS_TXINIT */
-	#if !CPU_ARM_AT91SAM7S256
+	#if !CPU_ARM_AT91SAM7S256 && !CPU_ARM_AT91SAM7X256
 		#warning Check USART1 pins!
 	#endif
 	#define SER_UART1_BUS_TXINIT do { \
 		PIOA_PDR = BV(RXD1) | BV(TXD1); \
 		US1_CR = BV(US_RSTRX) | BV(US_RSTTX); \
-		US1_MR = US_CHMODE_NORMAL | US_CHRL_8 | US_NBSTOP_1; \
+		US1_MR = US_CHMODE_NORMAL | US_CHRL_8 | US_NBSTOP_1 | US_PAR_NO; \
 		US1_CR = BV(US_RXEN) | BV(US_TXEN); \
 		US1_IER = BV(US_RXRDY); \
 	} while (0)
diff --git a/cpu/arm/io/at91.h b/cpu/arm/io/at91.h
index 0c2feb15..7bdde9b9 100644
--- a/cpu/arm/io/at91.h
+++ b/cpu/arm/io/at91.h
@@ -75,8 +75,9 @@
 
 #include <cpu/detect.h>
 
-#if CPU_ARM_AT91SAM7S256
-	#include "at91sam7s256.h"
+#if CPU_ARM_AT91SAM7S256 || CPU_ARM_AT91SAM7X256
+	#include "at91sam7.h"
+
 #else
 	#error Missing I/O definitions for CPU.
 #endif
-- 
2.25.1