sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Basic UART/console functionality

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1697 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2009-04-11 23:19:09 +00:00
parent ff0f5c789f
commit 291355c77e
9 changed files with 1408 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/src/dm320/dm320_lowputc.S
View File

@ -1,7 +1,8 @@
/**************************************************************************
* dm320/dm320_lowputc.S
* arch/arm/src/dm320/dm320_lowputc.S
* arch/arm/src/chip/dm320_lowputc.S
*
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without

13
arch/arm/src/dm320/dm320_serial.c
View File

@ -1,7 +1,8 @@
/****************************************************************************
* dm320/dm320_serial.c
* arch/arm/src/dm320/dm320_serial.c
* arch/arm/src/chip/dm320_serial.c
*
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -61,8 +62,6 @@
* Definitions
****************************************************************************/
#define BASE_BAUD 115200
/****************************************************************************
* Private Types
****************************************************************************/
@ -548,8 +547,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
struct up_dev_s *user = (struct up_dev_s*)arg;
if (!user)
{
*get_errno_ptr() = EINVAL;
ret = ERROR;
ret = -EINVAL;
}
else
{
@ -576,8 +574,7 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
break;
default:
*get_errno_ptr() = ENOTTY;
ret = ERROR;
ret = -ENOTTY;
break;
}

4
arch/arm/src/imx/Make.defs
View File

@ -45,9 +45,9 @@ CMN_CSRCS = up_assert.c up_blocktask.c up_copystate.c up_createstack.c \
up_sigdeliver.c up_syscall.c up_unblocktask.c \
up_undefinedinsn.c up_usestack.c
CHIP_ASRCS = #imx_lowputc.S imx_restart.S
CHIP_ASRCS = imx_lowputc.S #imx_restart.S
CHIP_CSRCS = imx_boot.c imx_gpio.c imx_allocateheap.c imx_irq.c \
# imx_decodeirq.c imx_serial.c imx_timerisr.c imx_framebuffer.c
imx_serial.c # imx_decodeirq.c imx_timerisr.c imx_framebuffer.c
ifeq ($(CONFIG_USBDEV),y)
CHIP_CSRCS += imx_usbdev.c

128
arch/arm/src/imx/imx_lowputc.S Normal file
View File

@ -0,0 +1,128 @@
/**************************************************************************
* arch/arm/src/imx/imx_lowputc.S
* arch/arm/src/chip/imx_lowputc.S
*
* 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 "up_internal.h"
#include "up_arch.h"
/**************************************************************************
* Private Definitions
**************************************************************************/
/**************************************************************************
* Private Types
**************************************************************************/
/**************************************************************************
* Private Function Prototypes
**************************************************************************/
/**************************************************************************
* Global Variables
**************************************************************************/
/**************************************************************************
* Private Variables
**************************************************************************/
/**************************************************************************
* Private Functions
**************************************************************************/
/**************************************************************************
* Public Functions
**************************************************************************/
/**************************************************************************
* Name: up_lowputc
**************************************************************************/
/* This assembly language version has the advantage that it can does not
* require a C stack and uses only r0-r1. Hence it can be used during
* early boot phases.
*/
.text
.global up_lowputc
.type up_lowputc, function
up_lowputc:
/* On entry, r0 holds the character to be printed */
#ifdef CONFIG_UART1_SERIAL_CONSOLE
ldr r2, =IMX_UART1_VBASE /* r2=UART1 base */
#else
ldr r2, =IMX_UART2_VBASE /* r2=UART0 base */
#endif
/* Poll the TX fifo trigger level bit of the UART status register #2 .
* When the bit is non-zero, the TX Buffer FIFO is empty.
*/
1: ldr r1, [r2, #UART_USR2]
tst r1, #UART_USR2_TXFE
beq 1b
/* Send the character by writing it into the UART_DTRR
* register.
*/
str r0, [r2, #UART_TXD0]
/* If the character that we just sent was a linefeed,
* then send a carriage return as well.
*/
teq r0, #'\n'
moveq r0, #'\r'
beq 1b
/* Wait for the tranmsit regiser to be emptied. When the bit is
* non-zero, the TX Buffer FIFO is empty.
*/
2: ldrh r1, [r2, #UART_USR2]
tst r1, #UART_USR2_TXFE
beq 2b
/* Then return */
mov pc, lr
.end

1227
arch/arm/src/imx/imx_serial.c Normal file
View File

File diff suppressed because it is too large Load Diff

10
arch/arm/src/imx/imx_uart.h
View File

@ -81,7 +81,7 @@
/* UART Receiver Register */
#define UART_RXD_DATA_SHIFT 0 /* Bits 0-7: Received Data */
#define UART_RXD_DATA_MASK (0x7f << UART_RXD_DATA_SHIFT)
#define UART_RXD_DATA_MASK (0xff << UART_RXD_DATA_SHIFT)
#define UART_RXD_PRERR (1 << 10) /* Bit 10: Parity Error */
#define UART_RXD_BRK (1 << 11) /* Bit 11: Break Detect */
#define UART_RXD_FRMERR (1 << 12) /* Bit 12: Frame Error */
@ -212,6 +212,14 @@
#define UART_USR2_TXFE (1 << 14) /* Bit 14: Transmit Buffer FIFO empty */
#define UART_USR2_ADET (1 << 15) /* Bit 15: Automatic baud rate detection complete */
/* UART Test Register */
#define UART_UTS_TXFULL (1 << 4) /* Bit 4: TxFIFO FULL */
#define UART_UTS_RXEMPTY (1 << 5) /* Bit 5: RxFIFO Empty */
#define UART_UTS_TXEMPTY (1 << 6) /* Bit 6: TxFIFO */
#define UART_UTS_LOOP (1 << 12) /* Bit 12: Loop TX and RX for Test */
#define UART_UTS_FRCPERR (1 << 13) /* Bit 13: Force Parity Error */
/************************************************************************************
* Inline Functions
************************************************************************************/

21
configs/mx1ads/include/board.h
View File

@ -48,7 +48,26 @@
/************************************************************************************
* Definitions
************************************************************************************/
/* Clock settings */
#define IMX_SYS_CLK_FREQ 16780000
#define IMX_SYSPLL_CLK_FREQ 16000000
#define IMX_PERCLK1_FREQ 96000000
/* MPCTL */
#define IMX_MPCTL0_VALUE 0x04632410 /* For 150MHz MCU PLL clock */
#define IMX_MPCTL0_VALUE 0x03AA11B9 /* For 150 MHz ARM clock with 32.768 KHz crystal */
/* SPCTL */
#define IMX_SPCTL0_VALUE 0x07AA16A6; /* For 96MHz peripheral clock with 32.768 KHz crystal */
/* PDCR */
#define IMX_PCDR_VALUE 0x00000055
/* LED definitions ******************************************************************/
/* The MX1ADS has only one usable LED: Port A, bit 2 */

23
configs/mx1ads/ostest/defconfig
View File

@ -76,8 +76,10 @@ CONFIG_ARCH_STACKDUMP=y
#
# IMX specific device driver settings
#
# CONFIG_UARTn_DISABLE - select to disable all support for
# the UART
# CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
# console and ttys0 (default is the UART0).
# console and ttys0 (default is the UART1).
# CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
# This specific the size of the receive buffer
# CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
@ -87,27 +89,30 @@ CONFIG_ARCH_STACKDUMP=y
# CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
# CONFIG_UARTn_2STOP - Two stop bits
#
CONFIG_UART0_SERIAL_CONSOLE=y
CONFIG_UART1_SERIAL_CONSOLE=n
CONFIG_UART1_DISABLE=n
CONFIG_UART2_DISABLE=y
CONFIG_UART3_DISABLE=y
CONFIG_UART1_SERIAL_CONSOLE=y
CONFIG_UART2_SERIAL_CONSOLE=n
CONFIG_UART0_TXBUFSIZE=256
CONFIG_UART3_SERIAL_CONSOLE=n
CONFIG_UART1_TXBUFSIZE=256
CONFIG_UART2_TXBUFSIZE=256
CONFIG_UART0_RXBUFSIZE=256
CONFIG_UART3_TXBUFSIZE=256
CONFIG_UART1_RXBUFSIZE=256
CONFIG_UART2_RXBUFSIZE=256
CONFIG_UART0_BAUD=115200
CONFIG_UART3_RXBUFSIZE=256
CONFIG_UART1_BAUD=115200
CONFIG_UART2_BAUD=115200
CONFIG_UART0_BITS=8
CONFIG_UART3_BAUD=115200
CONFIG_UART1_BITS=8
CONFIG_UART2_BITS=8
CONFIG_UART0_PARITY=0
CONFIG_UART3_BITS=8
CONFIG_UART1_PARITY=0
CONFIG_UART2_PARITY=0
CONFIG_UART0_2STOP=0
CONFIG_UART3_PARITY=0
CONFIG_UART1_2STOP=0
CONFIG_UART2_2STOP=0
CONFIG_UART3_2STOP=0
#
# General build options

16
configs/mx1ads/src/up_leds.c
View File

@ -54,22 +54,6 @@
* Private Functions
****************************************************************************/
/****************************************************************************
* Name: imx_ledon
****************************************************************************/
static inline void imx_ledon(void)
{
}
/****************************************************************************
* Name: imx_ledoff
****************************************************************************/
static void imx_ledoff(void)
{
}
/****************************************************************************
* Public Funtions
****************************************************************************/