fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-26 04:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move serial header files to include/nuttx/serial

Browse Source 
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4500 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-03-21 19:47:23 +00:00
parent c22a13ef4a
commit a58d4b265f
41 changed files with 400 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nuttx/ChangeLog
+4 -2
View File
@@ -1532,8 +1532,8 @@
(and others). Contributed by Uros Platise. (and others). Contributed by Uros Platise.
* examples/nsh and tools/mkromfsimg.sh: Add support for platform-specific * examples/nsh and tools/mkromfsimg.sh: Add support for platform-specific
ROMFS-based NSH start-up scripts. ROMFS-based NSH start-up scripts.
* drivers/uart_16550.c and include/nuttx/uart_16550.h: Support for a generic * drivers/serial/uart_16550.c and include/nuttx/serial/uart_16550.h: Support
16550 UART. for a generic 16550 UART.
* configure/qemu-i486/nsh: QEMU NSH example. * configure/qemu-i486/nsh: QEMU NSH example.
* ../apps: The apps directory add-on was created by Uros Platise. It * ../apps: The apps directory add-on was created by Uros Platise. It
supports a set of end-user applications than can be executed on top of supports a set of end-user applications than can be executed on top of
@@ -2581,3 +2581,5 @@
device is, however, still non-functional when debug is OFF. device is, however, still non-functional when debug is OFF.
* include/nuttx/fs: Move all file-system related files from include/nuttx to * include/nuttx/fs: Move all file-system related files from include/nuttx to
include/nuttx/fs. include/nuttx/fs.
* include/nuttx/serial: Move all serial-driver related files from include/nuttx to
include/nuttx/serial.
nuttx/Documentation/NuttxPortingGuide.html
+1 -1
View File
@@ -2542,7 +2542,7 @@ extern void up_ledoff(int led);
<ul> <ul>
<li> <li>
<p> <p>
<b><code>include/nuttx/serial.h</code></b>. <b><code>include/nuttx/serial/serial.h</code></b>.
All structures and APIs needed to work with serial drivers are provided in this header file. All structures and APIs needed to work with serial drivers are provided in this header file.
</p> </p>
</li> </li>
nuttx/arch/arm/src/c5471/c5471_serial.c
+1 -1
View File
@@ -50,7 +50,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/serial.h> #include <arch/serial.h>
#include "chip.h" #include "chip.h"
nuttx/arch/arm/src/dm320/dm320_serial.c
+1 -1
View File
@@ -51,7 +51,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/serial.h> #include <arch/serial.h>
#include <arch/board/board.h> #include <arch/board/board.h>
nuttx/arch/arm/src/imx/imx_serial.c
+1 -1
View File
@@ -51,7 +51,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/serial.h> #include <arch/serial.h>
#include <arch/board/board.h> #include <arch/board/board.h>
nuttx/arch/arm/src/kinetis/kinetis_serial.c
+1 -1
View File
@@ -50,7 +50,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/board/board.h> #include <arch/board/board.h>
nuttx/arch/arm/src/lm3s/lm3s_serial.c
+1 -1
View File
@@ -50,7 +50,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/serial.h> #include <arch/serial.h>
#include <arch/board/board.h> #include <arch/board/board.h>
nuttx/arch/arm/src/lpc17xx/lpc17_serial.c
+1 -1
View File
@@ -50,7 +50,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/serial.h> #include <arch/serial.h>
#include <arch/board/board.h> #include <arch/board/board.h>
nuttx/arch/arm/src/lpc214x/lpc214x_serial.c
+1 -1
View File
@@ -49,7 +49,7 @@
#include <debug.h> #include <debug.h>
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/serial.h> #include <arch/serial.h>
#include "chip.h" #include "chip.h"
nuttx/arch/arm/src/lpc2378/lpc23xx_serial.c
+1 -1
View File
@@ -54,7 +54,7 @@
#include <debug.h> #include <debug.h>
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/serial.h> #include <arch/serial.h>
#include "chip.h" #include "chip.h"
nuttx/arch/arm/src/lpc31xx/lpc31_serial.c
+1 -1
View File
@@ -50,7 +50,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/serial.h> #include <arch/serial.h>
#include "up_arch.h" #include "up_arch.h"
nuttx/arch/arm/src/sam3u/sam3u_serial.c
+1 -1
View File
@@ -50,7 +50,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/serial.h> #include <arch/serial.h>
#include <arch/board/board.h> #include <arch/board/board.h>
nuttx/arch/arm/src/stm32/stm32_serial.c
+1 -1
View File
@@ -50,7 +50,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/serial.h> #include <arch/serial.h>
#include <arch/board/board.h> #include <arch/board/board.h>
nuttx/arch/arm/src/str71x/str71x_serial.c
+1 -1
View File
@@ -49,7 +49,7 @@
#include <debug.h> #include <debug.h>
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/serial.h> #include <arch/serial.h>
#include "chip.h" #include "chip.h"
nuttx/arch/avr/src/at32uc3/at32uc3_serial.c
+1 -1
View File
@@ -50,7 +50,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/board/board.h> #include <arch/board/board.h>
nuttx/arch/avr/src/at90usb/at90usb_serial.c
+1 -1
View File
@@ -51,7 +51,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <avr/io.h> #include <avr/io.h>
#include <arch/board/board.h> #include <arch/board/board.h>
nuttx/arch/avr/src/atmega/atmega_serial.c
+1 -1
View File
@@ -51,7 +51,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <avr/io.h> #include <avr/io.h>
#include <arch/board/board.h> #include <arch/board/board.h>
nuttx/arch/mips/src/pic32mx/pic32mx-serial.c
+1 -1
View File
@@ -50,7 +50,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/board/board.h> #include <arch/board/board.h>
nuttx/arch/rgmp/src/x86/com.c
+1 -1
View File
@@ -51,7 +51,7 @@
#include <debug.h> #include <debug.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <nuttx/kmalloc.h> #include <nuttx/kmalloc.h>
#include <arch/com.h> #include <arch/com.h>
nuttx/arch/sh/src/m16c/m16c_serial.c
+1 -1
View File
@@ -50,7 +50,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/serial.h> #include <arch/serial.h>
#include "chip.h" #include "chip.h"
nuttx/arch/sh/src/sh1/sh1_serial.c
+1 -1
View File
@@ -50,7 +50,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/serial.h> #include <arch/serial.h>
#include "chip.h" #include "chip.h"
nuttx/arch/x86/src/qemu/qemu_serial.c
+1 -1
View File
@@ -40,7 +40,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/uart_16550.h> #include <nuttx/serial/uart_16550.h>
#include <arch/io.h> #include <arch/io.h>
nuttx/arch/z16/src/z16f/z16f_serial.c
+1 -1
View File
@@ -50,7 +50,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/serial.h> #include <arch/serial.h>
#include "chip/chip.h" #include "chip/chip.h"
nuttx/arch/z80/src/ez80/ez80_serial.c
+1 -1
View File
@@ -50,7 +50,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/serial.h> #include <arch/serial.h>
#include <arch/io.h> #include <arch/io.h>
nuttx/arch/z80/src/z8/z8_serial.c
+1 -1
View File
@@ -51,7 +51,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/serial.h> #include <arch/serial.h>
#include "chip/chip.h" #include "chip/chip.h"
nuttx/configs/stm3210e-eval/RIDE/nuttx.rdb
BIN
View File
Binary file not shown.
nuttx/configs/xtrs/src/xtr_serial.c
+1 -1
View File
@@ -53,7 +53,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/serial.h> #include <arch/serial.h>
#include "up_arch.h" #include "up_arch.h"
nuttx/configs/z80sim/src/z80_serial.c
+1 -1
View File
@@ -49,7 +49,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <arch/serial.h> #include <arch/serial.h>
#include "up_arch.h" #include "up_arch.h"
nuttx/drivers/README.txt
+1 -1
View File
@@ -106,7 +106,7 @@ sensors/
serial/ serial/
Front-end character drivers for chip-specific UARTs. This provide Front-end character drivers for chip-specific UARTs. This provide
some TTY-like functionality and are commonly used (but not required for) some TTY-like functionality and are commonly used (but not required for)
the NuttX system console. See also include/nuttx/serial.h the NuttX system console. See also include/nuttx/serial/serial.h
usbdev/ usbdev/
USB device drivers. See also include/nuttx/usb/usbdev.h USB device drivers. See also include/nuttx/usb/usbdev.h
nuttx/drivers/serial/serial.c
+1 -1
View File
@@ -53,7 +53,7 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/fs/fs.h> #include <nuttx/fs/fs.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
/************************************************************************************ /************************************************************************************
* Definitions * Definitions
nuttx/drivers/serial/serialirq.c
+1 -1
View File
@@ -43,7 +43,7 @@
#include <stdint.h> #include <stdint.h>
#include <semaphore.h> #include <semaphore.h>
#include <debug.h> #include <debug.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
/************************************************************************************ /************************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
nuttx/drivers/serial/uart_16550.c
+2 -2
View File
@@ -51,9 +51,9 @@
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <nuttx/fs/ioctl.h> #include <nuttx/fs/ioctl.h>
#include <nuttx/uart_16550.h> #include <nuttx/serial/uart_16550.h>
#include <arch/board/board.h> #include <arch/board/board.h>
nuttx/drivers/usbdev/cdcacm.c
+1 -1
View File
@@ -53,7 +53,7 @@
#include <nuttx/kmalloc.h> #include <nuttx/kmalloc.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <nuttx/usb/usb.h> #include <nuttx/usb/usb.h>
#include <nuttx/usb/cdc.h> #include <nuttx/usb/cdc.h>
nuttx/drivers/usbdev/pl2303.c
+1 -1
View File
@@ -55,7 +55,7 @@
#include <nuttx/kmalloc.h> #include <nuttx/kmalloc.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/serial.h> #include <nuttx/serial/serial.h>
#include <nuttx/usb/usb.h> #include <nuttx/usb/usb.h>
#include <nuttx/usb/usbdev.h> #include <nuttx/usb/usbdev.h>
#include <nuttx/usb/usbdev_trace.h> #include <nuttx/usb/usbdev_trace.h>
nuttx/include/nuttx/fs/ioctl.h
+1 -1
View File
@@ -82,7 +82,7 @@
/* Terminal I/O IOCTL definitions are retained in tioctl.h */ /* Terminal I/O IOCTL definitions are retained in tioctl.h */
#include <nuttx/tioctl.h> #include <nuttx/serial/tioctl.h>
/* Watchdog driver ioctl commands *******************************************/ /* Watchdog driver ioctl commands *******************************************/
nuttx/include/nuttx/serial.h → nuttx/include/nuttx/serial/serial.h
+4 -4
View File
@@ -1,5 +1,5 @@
/************************************************************************************ /************************************************************************************
* include/nuttx/serial.h * include/nuttx/serial/serial.h
* *
* Copyright (C) 2007-2008, 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2007-2008, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
* *
************************************************************************************/ ************************************************************************************/
#ifndef __INCLUDE_NUTTX_SERIAL_H #ifndef __INCLUDE_NUTTX_SERIAL_SERIAL_H
#define __INCLUDE_NUTTX_SERIAL_H #define __INCLUDE_NUTTX_SERIAL_SERIAL_H
/************************************************************************************ /************************************************************************************
* Included Files * Included Files
@@ -299,4 +299,4 @@ EXTERN void uart_datasent(FAR uart_dev_t *dev);
} }
#endif #endif
#endif /* __INCLUDE_NUTTX_SERIAL_H */ #endif /* __INCLUDE_NUTTX_SERIAL_SERIAL_H */
nuttx/include/nuttx/tioctl.h → nuttx/include/nuttx/serial/tioctl.h
+4 -4
View File
@@ -1,5 +1,5 @@
/******************************************************************************************** /********************************************************************************************
* include/nuttx/tioctl.h * include/nuttx/serial/tioctl.h
* *
* Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@@ -36,8 +36,8 @@
* via include/nuttx/fs/ioctl.h. * via include/nuttx/fs/ioctl.h.
*/ */
#ifndef __INCLUDE_NUTTX_TIOCTL_H #ifndef __INCLUDE_NUTTX_SERIAL_TIOCTL_H
#define __INCLUDE_NUTTX_TIOCTL_H #define __INCLUDE_NUTTX_SERIAL_TIOCTL_H
/******************************************************************************************** /********************************************************************************************
* Included Files * Included Files
@@ -194,4 +194,4 @@ extern "C" {
} }
#endif #endif
#endif /* __INCLUDE_NUTTX_TIOCTL_H */ #endif /* __INCLUDE_NUTTX_SERIAL_TIOCTL_H */
nuttx/include/nuttx/uart_16550.h → nuttx/include/nuttx/serial/uart_16550.h
+351 -351
View File
@@ -1,351 +1,351 @@
/************************************************************************************ /************************************************************************************
* include/nuttx/uart_16550.h * include/nuttx/serial/uart_16550.h
* Serial driver for 16550 UART * Serial driver for 16550 UART
* *
* Copyright (C) 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
* *
* 1. Redistributions of source code must retain the above copyright * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in * notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the * the documentation and/or other materials provided with the
* distribution. * distribution.
* 3. Neither the name NuttX nor the names of its contributors may be * 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software * used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************************************/ ************************************************************************************/
#ifndef __INCLUDE_NUTTX_UART_16550_H #ifndef __INCLUDE_NUTTX_SERIAL_UART_16550_H
#define __INCLUDE_NUTTX_UART_16550_H #define __INCLUDE_NUTTX_SERIAL_UART_16550_H
/************************************************************************************ /************************************************************************************
* Included Files * Included Files
************************************************************************************/ ************************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#ifdef CONFIG_16550_UART #ifdef CONFIG_16550_UART
/************************************************************************************ /************************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ************************************************************************************/
/* CONFIGURATION ********************************************************************/ /* CONFIGURATION ********************************************************************/
/* Are any UARTs enabled? */ /* Are any UARTs enabled? */
#undef HAVE_UART #undef HAVE_UART
#if defined(CONFIG_16550_UART0) || defined(CONFIG_16550_UART1) || \ #if defined(CONFIG_16550_UART0) || defined(CONFIG_16550_UART1) || \
defined(CONFIG_16550_UART2) || defined(CONFIG_16550_UART3) defined(CONFIG_16550_UART2) || defined(CONFIG_16550_UART3)
# define HAVE_UART 1 # define HAVE_UART 1
#endif #endif
/* We need to be told the address increment between registers and the register bit /* We need to be told the address increment between registers and the register bit
* width. * width.
*/ */
#ifndef CONFIG_16550_REGINCR #ifndef CONFIG_16550_REGINCR
# error "CONFIG_16550_REGINCR not defined" # error "CONFIG_16550_REGINCR not defined"
#endif #endif
#if CONFIG_16550_REGINCR != 1 && CONFIG_16550_REGINCR != 2 && CONFIG_16550_REGINCR != 4 #if CONFIG_16550_REGINCR != 1 && CONFIG_16550_REGINCR != 2 && CONFIG_16550_REGINCR != 4
# error "CONFIG_16550_REGINCR not supported" # error "CONFIG_16550_REGINCR not supported"
#endif #endif
#ifndef CONFIG_16550_REGWIDTH #ifndef CONFIG_16550_REGWIDTH
# error "CONFIG_16550_REGWIDTH not defined" # error "CONFIG_16550_REGWIDTH not defined"
#endif #endif
#if CONFIG_16550_REGWIDTH != 8 && CONFIG_16550_REGWIDTH != 16 && CONFIG_16550_REGWIDTH != 32 #if CONFIG_16550_REGWIDTH != 8 && CONFIG_16550_REGWIDTH != 16 && CONFIG_16550_REGWIDTH != 32
# error "CONFIG_16550_REGWIDTH not supported" # error "CONFIG_16550_REGWIDTH not supported"
#endif #endif
#ifndef CONFIG_16550_ADDRWIDTH #ifndef CONFIG_16550_ADDRWIDTH
# error "CONFIG_16550_ADDRWIDTH not defined" # error "CONFIG_16550_ADDRWIDTH not defined"
#endif #endif
#if CONFIG_16550_ADDRWIDTH != 8 && CONFIG_16550_ADDRWIDTH != 16 && CONFIG_16550_ADDRWIDTH != 32 #if CONFIG_16550_ADDRWIDTH != 8 && CONFIG_16550_ADDRWIDTH != 16 && CONFIG_16550_ADDRWIDTH != 32
# error "CONFIG_16550_ADDRWIDTH not supported" # error "CONFIG_16550_ADDRWIDTH not supported"
#endif #endif
/* If a UART is enabled, then its base address, clock, and IRQ must also be provided */ /* If a UART is enabled, then its base address, clock, and IRQ must also be provided */
#ifdef CONFIG_16550_UART0 #ifdef CONFIG_16550_UART0
# ifndef CONFIG_16550_UART0_BASE # ifndef CONFIG_16550_UART0_BASE
# error "CONFIG_16550_UART0_BASE not provided" # error "CONFIG_16550_UART0_BASE not provided"
# undef CONFIG_16550_UART0 # undef CONFIG_16550_UART0
# endif # endif
# ifndef CONFIG_16550_UART0_CLOCK # ifndef CONFIG_16550_UART0_CLOCK
# error "CONFIG_16550_UART0_CLOCK not provided" # error "CONFIG_16550_UART0_CLOCK not provided"
# undef CONFIG_16550_UART0 # undef CONFIG_16550_UART0
# endif # endif
# ifndef CONFIG_16550_UART0_IRQ # ifndef CONFIG_16550_UART0_IRQ
# error "CONFIG_16550_UART0_IRQ not provided" # error "CONFIG_16550_UART0_IRQ not provided"
# undef CONFIG_16550_UART0 # undef CONFIG_16550_UART0
# endif # endif
#endif #endif
#ifdef CONFIG_16550_UART1 #ifdef CONFIG_16550_UART1
# ifndef CONFIG_16550_UART1_BASE # ifndef CONFIG_16550_UART1_BASE
# error "CONFIG_16550_UART1_BASE not provided" # error "CONFIG_16550_UART1_BASE not provided"
# undef CONFIG_16550_UART1 # undef CONFIG_16550_UART1
# endif # endif
# ifndef CONFIG_16550_UART1_CLOCK # ifndef CONFIG_16550_UART1_CLOCK
# error "CONFIG_16550_UART1_CLOCK not provided" # error "CONFIG_16550_UART1_CLOCK not provided"
# undef CONFIG_16550_UART1 # undef CONFIG_16550_UART1
# endif # endif
# ifndef CONFIG_16550_UART1_IRQ # ifndef CONFIG_16550_UART1_IRQ
# error "CONFIG_16550_UART1_IRQ not provided" # error "CONFIG_16550_UART1_IRQ not provided"
# undef CONFIG_16550_UART1 # undef CONFIG_16550_UART1
# endif # endif
#endif #endif
#ifdef CONFIG_16550_UART2 #ifdef CONFIG_16550_UART2
# ifndef CONFIG_16550_UART2_BASE # ifndef CONFIG_16550_UART2_BASE
# error "CONFIG_16550_UART2_BASE not provided" # error "CONFIG_16550_UART2_BASE not provided"
# undef CONFIG_16550_UART2 # undef CONFIG_16550_UART2
# endif # endif
# ifndef CONFIG_16550_UART2_CLOCK # ifndef CONFIG_16550_UART2_CLOCK
# error "CONFIG_16550_UART2_CLOCK not provided" # error "CONFIG_16550_UART2_CLOCK not provided"
# undef CONFIG_16550_UART2 # undef CONFIG_16550_UART2
# endif # endif
# ifndef CONFIG_16550_UART2_IRQ # ifndef CONFIG_16550_UART2_IRQ
# error "CONFIG_16550_UART2_IRQ not provided" # error "CONFIG_16550_UART2_IRQ not provided"
# undef CONFIG_16550_UART2 # undef CONFIG_16550_UART2
# endif # endif
#endif #endif
#ifdef CONFIG_16550_UART3 #ifdef CONFIG_16550_UART3
# ifndef CONFIG_16550_UART3_BASE # ifndef CONFIG_16550_UART3_BASE
# error "CONFIG_16550_UART3_BASE not provided" # error "CONFIG_16550_UART3_BASE not provided"
# undef CONFIG_16550_UART3 # undef CONFIG_16550_UART3
# endif # endif
# ifndef CONFIG_16550_UART3_CLOCK # ifndef CONFIG_16550_UART3_CLOCK
# error "CONFIG_16550_UART3_CLOCK not provided" # error "CONFIG_16550_UART3_CLOCK not provided"
# undef CONFIG_16550_UART3 # undef CONFIG_16550_UART3
# endif # endif
# ifndef CONFIG_16550_UART3_IRQ # ifndef CONFIG_16550_UART3_IRQ
# error "CONFIG_16550_UART3_IRQ not provided" # error "CONFIG_16550_UART3_IRQ not provided"
# undef CONFIG_16550_UART3 # undef CONFIG_16550_UART3
# endif # endif
#endif #endif
/* Is there a serial console? There should be at most one defined. It could be on /* Is there a serial console? There should be at most one defined. It could be on
* any UARTn, n=0,1,2,3 * any UARTn, n=0,1,2,3
*/ */
#if defined(CONFIG_UART0_SERIAL_CONSOLE) && defined(CONFIG_16550_UART0) #if defined(CONFIG_UART0_SERIAL_CONSOLE) && defined(CONFIG_16550_UART0)
# undef CONFIG_UART1_SERIAL_CONSOLE # undef CONFIG_UART1_SERIAL_CONSOLE
# undef CONFIG_UART2_SERIAL_CONSOLE # undef CONFIG_UART2_SERIAL_CONSOLE
# undef CONFIG_UART3_SERIAL_CONSOLE # undef CONFIG_UART3_SERIAL_CONSOLE
# define HAVE_16550_CONSOLE 1 # define HAVE_16550_CONSOLE 1
#elif defined(CONFIG_UART1_SERIAL_CONSOLE) && defined(CONFIG_16550_UART1) #elif defined(CONFIG_UART1_SERIAL_CONSOLE) && defined(CONFIG_16550_UART1)
# undef CONFIG_UART0_SERIAL_CONSOLE # undef CONFIG_UART0_SERIAL_CONSOLE
# undef CONFIG_UART2_SERIAL_CONSOLE # undef CONFIG_UART2_SERIAL_CONSOLE
# undef CONFIG_UART3_SERIAL_CONSOLE # undef CONFIG_UART3_SERIAL_CONSOLE
# define HAVE_16550_CONSOLE 1 # define HAVE_16550_CONSOLE 1
#elif defined(CONFIG_UART2_SERIAL_CONSOLE) && defined(CONFIG_16550_UART2) #elif defined(CONFIG_UART2_SERIAL_CONSOLE) && defined(CONFIG_16550_UART2)
# undef CONFIG_UART0_SERIAL_CONSOLE # undef CONFIG_UART0_SERIAL_CONSOLE
# undef CONFIG_UART1_SERIAL_CONSOLE # undef CONFIG_UART1_SERIAL_CONSOLE
# undef CONFIG_UART3_SERIAL_CONSOLE # undef CONFIG_UART3_SERIAL_CONSOLE
# define HAVE_16550_CONSOLE 1 # define HAVE_16550_CONSOLE 1
#elif defined(CONFIG_UART3_SERIAL_CONSOLE) && defined(CONFIG_16550_UART3) #elif defined(CONFIG_UART3_SERIAL_CONSOLE) && defined(CONFIG_16550_UART3)
# undef CONFIG_UART0_SERIAL_CONSOLE # undef CONFIG_UART0_SERIAL_CONSOLE
# undef CONFIG_UART1_SERIAL_CONSOLE # undef CONFIG_UART1_SERIAL_CONSOLE
# undef CONFIG_UART2_SERIAL_CONSOLE # undef CONFIG_UART2_SERIAL_CONSOLE
# define HAVE_16550_CONSOLE 1 # define HAVE_16550_CONSOLE 1
#else #else
# undef CONFIG_UART0_SERIAL_CONSOLE # undef CONFIG_UART0_SERIAL_CONSOLE
# undef CONFIG_UART1_SERIAL_CONSOLE # undef CONFIG_UART1_SERIAL_CONSOLE
# undef CONFIG_UART2_SERIAL_CONSOLE # undef CONFIG_UART2_SERIAL_CONSOLE
# undef CONFIG_UART3_SERIAL_CONSOLE # undef CONFIG_UART3_SERIAL_CONSOLE
# undef HAVE_16550_CONSOLE # undef HAVE_16550_CONSOLE
#endif #endif
/* Register offsets *****************************************************************/ /* Register offsets *****************************************************************/
#define UART_RBR_INCR 0 /* (DLAB =0) Receiver Buffer Register */ #define UART_RBR_INCR 0 /* (DLAB =0) Receiver Buffer Register */
#define UART_THR_INCR 0 /* (DLAB =0) Transmit Holding Register */ #define UART_THR_INCR 0 /* (DLAB =0) Transmit Holding Register */
#define UART_DLL_INCR 0 /* (DLAB =1) Divisor Latch LSB */ #define UART_DLL_INCR 0 /* (DLAB =1) Divisor Latch LSB */
#define UART_DLM_INCR 1 /* (DLAB =1) Divisor Latch MSB */ #define UART_DLM_INCR 1 /* (DLAB =1) Divisor Latch MSB */
#define UART_IER_INCR 1 /* (DLAB =0) Interrupt Enable Register */ #define UART_IER_INCR 1 /* (DLAB =0) Interrupt Enable Register */
#define UART_IIR_INCR 2 /* Interrupt ID Register */ #define UART_IIR_INCR 2 /* Interrupt ID Register */
#define UART_FCR_INCR 2 /* FIFO Control Register */ #define UART_FCR_INCR 2 /* FIFO Control Register */
#define UART_LCR_INCR 3 /* Line Control Register */ #define UART_LCR_INCR 3 /* Line Control Register */
#define UART_MCR_INCR 4 /* Modem Control Register */ #define UART_MCR_INCR 4 /* Modem Control Register */
#define UART_LSR_INCR 5 /* Line Status Register */ #define UART_LSR_INCR 5 /* Line Status Register */
#define UART_MSR_INCR 6 /* Modem Status Register */ #define UART_MSR_INCR 6 /* Modem Status Register */
#define UART_SCR_INCR 7 /* Scratch Pad Register */ #define UART_SCR_INCR 7 /* Scratch Pad Register */
#define UART_RBR_OFFSET (CONFIG_16550_REGINCR*UART_RBR_INCR) #define UART_RBR_OFFSET (CONFIG_16550_REGINCR*UART_RBR_INCR)
#define UART_THR_OFFSET (CONFIG_16550_REGINCR*UART_THR_INCR) #define UART_THR_OFFSET (CONFIG_16550_REGINCR*UART_THR_INCR)
#define UART_DLL_OFFSET (CONFIG_16550_REGINCR*UART_DLL_INCR) #define UART_DLL_OFFSET (CONFIG_16550_REGINCR*UART_DLL_INCR)
#define UART_DLM_OFFSET (CONFIG_16550_REGINCR*UART_DLM_INCR) #define UART_DLM_OFFSET (CONFIG_16550_REGINCR*UART_DLM_INCR)
#define UART_IER_OFFSET (CONFIG_16550_REGINCR*UART_IER_INCR) #define UART_IER_OFFSET (CONFIG_16550_REGINCR*UART_IER_INCR)
#define UART_IIR_OFFSET (CONFIG_16550_REGINCR*UART_IIR_INCR) #define UART_IIR_OFFSET (CONFIG_16550_REGINCR*UART_IIR_INCR)
#define UART_FCR_OFFSET (CONFIG_16550_REGINCR*UART_FCR_INCR) #define UART_FCR_OFFSET (CONFIG_16550_REGINCR*UART_FCR_INCR)
#define UART_LCR_OFFSET (CONFIG_16550_REGINCR*UART_LCR_INCR) #define UART_LCR_OFFSET (CONFIG_16550_REGINCR*UART_LCR_INCR)
#define UART_MCR_OFFSET (CONFIG_16550_REGINCR*UART_MCR_INCR) #define UART_MCR_OFFSET (CONFIG_16550_REGINCR*UART_MCR_INCR)
#define UART_LSR_OFFSET (CONFIG_16550_REGINCR*UART_LSR_INCR) #define UART_LSR_OFFSET (CONFIG_16550_REGINCR*UART_LSR_INCR)
#define UART_MSR_OFFSET (CONFIG_16550_REGINCR*UART_MSR_INCR) #define UART_MSR_OFFSET (CONFIG_16550_REGINCR*UART_MSR_INCR)
#define UART_SCR_OFFSET (CONFIG_16550_REGINCR*UART_SCR_INCR) #define UART_SCR_OFFSET (CONFIG_16550_REGINCR*UART_SCR_INCR)
/* Register bit definitions *********************************************************/ /* Register bit definitions *********************************************************/
/* RBR (DLAB =0) Receiver Buffer Register */ /* RBR (DLAB =0) Receiver Buffer Register */
#define UART_RBR_MASK (0xff) /* Bits 0-7: Oldest received byte in RX FIFO */ #define UART_RBR_MASK (0xff) /* Bits 0-7: Oldest received byte in RX FIFO */
/* Bits 8-31: Reserved */ /* Bits 8-31: Reserved */
/* THR (DLAB =0) Transmit Holding Register */ /* THR (DLAB =0) Transmit Holding Register */
#define UART_THR_MASK (0xff) /* Bits 0-7: Adds byte to TX FIFO */ #define UART_THR_MASK (0xff) /* Bits 0-7: Adds byte to TX FIFO */
/* Bits 8-31: Reserved */ /* Bits 8-31: Reserved */
/* DLL (DLAB =1) Divisor Latch LSB */ /* DLL (DLAB =1) Divisor Latch LSB */
#define UART_DLL_MASK (0xff) /* Bits 0-7: DLL */ #define UART_DLL_MASK (0xff) /* Bits 0-7: DLL */
/* Bits 8-31: Reserved */ /* Bits 8-31: Reserved */
/* DLM (DLAB =1) Divisor Latch MSB */ /* DLM (DLAB =1) Divisor Latch MSB */
#define UART_DLM_MASK (0xff) /* Bits 0-7: DLM */ #define UART_DLM_MASK (0xff) /* Bits 0-7: DLM */
/* Bits 8-31: Reserved */ /* Bits 8-31: Reserved */
/* IER (DLAB =0) Interrupt Enable Register */ /* IER (DLAB =0) Interrupt Enable Register */
#define UART_IER_ERBFI (1 << 0) /* Bit 0: Enable received data available interrupt */ #define UART_IER_ERBFI (1 << 0) /* Bit 0: Enable received data available interrupt */
#define UART_IER_ETBEI (1 << 1) /* Bit 1: Enable THR empty interrupt */ #define UART_IER_ETBEI (1 << 1) /* Bit 1: Enable THR empty interrupt */
#define UART_IER_ELSI (1 << 2) /* Bit 2: Enable receiver line status interrupt */ #define UART_IER_ELSI (1 << 2) /* Bit 2: Enable receiver line status interrupt */
#define UART_IER_EDSSI (1 << 3) /* Bit 3: Enable MODEM status interrupt */ #define UART_IER_EDSSI (1 << 3) /* Bit 3: Enable MODEM status interrupt */
/* Bits 4-7: Reserved */ /* Bits 4-7: Reserved */
#define UART_IER_ALLIE (0x0f) #define UART_IER_ALLIE (0x0f)
/* IIR Interrupt ID Register */ /* IIR Interrupt ID Register */
#define UART_IIR_INTSTATUS (1 << 0) /* Bit 0: Interrupt status (active low) */ #define UART_IIR_INTSTATUS (1 << 0) /* Bit 0: Interrupt status (active low) */
#define UART_IIR_INTID_SHIFT (1) /* Bits 1-3: Interrupt identification */ #define UART_IIR_INTID_SHIFT (1) /* Bits 1-3: Interrupt identification */
#define UART_IIR_INTID_MASK (7 << UART_IIR_INTID_SHIFT) #define UART_IIR_INTID_MASK (7 << UART_IIR_INTID_SHIFT)
# define UART_IIR_INTID_MSI (0 << UART_IIR_INTID_SHIFT) /* Modem Status */ # define UART_IIR_INTID_MSI (0 << UART_IIR_INTID_SHIFT) /* Modem Status */
# define UART_IIR_INTID_THRE (1 << UART_IIR_INTID_SHIFT) /* THR Empty Interrupt */ # define UART_IIR_INTID_THRE (1 << UART_IIR_INTID_SHIFT) /* THR Empty Interrupt */
# define UART_IIR_INTID_RDA (2 << UART_IIR_INTID_SHIFT) /* Receive Data Available (RDA) */ # define UART_IIR_INTID_RDA (2 << UART_IIR_INTID_SHIFT) /* Receive Data Available (RDA) */
# define UART_IIR_INTID_RLS (3 << UART_IIR_INTID_SHIFT) /* Receiver Line Status (RLS) */ # define UART_IIR_INTID_RLS (3 << UART_IIR_INTID_SHIFT) /* Receiver Line Status (RLS) */
# define UART_IIR_INTID_CTI (6 << UART_IIR_INTID_SHIFT) /* Character Time-out Indicator (CTI) */ # define UART_IIR_INTID_CTI (6 << UART_IIR_INTID_SHIFT) /* Character Time-out Indicator (CTI) */
/* Bits 4-5: Reserved */ /* Bits 4-5: Reserved */
#define UART_IIR_FIFOEN_SHIFT (6) /* Bits 6-7: RCVR FIFO interrupt */ #define UART_IIR_FIFOEN_SHIFT (6) /* Bits 6-7: RCVR FIFO interrupt */
#define UART_IIR_FIFOEN_MASK (3 << UART_IIR_FIFOEN_SHIFT) #define UART_IIR_FIFOEN_MASK (3 << UART_IIR_FIFOEN_SHIFT)
/* FCR FIFO Control Register */ /* FCR FIFO Control Register */
#define UART_FCR_FIFOEN (1 << 0) /* Bit 0: Enable FIFOs */ #define UART_FCR_FIFOEN (1 << 0) /* Bit 0: Enable FIFOs */
#define UART_FCR_RXRST (1 << 1) /* Bit 1: RX FIFO Reset */ #define UART_FCR_RXRST (1 << 1) /* Bit 1: RX FIFO Reset */
#define UART_FCR_TXRST (1 << 2) /* Bit 2: TX FIFO Reset */ #define UART_FCR_TXRST (1 << 2) /* Bit 2: TX FIFO Reset */
#define UART_FCR_DMAMODE (1 << 3) /* Bit 3: DMA Mode Select */ #define UART_FCR_DMAMODE (1 << 3) /* Bit 3: DMA Mode Select */
/* Bits 4-5: Reserved */ /* Bits 4-5: Reserved */
#define UART_FCR_RXTRIGGER_SHIFT (6) /* Bits 6-7: RX Trigger Level */ #define UART_FCR_RXTRIGGER_SHIFT (6) /* Bits 6-7: RX Trigger Level */
#define UART_FCR_RXTRIGGER_MASK (3 << UART_FCR_RXTRIGGER_SHIFT) #define UART_FCR_RXTRIGGER_MASK (3 << UART_FCR_RXTRIGGER_SHIFT)
# define UART_FCR_RXTRIGGER_1 (0 << UART_FCR_RXTRIGGER_SHIFT) /* Trigger level 0 (1 character) */ # define UART_FCR_RXTRIGGER_1 (0 << UART_FCR_RXTRIGGER_SHIFT) /* Trigger level 0 (1 character) */
# define UART_FCR_RXTRIGGER_4 (1 << UART_FCR_RXTRIGGER_SHIFT) /* Trigger level 1 (4 characters) */ # define UART_FCR_RXTRIGGER_4 (1 << UART_FCR_RXTRIGGER_SHIFT) /* Trigger level 1 (4 characters) */
# define UART_FCR_RXTRIGGER_8 (2 << UART_FCR_RXTRIGGER_SHIFT) /* Trigger level 2 (8 characters) */ # define UART_FCR_RXTRIGGER_8 (2 << UART_FCR_RXTRIGGER_SHIFT) /* Trigger level 2 (8 characters) */
# define UART_FCR_RXTRIGGER_14 (3 << UART_FCR_RXTRIGGER_SHIFT) /* Trigger level 3 (14 characters) */ # define UART_FCR_RXTRIGGER_14 (3 << UART_FCR_RXTRIGGER_SHIFT) /* Trigger level 3 (14 characters) */
/* LCR Line Control Register */ /* LCR Line Control Register */
#define UART_LCR_WLS_SHIFT (0) /* Bit 0-1: Word Length Select */ #define UART_LCR_WLS_SHIFT (0) /* Bit 0-1: Word Length Select */
#define UART_LCR_WLS_MASK (3 << UART_LCR_WLS_SHIFT) #define UART_LCR_WLS_MASK (3 << UART_LCR_WLS_SHIFT)
# define UART_LCR_WLS_5BIT (0 << UART_LCR_WLS_SHIFT) # define UART_LCR_WLS_5BIT (0 << UART_LCR_WLS_SHIFT)
# define UART_LCR_WLS_6BIT (1 << UART_LCR_WLS_SHIFT) # define UART_LCR_WLS_6BIT (1 << UART_LCR_WLS_SHIFT)
# define UART_LCR_WLS_7BIT (2 << UART_LCR_WLS_SHIFT) # define UART_LCR_WLS_7BIT (2 << UART_LCR_WLS_SHIFT)
# define UART_LCR_WLS_8BIT (3 << UART_LCR_WLS_SHIFT) # define UART_LCR_WLS_8BIT (3 << UART_LCR_WLS_SHIFT)
#define UART_LCR_STB (1 << 2) /* Bit 2: Number of Stop Bits */ #define UART_LCR_STB (1 << 2) /* Bit 2: Number of Stop Bits */
#define UART_LCR_PEN (1 << 3) /* Bit 3: Parity Enable */ #define UART_LCR_PEN (1 << 3) /* Bit 3: Parity Enable */
#define UART_LCR_EPS (1 << 4) /* Bit 4: Even Parity Select */ #define UART_LCR_EPS (1 << 4) /* Bit 4: Even Parity Select */
#define UART_LCR_STICKY (1 << 5) /* Bit 5: Stick Parity */ #define UART_LCR_STICKY (1 << 5) /* Bit 5: Stick Parity */
#define UART_LCR_BRK (1 << 6) /* Bit 6: Break Control */ #define UART_LCR_BRK (1 << 6) /* Bit 6: Break Control */
#define UART_LCR_DLAB (1 << 7) /* Bit 7: Divisor Latch Access Bit (DLAB) */ #define UART_LCR_DLAB (1 << 7) /* Bit 7: Divisor Latch Access Bit (DLAB) */
/* MCR Modem Control Register */ /* MCR Modem Control Register */
#define UART_MCR_DTR (1 << 0) /* Bit 0: DTR Control Source for DTR output */ #define UART_MCR_DTR (1 << 0) /* Bit 0: DTR Control Source for DTR output */
#define UART_MCR_RTS (1 << 1) /* Bit 1: Control Source for RTS output */ #define UART_MCR_RTS (1 << 1) /* Bit 1: Control Source for RTS output */
#define UART_MCR_OUT1 (1 << 2) /* Bit 2: Auxiliary user-defined output 1 */ #define UART_MCR_OUT1 (1 << 2) /* Bit 2: Auxiliary user-defined output 1 */
#define UART_MCR_OUT2 (1 << 3) /* Bit 3: Auxiliary user-defined output 2 */ #define UART_MCR_OUT2 (1 << 3) /* Bit 3: Auxiliary user-defined output 2 */
#define UART_MCR_LPBK (1 << 4) /* Bit 4: Loopback Mode Select */ #define UART_MCR_LPBK (1 << 4) /* Bit 4: Loopback Mode Select */
/* Bit 5-7: Reserved */ /* Bit 5-7: Reserved */
/* LSR Line Status Register */ /* LSR Line Status Register */
#define UART_LSR_DR (1 << 0) /* Bit 0: Data Ready */ #define UART_LSR_DR (1 << 0) /* Bit 0: Data Ready */
#define UART_LSR_OE (1 << 1) /* Bit 1: Overrun Error */ #define UART_LSR_OE (1 << 1) /* Bit 1: Overrun Error */
#define UART_LSR_PE (1 << 2) /* Bit 2: Parity Error */ #define UART_LSR_PE (1 << 2) /* Bit 2: Parity Error */
#define UART_LSR_FE (1 << 3) /* Bit 3: Framing Error */ #define UART_LSR_FE (1 << 3) /* Bit 3: Framing Error */
#define UART_LSR_BI (1 << 4) /* Bit 4: Break Interrupt */ #define UART_LSR_BI (1 << 4) /* Bit 4: Break Interrupt */
#define UART_LSR_THRE (1 << 5) /* Bit 5: Transmitter Holding Register Empty */ #define UART_LSR_THRE (1 << 5) /* Bit 5: Transmitter Holding Register Empty */
#define UART_LSR_TEMT (1 << 6) /* Bit 6: Transmitter Empty */ #define UART_LSR_TEMT (1 << 6) /* Bit 6: Transmitter Empty */
#define UART_LSR_RXFE (1 << 7) /* Bit 7: Error in RX FIFO (RXFE) */ #define UART_LSR_RXFE (1 << 7) /* Bit 7: Error in RX FIFO (RXFE) */
/* SCR Scratch Pad Register */ /* SCR Scratch Pad Register */
#define UART_SCR_MASK (0xff) /* Bits 0-7: SCR data */ #define UART_SCR_MASK (0xff) /* Bits 0-7: SCR data */
/************************************************************************************ /************************************************************************************
* Public Types * Public Types
************************************************************************************/ ************************************************************************************/
#if CONFIG_16550_REGWIDTH == 8 #if CONFIG_16550_REGWIDTH == 8
typedef uint8_t uart_datawidth_t; typedef uint8_t uart_datawidth_t;
#elif CONFIG_16550_REGWIDTH == 16 #elif CONFIG_16550_REGWIDTH == 16
typedef uint16_t uart_datawidth_t; typedef uint16_t uart_datawidth_t;
#elif CONFIG_16550_REGWIDTH == 32 #elif CONFIG_16550_REGWIDTH == 32
typedef uint32_t uart_datawidth_t; typedef uint32_t uart_datawidth_t;
#endif #endif
#if CONFIG_16550_ADDRWIDTH == 8 #if CONFIG_16550_ADDRWIDTH == 8
typedef uint8_t uart_addrwidth_t; typedef uint8_t uart_addrwidth_t;
#elif CONFIG_16550_ADDRWIDTH == 16 #elif CONFIG_16550_ADDRWIDTH == 16
typedef uint16_t uart_addrwidth_t; typedef uint16_t uart_addrwidth_t;
#elif CONFIG_16550_ADDRWIDTH == 32 #elif CONFIG_16550_ADDRWIDTH == 32
typedef uint32_t uart_addrwidth_t; typedef uint32_t uart_addrwidth_t;
#endif #endif
/************************************************************************************ /************************************************************************************
* Public Data * Public Data
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Public Functions * Public Functions
************************************************************************************/ ************************************************************************************/
/************************************************************************************ /************************************************************************************
* Name: uart_getreg(), uart_putreg() * Name: uart_getreg(), uart_putreg()
* *
* Description: * Description:
* These functions must be provided by the processor-specific code in order to * These functions must be provided by the processor-specific code in order to
* correctly access 16550 registers * correctly access 16550 registers
* *
************************************************************************************/ ************************************************************************************/
extern uart_datawidth_t uart_getreg(uart_addrwidth_t base, unsigned int offset); extern uart_datawidth_t uart_getreg(uart_addrwidth_t base, unsigned int offset);
extern void uart_putreg(uart_addrwidth_t base, unsigned int offset, uart_datawidth_t value); extern void uart_putreg(uart_addrwidth_t base, unsigned int offset, uart_datawidth_t value);
#endif /* CONFIG_UART_16550 */ #endif /* CONFIG_UART_16550 */
#endif /* __INCLUDE_NUTTX_UART_16550_H */ #endif /* __INCLUDE_NUTTX_SERIAL_UART_16550_H */
nuttx/include/nuttx/usb/cdcacm.h
+1 -1
View File
@@ -222,7 +222,7 @@
/* IOCTL Commands ***********************************************************/ /* IOCTL Commands ***********************************************************/
/* The USB serial driver will support a subset of the TIOC IOCTL commands /* The USB serial driver will support a subset of the TIOC IOCTL commands
* defined in include/nuttx/tioctl.h. This subset includes: * defined in include/nuttx/serial/tioctl.h. This subset includes:
* *
* CAICO_REGISTERCB * CAICO_REGISTERCB
* Register a callback for serial event notification. Argument: * Register a callback for serial event notification. Argument:
nuttx/lib/termios/lib_tcgetattr.c
+1 -1
View File
@@ -44,7 +44,7 @@
#include <termios.h> #include <termios.h>
#include <errno.h> #include <errno.h>
#include <nuttx/tioctl.h> #include <nuttx/serial/tioctl.h>
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
nuttx/lib/termios/lib_tcsetattr.c
+1 -1
View File
@@ -44,7 +44,7 @@
#include <termios.h> #include <termios.h>
#include <errno.h> #include <errno.h>
#include <nuttx/tioctl.h> #include <nuttx/serial/tioctl.h>
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions