Basic UART/console functionality
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1697 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
parent
855645b535
commit
736460f69b
@ -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
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -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
128
arch/arm/src/imx/imx_lowputc.S
Normal 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
1227
arch/arm/src/imx/imx_serial.c
Normal file
File diff suppressed because it is too large
Load Diff
@ -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
|
||||
************************************************************************************/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user