From 465010c617e07eac1ce92da0329e7a3dc183a0e2 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Tue, 12 Oct 2010 23:26:49 +0000
Subject: [PATCH] misc

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3006 42af7a65-404d-4744-a932-0658087f49c3
---
 arch/avr/src/at91uc3/at91uc3_config.h | 35 +++++++++++++++++++++++++++
 configs/avr32dev1/README.txt          | 11 +++++++++
 configs/avr32dev1/ostest/defconfig    | 20 +++++++++++++++
 3 files changed, 66 insertions(+)

diff --git a/arch/avr/src/at91uc3/at91uc3_config.h b/arch/avr/src/at91uc3/at91uc3_config.h
index feac188b85..dbe6403ec3 100755
--- a/arch/avr/src/at91uc3/at91uc3_config.h
+++ b/arch/avr/src/at91uc3/at91uc3_config.h
@@ -65,17 +65,52 @@
 #  undef CONFIG_AVR32_USART2
 #endif
 
+/* Not all USART features are supported on all chips or all USARTS */
+
+#ifdef CONFIG_ARCH_CHIP_AT91UC3B
+# undef CONFIG_AVR32_USART0_RS485
+# undef CONFIG_AVR32_USART0_MAN
+# undef CONFIG_AVR32_USART0_MODEM
+# undef CONFIG_AVR32_USART0_IRDA
+# undef CONFIG_AVR32_USART0_ISO786
+# undef CONFIG_AVR32_USART1_RS485
+# undef CONFIG_AVR32_USART2_RS485
+# undef CONFIG_AVR32_USART2_MAN
+# undef CONFIG_AVR32_USART2_MODEM
+# undef CONFIG_AVR32_USART2_IRDA
+# undef CONFIG_AVR32_USART2_ISO786
+#endif
+
+/* Disable configurations if USART not selected in configuration file */
+
 #ifndef CONFIG_AVR32_USART0
 #  undef CONFIG_AVR32_USART0_RS232
 #  undef CONFIG_AVR32_USART0_SPI
+#  undef CONFIG_AVR32_USART0_RS485
+#  undef CONFIG_AVR32_USART0_MAN
+#  undef CONFIG_AVR32_USART0_MODEM
+#  undef CONFIG_AVR32_USART0_IRDA
+#  undef CONFIG_AVR32_USART0_ISO786
 #endif
+
 #ifndef CONFIG_AVR32_USART1
 #  undef CONFIG_AVR32_USART1_RS232
 #  undef CONFIG_AVR32_USART1_SPI
+#  undef CONFIG_AVR32_USART1_RS485
+#  undef CONFIG_AVR32_USART1_MAN
+#  undef CONFIG_AVR32_USART1_MODEM
+#  undef CONFIG_AVR32_USART1_IRDA
+#  undef CONFIG_AVR32_USART1_ISO786
 #endif
+
 #ifndef CONFIG_AVR32_USART2
 #  undef CONFIG_AVR32_USART2_RS232
 #  undef CONFIG_AVR32_USART2_SPI
+#  undef CONFIG_AVR32_USART2_RS485
+#  undef CONFIG_AVR32_USART2_MAN
+#  undef CONFIG_AVR32_USART2_MODEM
+#  undef CONFIG_AVR32_USART2_IRDA
+#  undef CONFIG_AVR32_USART2_ISO786
 #endif
 
 /* Is any UART configured? */
diff --git a/configs/avr32dev1/README.txt b/configs/avr32dev1/README.txt
index 3ad48e87dc..c28da89e0e 100755
--- a/configs/avr32dev1/README.txt
+++ b/configs/avr32dev1/README.txt
@@ -155,6 +155,17 @@ AVR32DEV1 Configuration Options
 	   the 100 second delay then adjust CONFIG_ARCH_LOOPSPERMSEC until
 	   the delay actually is 100 seconds.
 
+  Individual subsystems can be enabled:
+
+	CONFIG_AVR32_USARTn - Enable support for USARTn
+	CONFIG_AVR32_USARTn_RS232 - Configure USARTn as an RS232 interface.
+	CONFIG_AVR32_USARTn_SPI - Configure USARTn as an SPI interface.
+	CONFIG_AVR32_USARTn_RS485 - Configure USARTn as an RS485 interface.
+	CONFIG_AVR32_USARTn_MAN - Configure USARTn as an Manchester interface.
+	CONFIG_AVR32_USARTn_MODEM - Configure USARTn as an Modem interface.
+	CONFIG_AVR32_USARTn_IRDA - Configure USARTn as an IRDA interface.
+	CONFIG_AVR32_USARTn_ISO786 - Configure USARTn as an ISO786 interface.
+
   AT91UC3B0256 specific device driver settings
 
 	CONFIG_USARTn_SERIAL_CONSOLE - selects the USARTn for the
diff --git a/configs/avr32dev1/ostest/defconfig b/configs/avr32dev1/ostest/defconfig
index 9475724f51..3205b44445 100755
--- a/configs/avr32dev1/ostest/defconfig
+++ b/configs/avr32dev1/ostest/defconfig
@@ -102,19 +102,39 @@ CONFIG_AVR32_AVRTOOLSL=n
 # CONFIG_AVR32_USARTn - Enable support for USARTn
 # CONFIG_AVR32_USARTn_RS232 - Configure USARTn as an RS232 interface.
 # CONFIG_AVR32_USARTn_SPI - Configure USARTn as an SPI interface.
+# CONFIG_AVR32_USARTn_RS485 - Configure USARTn as an RS485 interface.
+# CONFIG_AVR32_USARTn_MAN - Configure USARTn as an Manchester interface.
+# CONFIG_AVR32_USARTn_MODEM - Configure USARTn as an Modem interface.
+# CONFIG_AVR32_USARTn_IRDA - Configure USARTn as an IRDA interface.
+# CONFIG_AVR32_USARTn_ISO786 - Configure USARTn as an ISO786 interface.
 #
 
 CONFIG_AVR32_USART0=y
 CONFIG_AVR32_USART0_RS232=y
 CONFIG_AVR32_USART0_SPI=n
+CONFIG_AVR32_USART0_RS485=n
+CONFIG_AVR32_USART0_MAN=n
+CONFIG_AVR32_USART0_MODEM=n
+CONFIG_AVR32_USART0_IRDA=n
+CONFIG_AVR32_USART0_ISO786=n
 
 CONFIG_AVR32_USART1=n
 CONFIG_AVR32_USART1_RS232=n
 CONFIG_AVR32_USART1_SPI=n
+CONFIG_AVR32_USART1_RS485=n
+CONFIG_AVR32_USART1_MAN=n
+CONFIG_AVR32_USART1_MODEM=n
+CONFIG_AVR32_USART1_IRDA=n
+CONFIG_AVR32_USART1_ISO786=n
 
 CONFIG_AVR32_USART2=n
 CONFIG_AVR32_USART2_RS232=n
 CONFIG_AVR32_USART2_SPI=n
+CONFIG_AVR32_USART2_RS485=n
+CONFIG_AVR32_USART2_MAN=n
+CONFIG_AVR32_USART2_MODEM=n
+CONFIG_AVR32_USART2_IRDA=n
+CONFIG_AVR32_USART2_ISO786=n
 
 #
 # AVR32 specific serial device driver settings
-- 
GitLab