# HG changeset patch
# User asl
# Date 1097050896 0
# Node ID 5ecf352a5b70c7ef151631556672513982f8bd50
# Parent  ee15b2466a5a76a83066dcab01ba4329b08a168b
        * include/var_io.h: protected PDC/SPI DMA registers from redefinition.
        The HAL may of already defined them.

diff --git a/packages/hal/arm/at91/var/current/ChangeLog b/packages/hal/arm/at91/var/current/ChangeLog
--- a/packages/hal/arm/at91/var/current/ChangeLog
+++ b/packages/hal/arm/at91/var/current/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-06  Andrea Michelotti <amichelotti@atmel.com>
+
+	* include/var_io.h: protected PDC/SPI DMA registers from redefinition.
+	The HAL may of already defined them.
+	
 2004-10-05  Savin Zlobec <savin@elatec.si>
 
 	* include/var_io.h: Added definitions for AT91M55800A SPI and PIO
diff --git a/packages/hal/arm/at91/var/current/include/var_io.h b/packages/hal/arm/at91/var/current/include/var_io.h
--- a/packages/hal/arm/at91/var/current/include/var_io.h
+++ b/packages/hal/arm/at91/var/current/include/var_io.h
@@ -744,10 +744,20 @@
 #define AT91_SPI_IER           0x14              // Interrupt Enable Register
 #define AT91_SPI_IDR           0x18              // Interrupt Disable Register
 #define AT91_SPI_IMR           0x1C              // Interrupt Mask Register
+// DMA registers are PDC registers
+// can be different from target to target
+#ifndef AT91_SPI_RPR
 #define AT91_SPI_RPR           0x20              // Receive Pointer Register
+#endif
+#ifndef AT91_SPI_RCR
 #define AT91_SPI_RCR           0x24              // Receive Counter Register
+#endif
+#ifndef AT91_SPI_TPR
 #define AT91_SPI_TPR           0x28              // Transmit Pointer Register
+#endif
+#ifndef AT91_SPI_TCR
 #define AT91_SPI_TCR           0x2C              // Transmit Counter Register
+#endif
 #define AT91_SPI_CSR0          0x30              // Chip Select Register 0
 #define AT91_SPI_CSR1          0x34              // Chip Select Register 1
 #define AT91_SPI_CSR2          0x38              // Chip Select Register 2