diff options
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_serial.c | 4 | ||||
| -rwxr-xr-x | nuttx/arch/avr/src/at91uc3/Make.defs | 2 | ||||
| -rwxr-xr-x | nuttx/arch/avr/src/at91uc3/at91uc3_config.h | 125 | ||||
| -rwxr-xr-x | nuttx/arch/avr/src/at91uc3/at91uc3_internal.h | 21 | ||||
| -rw-r--r-- | nuttx/arch/avr/src/at91uc3/at91uc3_lowinit.c | 102 | ||||
| -rw-r--r-- | nuttx/arch/avr/src/at91uc3/at91uc3_serial.c | 921 | ||||
| -rw-r--r-- | nuttx/arch/avr/src/avr32/up_nommuhead.S | 25 | ||||
| -rw-r--r-- | nuttx/arch/avr/src/common/up_internal.h | 24 | ||||
| -rwxr-xr-x | nuttx/configs/avr32dev1/ostest/defconfig | 12 | ||||
| -rwxr-xr-x | nuttx/configs/avr32dev1/src/avr32dev1_internal.h | 13 | ||||
| -rwxr-xr-x | nuttx/configs/avr32dev1/src/up_boot.c | 6 |
11 files changed, 1211 insertions, 44 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_serial.c b/nuttx/arch/arm/src/stm32/stm32_serial.c index f3bdf5e30..9e5de150a 100644 --- a/nuttx/arch/arm/src/stm32/stm32_serial.c +++ b/nuttx/arch/arm/src/stm32/stm32_serial.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/arm/src/stm32/stm32_serial.c * - * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2009-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -340,7 +340,7 @@ static inline uint32_t up_serialin(struct up_dev_s *priv, int offset) static inline void up_serialout(struct up_dev_s *priv, int offset, uint32_t value) { - putreg16(value, priv->usartbase + offset); + putreg32(value, priv->usartbase + offset); } /**************************************************************************** diff --git a/nuttx/arch/avr/src/at91uc3/Make.defs b/nuttx/arch/avr/src/at91uc3/Make.defs index 25d1987a9..fc460ad28 100755 --- a/nuttx/arch/avr/src/at91uc3/Make.defs +++ b/nuttx/arch/avr/src/at91uc3/Make.defs @@ -50,7 +50,7 @@ CMN_CSRCS = up_assert.c up_blocktask.c up_copystate.c up_createstack.c \ # Required AT91UC3 files CHIP_ASRCS = -CHIP_CSRCS = +CHIP_CSRCS = at91uc3_lowinit.c at91uc3_serial.c # Configuration-dependent AT91UC3 files diff --git a/nuttx/arch/avr/src/at91uc3/at91uc3_config.h b/nuttx/arch/avr/src/at91uc3/at91uc3_config.h new file mode 100755 index 000000000..426057cb1 --- /dev/null +++ b/nuttx/arch/avr/src/at91uc3/at91uc3_config.h @@ -0,0 +1,125 @@ +/************************************************************************************ + * arch/avr/src/at91uc3/at91uc3_config.h + * + * Copyright (C) 2010 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ************************************************************************************/ + +#ifndef __ARCH_AVR_SRC_AT91UC3_AT91UC3_CONFIG_H +#define __ARCH_AVR_SRC_AT91UC3_AT91UC3_CONFIG_H + +/************************************************************************************ + * Included Files + ************************************************************************************/ + +#include <nuttx/config.h> +#include "chip.h" + +/************************************************************************************ + * Pre-processor Definitions + ************************************************************************************/ + +/* USART can be configured as a number of different devices (Only UART is supported + * here now, that will be extended). Check for consistency between USART enable + * options. + */ + +#if AVR32_NUSART < 1 +# undef CONFIG_AVR32_USART0 +# undef CONFIG_AVR32_USART1 +# undef CONFIG_AVR32_USART2 +#endif +#if AVR32_NUSART < 2 +# undef CONFIG_AVR32_USART1 +# undef CONFIG_AVR32_USART2 +#endif +#if AVR32_NUSART < 3 +# undef CONFIG_AVR32_USART2 +#endif + +#ifndef CONFIG_AVR32_USART0 +# undef CONFIG_AVR32_USART0_RS232 +# undef CONFIG_AVR32_USART0_SPI +#endif +#ifndef CONFIG_AVR32_USART1 +# undef CONFIG_AVR32_USART1_RS232 +# undef CONFIG_AVR32_USART1_SPI +#endif +#ifndef CONFIG_AVR32_USART2 +# undef CONFIG_AVR32_USART2_RS232 +# undef CONFIG_AVR32_USART2_SPI +#endif + +/* Is any UART configured? */ + +#if defined(CONFIG_AVR32_USART0_RS232) || \ + defined(CONFIG_AVR32_USART1_RS232) || \ + defined(CONFIG_AVR32_USART2_RS232) +# define HAVE_RS232_DEVICE +#else +# undef HAVE_RS232_DEVICE +#endif + +/* Is there a serial console? */ + +#if defined(CONFIG_USART0_SERIAL_CONSOLE) && defined(CONFIG_AVR32_USART0_RS232) +# undef CONFIG_USART1_SERIAL_CONSOLE +# undef CONFIG_USART2_SERIAL_CONSOLE +# define HAVE_SERIAL_CONSOLE 1 +#elif defined(CONFIG_USART1_SERIAL_CONSOLE) && defined(CONFIG_AVR32_USART10_RS232) +# undef CONFIG_USART0_SERIAL_CONSOLE +# undef CONFIG_USART2_SERIAL_CONSOLE +# define HAVE_SERIAL_CONSOLE 1 +#elif defined(CONFIG_USART2_SERIAL_CONSOLE) && defined(CONFIG_AVR32_USART20_RS232) +# undef CONFIG_USART0_SERIAL_CONSOLE +# undef CONFIG_USART1_SERIAL_CONSOLE +# define HAVE_SERIAL_CONSOLE 1 +#else +# undef CONFIG_USART0_SERIAL_CONSOLE +# undef CONFIG_USART1_SERIAL_CONSOLE +# undef CONFIG_USART2_SERIAL_CONSOLE +# undef HAVE_SERIAL_CONSOLE +#endif + +/************************************************************************************ + * Public Types + ************************************************************************************/ + +/************************************************************************************ + * Public Data + ************************************************************************************/ + +/************************************************************************************ + * Public Functions + ************************************************************************************/ + +#endif /* __ARCH_AVR_SRC_AT91UC3_AT91UC3_CONFIG_H */ + diff --git a/nuttx/arch/avr/src/at91uc3/at91uc3_internal.h b/nuttx/arch/avr/src/at91uc3/at91uc3_internal.h index a2bf10d6c..6013b2f5b 100755 --- a/nuttx/arch/avr/src/at91uc3/at91uc3_internal.h +++ b/nuttx/arch/avr/src/at91uc3/at91uc3_internal.h @@ -58,5 +58,26 @@ * Public Functions ************************************************************************************/ +/************************************************************************************ + * Name: at91uc3_clkinit + * + * Description: + * Initialiaze clock/PLL settings per the definitions in the board.h file. + * + ************************************************************************************/ + +extern void at91uc3_clkinitialize(void); + +/************************************************************************************ + * Name: at91uc3_boardinit + * + * Description: + * This function must be provided by the board-specific logic in the directory + * configs/<board-name>/up_boot.c. + * + ************************************************************************************/ + +extern void at91uc3_boardinitialize(void); + #endif /* __ARCH_AVR_SRC_AVR32_AT91UC3_INTERNAL_H */ diff --git a/nuttx/arch/avr/src/at91uc3/at91uc3_lowinit.c b/nuttx/arch/avr/src/at91uc3/at91uc3_lowinit.c new file mode 100644 index 000000000..fc2f38e32 --- /dev/null +++ b/nuttx/arch/avr/src/at91uc3/at91uc3_lowinit.c @@ -0,0 +1,102 @@ +/************************************************************************** + * arch/avr/src/at91uc3/at91uc3_lowinit.c + * + * Copyright (C) 2010 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + **************************************************************************/ + +/************************************************************************** + * Included Files + **************************************************************************/ + +#include <nuttx/config.h> + +#include "at91uc3_config.h" +#include "up_internal.h" +#include "at91uc3_internal.h" + +/************************************************************************** + * Private Definitions + **************************************************************************/ + +/************************************************************************** + * Private Types + **************************************************************************/ + +/************************************************************************** + * Private Function Prototypes + **************************************************************************/ + +/************************************************************************** + * Global Variables + **************************************************************************/ + +/************************************************************************** + * Private Variables + **************************************************************************/ + +/************************************************************************** + * Private Functions + **************************************************************************/ + +/************************************************************************** + * Public Functions + **************************************************************************/ + +/************************************************************************** + * Name: up_lowinit + * + * Description: + * This performs basic initialization of the USART used for the serial + * console. Its purpose is to get the console output availabe as soon + * as possible. + * + **************************************************************************/ + +void up_lowinit(void) +{ + /* Initialize MCU clocking */ + + at91uc3_clkinitialize(); + + /* Perform early serial initialization (so that we will have debug output + * available as soon as possible. + */ + + up_earlyserialinit(); + + /* Perform board-level initialization */ + + at91uc3_boardinitialize(); + +} + + diff --git a/nuttx/arch/avr/src/at91uc3/at91uc3_serial.c b/nuttx/arch/avr/src/at91uc3/at91uc3_serial.c new file mode 100644 index 000000000..ae0dd1453 --- /dev/null +++ b/nuttx/arch/avr/src/at91uc3/at91uc3_serial.c @@ -0,0 +1,921 @@ +/**************************************************************************** + * arch/arm/src/stm32/avr32_serial.c + * + * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <sys/types.h> +#include <stdint.h> +#include <stdbool.h> +#include <unistd.h> +#include <semaphore.h> +#include <string.h> +#include <errno.h> +#include <debug.h> + +#include <nuttx/irq.h> +#include <nuttx/arch.h> +#include <nuttx/serial.h> + +#include <arch/board/board.h> + +#include "at91uc3_config.h" +#include "chip.h" +#include "at91uc3_usart.h" +#include "up_arch.h" +#include "up_internal.h" +#include "os_internal.h" + +/**************************************************************************** + * Definitions + ****************************************************************************/ + +/* Some sanity checks *******************************************************/ + +/* Is there a USART enabled? */ + +#ifndef HAVE_RS232_DEVICE +# error "No USARTs enabled as RS232 devices" +#endif + +/* If we are not using the serial driver for the console, then we still must + * provide some minimal implementation of up_putc. + */ + +#ifdef CONFIG_USE_SERIALDRIVER + +/* Which USART with be tty0/console and which tty1? */ + +#if defined(CONFIG_USART0_SERIAL_CONSOLE) +# define CONSOLE_DEV g_usart0port /* USART0 is console */ +# define TTYS0_DEV g_usart0port /* USART0 is ttyS0 */ +# ifdef CONFIG_AVR32_USART1_RS232 +# define TTYS1_DEV g_usart1port /* USART1 is ttyS1 */ +# ifdef CONFIG_AVR32_USART2_RS232 +# define TTYS2_DEV g_usart2port /* USART2 is ttyS2 */ +# else +# undef TTYS2_DEV /* No ttyS2 */ +# endif +# else +# ifdef CONFIG_AVR32_USART2_RS232 +# define TTYS1_DEV g_usart2port /* USART2 is ttyS1 */ +# else +# undef TTYS1_DEV /* No ttyS1 */ +# endif +# undef TTYS2_DEV /* No ttyS2 */ +# endif +#elif defined(CONFIG_USART1_SERIAL_CONSOLE) +# define CONSOLE_DEV g_usart1port /* USART1 is console */ +# define TTYS0_DEV g_usart1port /* USART1 is ttyS0 */ +# ifdef CONFIG_AVR32_USART0_RS232 +# define TTYS1_DEV g_usart0port /* USART0 is ttyS1 */ +# ifdef CONFIG_AVR32_USART2_RS232 +# define TTYS2_DEV g_usart2port /* USART2 is ttyS2 */ +# else +# undef TTYS2_DEV /* No ttyS2 */ +# endif +# else +# ifdef CONFIG_AVR32_USART2_RS232 +# define TTYS1_DEV g_usart2port /* USART2 is ttyS1 */ +# else +# undef TTYS1_DEV /* No ttyS1 */ +# endif +# undef TTYS2_DEV /* No ttyS2 */ +# endif +#elif defined(CONFIG_USART2_SERIAL_CONSOLE) +# define CONSOLE_DEV g_usart2port /* USART2 is console */ +# define TTYS0_DEV g_usart2port /* USART2 is ttyS0 */ +# ifdef CONFIG_AVR32_USART0_RS232 +# define TTYS1_DEV g_usart0port /* USART0 is ttyS1 */ +# ifdef CONFIG_AVR32_USART1_RS232 +# define TTYS2_DEV g_usart1port /* USART1 is ttyS2 */ +# else +# undef TTYS2_DEV /* No ttyS2 */ +# endif +# else +# ifdef CONFIG_AVR32_USART1_RS232 +# define TTYS1_DEV g_usart1port /* USART1 is ttyS1 */ +# else +# undef TTYS1_DEV /* No ttyS1 */ +# endif +# undef TTYS2_DEV /* No ttyS2 */ +# endif +#endif + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +struct up_dev_s +{ + uint32_t usartbase; /* Base address of USART registers */ + uint32_t baud; /* Configured baud */ + uint32_t ie; /* Saved interrupt mask bits value */ + uint32_t sr; /* Saved status bits */ + uint8_t irq; /* IRQ associated with this USART */ + uint8_t parity; /* 0=none, 1=odd, 2=even */ + uint8_t bits; /* Number of bits (7 or 8) */ + bool stopbits2; /* true: Configure with 2 stop bits instead of 1 */ +}; + +/**************************************************************************** + * Private Function Prototypes + ****************************************************************************/ + +static int up_setup(struct uart_dev_s *dev); +static void up_shutdown(struct uart_dev_s *dev); +static int up_attach(struct uart_dev_s *dev); +static void up_detach(struct uart_dev_s *dev); +static int up_interrupt(int irq, void *context); +static int up_ioctl(struct file *filep, int cmd, unsigned long arg); +static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static void up_rxint(struct uart_dev_s *dev, bool enable); +static bool up_rxavailable(struct uart_dev_s *dev); +static void up_send(struct uart_dev_s *dev, int ch); +static void up_txint(struct uart_dev_s *dev, bool enable); +static bool up_txready(struct uart_dev_s *dev); + +/**************************************************************************** + * Private Variables + ****************************************************************************/ + +struct uart_ops_s g_uart_ops = +{ + .setup = up_setup, + .shutdown = up_shutdown, + .attach = up_attach, + .detach = up_detach, + .ioctl = up_ioctl, + .receive = up_receive, + .rxint = up_rxint, + .rxavailable = up_rxavailable, + .send = up_send, + .txint = up_txint, + .txready = up_txready, + .txempty = up_txready, +}; + +/* I/O buffers */ + +#ifdef CONFIG_AVR32_USART0_RS232 +static char g_usart0rxbuffer[CONFIG_USART0_RXBUFSIZE]; +static char g_usart0txbuffer[CONFIG_USART0_TXBUFSIZE]; +#endif +#ifdef CONFIG_AVR32_USART1_RS232 +static char g_usart1rxbuffer[CONFIG_USART1_RXBUFSIZE]; +static char g_usart1txbuffer[CONFIG_USART1_TXBUFSIZE]; +#endif +#ifdef CONFIG_AVR32_USART2_RS232 +static char g_usart2rxbuffer[CONFIG_USART2_RXBUFSIZE]; +static char g_usart2txbuffer[CONFIG_USART2_TXBUFSIZE]; +#endif + +/* This describes the state of the AVR32 USART0 ports. */ + +#ifdef CONFIG_AVR32_USART0_RS232 +static struct up_dev_s g_usart0priv = +{ + .usartbase = AVR32_USART0_BASE, + .baud = CONFIG_USART0_BAUD, + .irq = AVR32_IRQ_USART0, + .parity = CONFIG_USART0_PARITY, + .bits = CONFIG_USART0_BITS, + .stopbits2 = CONFIG_USART0_2STOP, +}; + +static uart_dev_t g_usart0port = +{ + .recv = + { + .size = CONFIG_USART0_RXBUFSIZE, + .buffer = g_usart0rxbuffer, + }, + .xmit = + { + .size = CONFIG_USART0_TXBUFSIZE, + .buffer = g_usart0txbuffer, + }, + .ops = &g_uart_ops, + .priv = &g_usart0priv, +}; +#endif + +/* This describes the state of the AVR32 USART1 port. */ + +#ifdef CONFIG_AVR32_USART1_RS232 +static struct up_dev_s g_usart1priv = +{ + .usartbase = AVR32_USART1_BASE, + .baud = CONFIG_USART1_BAUD, + .irq = AVR32_IRQ_USART1, + .parity = CONFIG_USART1_PARITY, + .bits = CONFIG_USART1_BITS, + .stopbits2 = CONFIG_USART1_2STOP, +}; + +static uart_dev_t g_usart1port = +{ + .recv = + { + .size = CONFIG_USART1_RXBUFSIZE, + .buffer = g_usart1rxbuffer, + }, + .xmit = + { + .size = CONFIG_USART1_TXBUFSIZE, + .buffer = g_usart1txbuffer, + }, + .ops = &g_uart_ops, + .priv = &g_usart1priv, +}; +#endif + +/* This describes the state of the AVR32 USART2 port. */ + +#ifdef CONFIG_AVR32_USART2_RS232 +static struct up_dev_s g_usart2priv = +{ + .usartbase = AVR32_USART2_BASE, + .baud = CONFIG_USART2_BAUD, + .irq = AVR32_IRQ_USART2, + .parity = CONFIG_USART2_PARITY, + .bits = CONFIG_USART2_BITS, + .stopbits2 = CONFIG_USART2_2STOP, +}; + +static uart_dev_t g_usart2port = +{ + .recv = + { + .size = CONFIG_USART2_RXBUFSIZE, + .buffer = g_usart2rxbuffer, + }, + .xmit = + { + .size = CONFIG_USART2_TXBUFSIZE, + .buffer = g_usart2txbuffer, + }, + .ops = &g_uart_ops, + .priv = &g_usart2priv, +}; +#endif + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: up_serialin + ****************************************************************************/ + +static inline uint32_t up_serialin(struct up_dev_s *priv, int offset) +{ + return getreg32(priv->usartbase + offset); +} + +/**************************************************************************** + * Name: up_serialout + ****************************************************************************/ + +static inline void up_serialout(struct up_dev_s *priv, int offset, uint32_t value) +{ + putreg32(value, priv->usartbase + offset); +} + +/**************************************************************************** + * Name: up_restoreusartint + ****************************************************************************/ + +static void up_restoreusartint(struct up_dev_s *priv, uint32_t ie) +{ + uint32_t cr; + + /* Save the interrupt mask */ + + priv->ie = ie; + + /* And restore the interrupt state (see the interrupt enable/usage table above) */ +#warning "Not Implemented" +} + +/**************************************************************************** + * Name: up_disableusartint + ****************************************************************************/ + +static inline void up_disableusartint(struct up_dev_s *priv, uint16_t *ie) +{ + if (ie) + { +#warning "Not Implemented" + } + + /* Disable all interrupts */ + + up_restoreusartint(priv, 0); +} + +/**************************************************************************** + * Name: up_setup + * + * Description: + * Configure the USART baud, bits, parity, etc. This method is called the + * first time that the serial port is opened. + * + ****************************************************************************/ + +static int up_setup(struct uart_dev_s *dev) +{ + struct up_dev_s *priv = (struct up_dev_s*)dev->priv; +#ifdef CONFIG_SUPPRESS_UART_CONFIG + uint32_t regval; + + /* Configure STOP bits */ + + regval = uUSART_MR_MODE_NORMAL; + if (priv->stopbits2) + { + regval |= USART_MR_NBSTOP_2; + } + else + { + regval |= USART_MR_NBSTOP_1; + } + + /* Configure parity */ + + switch (priv->parity) + { + case 0: + default: + regval |= USART_MR_PAR_NONE; + break; + + case 1: + regval |= USART_MR_PAR_ODD; + break; + + case 2: + regval |= USART_MR_PAR_EVEN; + break; + } + + /* Configure the number of bits per word */ + + switch (priv->bits) + { + case 5: + regval |= USART_MR_CHRL_5BITS; + break; + + case 6: + regval |= USART_MR_CHRL_6BITS; + break; + + case 7: + regval |= USART_MR_CHRL_7BITS; + break; + + case 8: + default: + regval |= USART_MR_CHRL_8BITS; + break; + + case 9: + regval |= USART_MR_MODE9; + break; + } + + regval = up_serialout(priv, AVR32_USART_MR_OFFSET, regval); + + + /* Enable interrupts at the UART */ +#warning "Not Implemented" +/* priv->ie = */ + + /* Configure hardware flow control -- Not yet supported */ +#warning "Not Implemented" + + /* Configure the USART Baud Rate */ +#warning "Not Implemented" + + /* Enable Rx, Tx, and the USART */ +#warning "Not Implemented" +#endif + + return OK; +} + +/**************************************************************************** + * Name: up_shutdown + * + * Description: + * Disable the USART. This method is called when the serial + * port is closed + * + ****************************************************************************/ + +static void up_shutdown(struct uart_dev_s *dev) +{ + struct up_dev_s *priv = (struct up_dev_s*)dev->priv; + uint32_t regval; + + /* Disable all interrupts */ + + up_disableusartint(priv, NULL); + + /* Disable Rx, Tx, and the UART */ + +#warning "Not Implemented" +} + +/**************************************************************************** + * Name: up_attach + * + * Description: + * Configure the USART to operation in interrupt driven mode. This method is + * called when the serial port is opened. Normally, this is just after the + * the setup() method is called, however, the serial console may operate in + * a non-interrupt driven mode during the boot phase. + * + * RX and TX interrupts are not enabled when by the attach method (unless the + * hardware supports multiple levels of interrupt enabling). The RX and TX + * interrupts are not enabled until the txint() and rxint() methods are called. + * + ****************************************************************************/ + +static int up_attach(struct uart_dev_s *dev) +{ + struct up_dev_s *priv = (struct up_dev_s*)dev->priv; + int ret; + + /* Attach and enable the IRQ */ + + ret = irq_attach(priv->irq, up_interrupt); + if (ret == OK) + { + /* Enable the interrupt (RX and TX interrupts are still disabled + * in the USART + */ + + up_enable_irq(priv->irq); + } + return ret; +} + +/**************************************************************************** + * Name: up_detach + * + * Description: + * Detach USART interrupts. This method is called when the serial port is + * closed normally just before the shutdown method is called. The exception + * is the serial console which is never shutdown. + * + ****************************************************************************/ + +static void up_detach(struct uart_dev_s *dev) +{ + struct up_dev_s *priv = (struct up_dev_s*)dev->priv; + up_disable_irq(priv->irq); + irq_detach(priv->irq); +} + +/**************************************************************************** + * Name: up_interrupt + * + * Description: + * This is the USART interrupt handler. It will be invoked when an + * interrupt received on the 'irq' It should call uart_transmitchars or + * uart_receivechar to perform the appropriate data transfers. The + * interrupt handling logic must be able to map the 'irq' number into the + * approprite uart_dev_s structure in order to call these functions. + * + ****************************************************************************/ + +static int up_interrupt(int irq, void *context) +{ + struct uart_dev_s *dev = NULL; + struct up_dev_s *priv; + int passes; + bool handled; + +#ifdef CONFIG_AVR32_USART0_RS232 + if (g_usart0priv.irq == irq) + { + dev = &g_usart0port; + } + else +#endif +#ifdef CONFIG_AVR32_USART1_RS232 + if (g_usart1priv.irq == irq) + { + dev = &g_usart1port; + } + else +#endif +#ifdef CONFIG_AVR32_USART2_RS232 + if (g_usart2priv.irq == irq) + { + dev = &g_usart2port; + } + else +#endif + { + PANIC(OSERR_INTERNAL); + } + priv = (struct up_dev_s*)dev->priv; + + /* Loop until there are no characters to be transferred or, + * until we have been looping for a long time. + */ + + handled = true; + for (passes = 0; passes < 256 && handled; passes++) + { + handled = false; + + /* Get the masked USART status and clear the pending interrupts. */ +#warning "Not Implemented" + + /* Handle incoming, receive bytes (with or without timeout) */ +#warning "Not Implemented" + if (false) + { + /* Received data ready... process incoming bytes */ + + uart_recvchars(dev); + handled = true; + } + + /* Handle outgoing, transmit bytes */ +#warning "Not Implemented" + if (false) + { + /* Transmit data regiser empty ... process outgoing bytes */ + + uart_xmitchars(dev); + handled = true; + } + } + return OK; +} + +/**************************************************************************** + * Name: up_ioctl + * + * Description: + * All ioctl calls will be routed through this method + * + ****************************************************************************/ + +static int up_ioctl(struct file *filep, int cmd, unsigned long arg) +{ + struct inode *inode = filep->f_inode; + struct uart_dev_s *dev = inode->i_private; +#ifdef CONFIG_USART_BREAKS + struct up_dev_s *priv = (struct up_dev_s*)dev->priv; +#endif + int ret = OK; + + switch (cmd) + { + case TIOCSERGSTRUCT: + { + struct up_dev_s *user = (struct up_dev_s*)arg; + if (!user) + { + ret = -EINVAL; + } + else + { + memcpy(user, dev, sizeof(struct up_dev_s)); + } + } + break; + + default: + ret = -ENOTTY; + break; + } + + return ret; +} + +/**************************************************************************** + * Name: up_receive + * + * Description: + * Called (usually) from the interrupt level to receive one + * character from the USART. Error bits associated with the + * receipt are provided in the return 'status'. + * + ****************************************************************************/ + +static int up_receive(struct uart_dev_s *dev, uint32_t *status) +{ + struct up_dev_s *priv = (struct up_dev_s*)dev->priv; + uint32_t dr; + + /* Get the Rx byte */ +#warning "Not Implemented" + + /* Get the Rx byte plux error information. Return those in status */ +#warning "Not Implemented" + priv->sr = 0; + + /* Then return the actual received byte */ + + return dr & 0xff; +} + +/**************************************************************************** + * Name: up_rxint + * + * Description: + * Call to enable or disable RX interrupts + * + ****************************************************************************/ + +static void up_rxint(struct uart_dev_s *dev, bool enable) +{ + struct up_dev_s *priv = (struct up_dev_s*)dev->priv; + uint32_t ie; + + ie = priv->ie; + if (enable) + { + /* Receive an interrupt when their is anything in the Rx data register (or an Rx + * timeout occurs). + */ + +#ifndef CONFIG_SUPPRESS_SERIAL_INTS +#ifdef CONFIG_USART_ERRINTS +#warning "Not Implemented" +#else +#warning "Not Implemented" +#endif +#endif + } + else + { +#warning "Not Implemented" + } + + /* Then set the new interrupt state */ + + up_restoreusartint(priv, ie); +} + +/**************************************************************************** + * Name: up_rxavailable + * + * Description: + * Return true if the receive register is not empty + * + ****************************************************************************/ + +static bool up_rxavailable(struct uart_dev_s *dev) +{ + struct up_dev_s *priv = (struct up_dev_s*)dev->priv; +#warning "Not Implemented" +} + +/**************************************************************************** + * Name: up_send + * + * Description: + * This method will send one byte on the USART + * + ****************************************************************************/ + +static void up_send(struct uart_dev_s *dev, int ch) +{ + struct up_dev_s *priv = (struct up_dev_s*)dev->priv; +#warning "Not Implemented" +} + +/**************************************************************************** + * Name: up_txint + * + * Description: + * Call to enable or disable TX interrupts + * + ****************************************************************************/ + +static void up_txint(struct uart_dev_s *dev, bool enable) +{ + struct up_dev_s *priv = (struct up_dev_s*)dev->priv; + irqstate_t flags; + + flags = irqsave(); + if (enable) + { + /* Set to receive an interrupt when the TX data register is empty */ + +#ifndef CONFIG_SUPPRESS_SERIAL_INTS +#warning "Not Implemented" + + /* Fake a TX interrupt here by just calling uart_xmitchars() with + * interrupts disabled (note this may recurse). + */ + + uart_xmitchars(dev); +#endif + } + else + { + /* Disable the TX interrupt */ + +#warning "Not Implemented" + } + irqrestore(flags); +} + +/**************************************************************************** + * Name: up_txready + * + * Description: + * Return true if the tranmsit data register is empty + * + ****************************************************************************/ + +static bool up_txready(struct uart_dev_s *dev) +{ + struct up_dev_s *priv = (struct up_dev_s*)dev->priv; +#warning "Not Implemented" +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: up_earlyserialinit + * + * Description: + * Performs the low level USART initialization early in debug so that the + * serial console will be available during bootup. This must be called + * before up_serialinit. + * + ****************************************************************************/ + +void up_earlyserialinit(void) +{ + /* Disable all USARTS */ + + up_disableusartint(TTYS0_DEV.priv, NULL); +#ifdef TTYS1_DEV + up_disableusartint(TTYS1_DEV.priv, NULL); +#endif +#ifdef TTYS2_DEV + up_disableusartint(TTYS2_DEV.priv, NULL); +#endif + + /* Configuration whichever one is the console */ + +#ifdef HAVE_SERIAL_CONSOLE + CONSOLE_DEV.isconsole = true; + up_setup(&CONSOLE_DEV); +#endif +} + +/**************************************************************************** + * Name: up_serialinit + * + * Description: + * Register serial console and serial ports. This assumes + * that up_earlyserialinit was called previously. + * + ****************************************************************************/ + +void up_serialinit(void) +{ + /* Register the console */ + +#ifdef HAVE_SERIAL_CONSOLE + (void)uart_register("/dev/console", &CONSOLE_DEV); +#endif + + /* Register all USARTs */ + + (void)uart_register("/dev/ttyS0", &TTYS0_DEV); +#ifdef TTYS1_DEV + (void)uart_register("/dev/ttyS1", &TTYS1_DEV); +#endif +#ifdef TTYS2_DEV + (void)uart_register("/dev/ttyS2", &TTYS2_DEV); +#endif +} + +/**************************************************************************** + * Name: up_putc + * + * Description: + * Provide priority, low-level access to support OS debug writes + * + ****************************************************************************/ + +int up_putc(int ch) +{ +#ifdef HAVE_SERIAL_CONSOLE + struct up_dev_s *priv = (struct up_dev_s*)CONSOLE_DEV.priv; + uint16_t ie; + + up_disableusartint(priv, &ie); + + /* Check for LF */ + + if (ch == '\n') + { + /* Add CR */ + + up_lowputc('\r'); + } + + up_lowputc(ch); + up_restoreusartint(priv, ie); +#endif + return ch; +} + +#else /* CONFIG_USE_SERIALDRIVER */ + +/**************************************************************************** + * Name: up_putc + * + * Description: + * Provide priority, low-level access to support OS debug writes + * + ****************************************************************************/ + +int up_putc(int ch) +{ +#ifdef HAVE_SERIAL_CONSOLE + /* Check for LF */ + + if (ch == '\n') + { + /* Add CR */ + + up_lowputc('\r'); + } + + up_lowputc(ch); +#endif + return ch; +} + +#endif /* CONFIG_USE_SERIALDRIVER */ + +/************************************************************************** + * Name: up_lowputc + * + * Description: + * Output one byte on the serial console + * + **************************************************************************/ + +void up_lowputc(char ch) +{ +#ifdef HAVE_SERIAL_CONSOLE + /* Wait until the TX data register is empty */ +#warning "Not Implemented" + + /* Then send the character */ +#warning "Not Implemented" +#endif +} diff --git a/nuttx/arch/avr/src/avr32/up_nommuhead.S b/nuttx/arch/avr/src/avr32/up_nommuhead.S index 6e0edb220..a5531b45c 100644 --- a/nuttx/arch/avr/src/avr32/up_nommuhead.S +++ b/nuttx/arch/avr/src/avr32/up_nommuhead.S @@ -55,7 +55,6 @@ .global _eronly /* Start of .data section in FLASH */ #endif .global up_lowinit /* Perform low level initialization */ - .global up_boardinit /* Low-level board initialization */ .global os_start /* NuttX entry point */ .global vectors /* Vector base address */ @@ -63,20 +62,6 @@ * Macros ****************************************************************************/ -#ifdef CONFIG_DEBUG - .macro showprogress, code - .endm - .macro doputc, code - mov r12, \code - mcall up_putc - .endm -#else - .macro showprogress, code - .endm - .macro doputc, code - .endm -#endif - /**************************************************************************** * OS Entry Point ****************************************************************************/ @@ -105,7 +90,6 @@ __start: /* Enable exception processing */ csrf AVR32_SR_EM_SHIFT - showprogress 'A' /* Clear system BSS section */ @@ -119,8 +103,6 @@ __start: cp r0, r1 /* Finished? */ brlo 1b /* No... keep looping */ - showprogress 'B' - /* Copy system .data sections to new home in RAM. */ #ifdef CONFIG_BOOT_RUNFROMFLASH @@ -136,7 +118,6 @@ __start: cp r0, r1 /* Finished? */ brlo 3b /* No... keep looping */ - showprogress 'C' #endif /* Clear the frame pointer and link register since this is the outermost @@ -150,12 +131,6 @@ __start: mcall up_lowinit - doputc 'D' - - /* Board specific early initialization */ - - mcall up_ledinit - /* Then jump to OS entry (will not return) */ rjmp os_start diff --git a/nuttx/arch/avr/src/common/up_internal.h b/nuttx/arch/avr/src/common/up_internal.h index 2468326ee..417ffeb60 100644 --- a/nuttx/arch/avr/src/common/up_internal.h +++ b/nuttx/arch/avr/src/common/up_internal.h @@ -175,7 +175,7 @@ extern uint32_t *up_va2pte(uintptr_t vaddr); # define up_pginitialize() #endif /* CONFIG_PAGING */ -/* Defined in up_allocateheap.c */ +/* Defined in common/up_allocateheap.c or chip/xxx_allocateheap.c */ #if CONFIG_MM_REGIONS > 1 void up_addregion(void); @@ -183,7 +183,15 @@ void up_addregion(void); # define up_addregion() #endif -/* Defined in up_serial.c */ +/* Defined in chip/xxx_lowinit.c. This function is called from the + * head.S file just before jumping to os_start(). This function + * performs whatever very low level initialization that is needed + * before the OS gets started (clocks, console, LEDs, etc.) + */ + +extern void up_lowinit(void); + +/* Defined in chip/xxx_serial.c */ #if CONFIG_NFILE_DESCRIPTORS > 0 extern void up_earlyserialinit(void); @@ -201,27 +209,25 @@ extern void lowconsole_init(void); # define lowconsole_init() #endif -/* Defined in up_timerisr.c */ +/* Defined in chip/xxx_timerisr.c */ extern void up_timerinit(void); -/* Defined in up_irq.c */ +/* Defined in chip/xxx_irq.c */ extern void up_maskack_irq(int irq); -/* Defined in board/up_leds.c */ +/* Defined in configs/<board-name>/src/up_leds.c */ #ifdef CONFIG_ARCH_LEDS -extern void up_ledinit(void); extern void up_ledon(int led); extern void up_ledoff(int led); #else -# define up_ledinit() # define up_ledon(led) # define up_ledoff(led) #endif -/* Defined in board/up_network.c */ +/* Defined in chip/xxx_ethernet.c */ #ifdef CONFIG_NET extern void up_netinitialize(void); @@ -229,7 +235,7 @@ extern void up_netinitialize(void); # define up_netinitialize() #endif -/* Defined in board/up_ethernet.c */ +/* Defined in chip/xxx_usbdev.c */ #ifdef CONFIG_USBDEV extern void up_usbinitialize(void); diff --git a/nuttx/configs/avr32dev1/ostest/defconfig b/nuttx/configs/avr32dev1/ostest/defconfig index 79637bfaa..8f01da96e 100755 --- a/nuttx/configs/avr32dev1/ostest/defconfig +++ b/nuttx/configs/avr32dev1/ostest/defconfig @@ -101,14 +101,20 @@ 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_USART0=y +CONFIG_AVR32_USART0_RS232=y +CONFIG_AVR32_USART0_SPI=n + CONFIG_AVR32_USART1=n +CONFIG_AVR32_USART1_RS232=n +CONFIG_AVR32_USART1_SPI=n + CONFIG_AVR32_USART2=n -CONFIG_AVR32_USART0_RS232=y -CONFIG_AVR32_USART1_RS232=y -CONFIG_AVR32_USART2_RS232=y +CONFIG_AVR32_USART2_RS232=n +CONFIG_AVR32_USART2_SPI=n # # AVR32 specific serial device driver settings diff --git a/nuttx/configs/avr32dev1/src/avr32dev1_internal.h b/nuttx/configs/avr32dev1/src/avr32dev1_internal.h index 79901ea7d..b0fedd751 100755 --- a/nuttx/configs/avr32dev1/src/avr32dev1_internal.h +++ b/nuttx/configs/avr32dev1/src/avr32dev1_internal.h @@ -48,7 +48,7 @@ * Definitions
************************************************************************************/
-/* AT91DEV1 GPIO Pin Definitions ****************************************************/
+/* AVRDEV1 GPIO Pin Definitions *****************************************************/
/************************************************************************************
* Public Types
@@ -64,6 +64,17 @@ * Public Functions
************************************************************************************/
+/************************************************************************************
+ * Name: avr32dev1_ledinitialize
+ *
+ * Description:
+ * Configure on-board LEDs if LED support has been selected.
+ ************************************************************************************/
+
+#ifdef CONFIG_ARCH_LEDS
+extern void avr32dev1_ledinitialize(void);
+#endif
+
#endif /* __ASSEMBLY__ */
#endif /* _CONFIGS_AT91DEV1_SRC_AT91DEV1_INTERNAL_H */
diff --git a/nuttx/configs/avr32dev1/src/up_boot.c b/nuttx/configs/avr32dev1/src/up_boot.c index 0fc8971d1..f75cda398 100755 --- a/nuttx/configs/avr32dev1/src/up_boot.c +++ b/nuttx/configs/avr32dev1/src/up_boot.c @@ -63,7 +63,7 @@ ************************************************************************************/
/************************************************************************************
- * Name: avr32_boardinitialize
+ * Name: at91uc3_boardinitialize
*
* Description:
* All AVR32 architectures must provide the following entry point. This entry point
@@ -72,13 +72,13 @@ *
************************************************************************************/
-void avr32_boardinitialize(void)
+void at91uc3_boardinitialize(void)
{
/* Configure SPI chip selects */
/* Configure on-board LEDs if LED support has been selected. */
#ifdef CONFIG_ARCH_LEDS
- up_ledinit();
+ avr32dev1_ledinitialize();
#endif
}
|