Add framework for UART support

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@704 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2008-02-18 16:27:25 +00:00
parent daa2610d07
commit 352eb0fb64
7 changed files with 1058 additions and 6 deletions
+6
View File
@@ -154,7 +154,13 @@ void up_initialize(void)
/* Initialize the serial device driver */
#ifdef CONFIG_USE_SERIALDRIVER
up_serialinit();
#endif
#ifdef CONFIG_USE_LOWCONSOLE
lowconsole_init();
#endif
/* Initialize the netwok */
+20 -1
View File
@@ -50,6 +50,8 @@
#undef CONFIG_SUPPRESS_SERIAL_INTS /* Console will poll */
#undef CONFIG_SUPPRESS_UART_CONFIG /* Do not reconfig UART */
#undef CONFIG_DUMP_ON_EXIT /* Dump task state on exit */
#undef CONFIG_Z80_LOWPUTC /* Support up_lowputc for debug */
#undef CONFIG_Z80_LOWGETC /* support up_lowgetc for debug */
/****************************************************************************
* Included Files
@@ -63,6 +65,17 @@
* Definitions
****************************************************************************/
/* Determine which (if any) console driver to use */
#if defined(CONFIG_Z80_LOWPUTC) || defined(CONFIG_Z80_LOWGETC) || \
CONFIG_NFILE_DESCRIPTORS == 0 || defined(CONFIG_DEV_LOWCONSOLE)
# define CONFIG_USE_LOWCONSOLE 1
# define CONFIG_USE_LOWUARTINIT 1
#elif defined(CONFIG_DEV_CONSOLE) && CONFIG_NFILE_DESCRIPTORS > 0
# define CONFIG_USE_SERIALDRIVER 1
# define CONFIG_USE_EARLYSERIALINIT 1
#endif
/****************************************************************************
* Public Types
****************************************************************************/
@@ -106,7 +119,7 @@ void up_addregion(void);
/* Defined in up_serial.c */
#if CONFIG_NFILE_DESCRIPTORS > 0
#ifdef CONFIG_USE_SERIALDRIVER
EXTERN void up_earlyserialinit(void);
EXTERN void up_serialinit(void);
#else
@@ -114,6 +127,12 @@ EXTERN void up_serialinit(void);
# define up_serialinit()
#endif
#ifdef CONFIG_USE_LOWCONSOLE
EXTERN void lowconsole_init(void);
#else
# define lowconsole_init()
#endif
/* Defined in up_timerisr.c */
EXTERN void up_timerinit(void);
+2 -2
View File
@@ -42,8 +42,8 @@ CMN_CSRCS = up_initialize.c up_allocateheap.c up_createstack.c \
up_reprioritizertr.c up_idle.c up_assert.c up_doirq.c \
up_mdelay.c up_udelay.c up_usestack.c
CHIP_SSRCS = z8_vector.S z8_saveusercontext.S z8_restorecontext.S
CHIP_SSRCS = z8_lowuart.S z8_vector.S z8_saveusercontext.S z8_restorecontext.S
CHIP_CSRCS = z8_initialstate.c z8_irq.c z8_saveirqcontext.c \
z8_schedulesigaction.c z8_sigdeliver.c z8_timerisr.c \
z8_registerdump.c
z8_serial.c z8_registerdump.c
+67
View File
@@ -97,6 +97,73 @@
#define Z8_TIMERCTL_GATED _HX(06)
#define Z8_TIMERCTL_CAPCMP _HX(07)
/* UART Register Offsets *************************************************************/
#define Z8_UART_TXD _HX(00) /* 8-bits: UART Transmit Data */
#define Z8_UART_RXD _HX(00) /* 8-bits: UART Receive Data */
#define Z8_UART_STAT0 _HX(01) /* 8-bits: UART Status 0 */
#define Z8_UART_CTL _HX(02) /* 16-bits: UART Control */
#define Z8_UART_CTL0 _HX(02) /* 8-bits: UART Control 0 */
#define Z8_UART_CTL1 _HX(03) /* 8-bits: UART COntrol 1 */
#if defined(_Z8FMC16) || defined(_Z8F1680)
# define Z8_UART_MDSTAT _HX(04) /* 8-bits: UART Mode Select & Status */
#else
# define Z8_UART_STAT1 _HX(04) /* 8-bits: UART Status 1 */
#endif
#define Z8_UART_ADDR _HX(05) /* 8-bits: UART Address Compare */
#define Z8_UART_BR _HX(06) /* 16-bits: UART Baud Rate */
#define Z8_UART_BRH _HX(06) /* 8-bits: UART Baud Rate High Byte */
#define Z8_UART_BRL _HX(07) /* 8-bits: UART Baud Rate Low Byte */
/* UART0/1 Base Register Addresses **************************************************/
#ifdef EZ8_UART0
# define Z8_UART0_BASE ((ubyte volatile far*)0xf40)
#endif
#ifdef EZ8_UART1
# define Z8_UART1_BASE ((ubyte volatile far*)0xf48)
#endif
/* UART0/1 Status 0 Register Bit Definitions ****************************************/
#define Z8_UARTSTAT0_RDA _HX(80) /* Bit 7: Receive Data Available */
#define Z8_UARTSTAT0_PE _HX(40) /* Bit 6: Parity Error */
#define Z8_UARTSTAT0_OE _HX(20) /* Bit 5: Overrun Error */
#define Z8_UARTSTAT0_FE _HX(10) /* Bit 4: Framing Error */
#define Z8_UARTSTAT0_BRKD _HX(08) /* Bit 3: Break Detect */
#define Z8_UARTSTAT0_TDRE _HX(04) /* Bit 2: Transmitter Data Register Empty */
#define Z8_UARTSTAT0_TXE _HX(02) /* Bit 1: Transmitter Empty */
#define Z8_UARTSTAT0_CTS _HX(01) /* Bit 0: Clear To Send */
/* UART0/1 Control 0/1 Register Bit Definitions *************************************/
#define Z8_UARTCTL0_TEN _HX(80) /* Bit 7: Transmit Enable */
#define Z8_UARTCTL0_REN _HX(40) /* Bit 6: Receive Enable */
#define Z8_UARTCTL0_CTSE _HX(20) /* Bit 5: CTS Enable */
#define Z8_UARTCTL0_PEN _HX(10) /* Bit 4: Parity Enable */
#define Z8_UARTCTL0_PSEL _HX(08) /* Bit 3: Odd Parity Select */
#define Z8_UARTCTL0_SBRK _HX(04) /* Bit 2: Send Break */
#define Z8_UARTCTL0_STOP _HX(02) /* Bit 1: Stop Bit Select */
#define Z8_UARTCTL0_LBEN _HX(01) /* Bit 0: Loopback Enable */
#define Z8_UARTCTL1_MPMD1 _HX(80) /* Bit 7: Multiprocessor Mode (bit1) */
#define Z8_UARTCTL1_MPEN _HX(40) /* Bit 6: Multiprocessor Enable */
#define Z8_UARTCTL1_MPMD0 _HX(20) /* Bit 5: Multiprocessor Mode (bit0) */
#define Z8_UARTCTL1_MPBT _HX(10) /* Bit 4: Multiprocessor Bit Transmit */
#define Z8_UARTCTL1_DEPOL _HX(08) /* Bit 3: Driver Enable Polarity */
#define Z8_UARTCTL1_BRGCTL _HX(04) /* Bit 2: Baud Rate Generator Control */
#define Z8_UARTCTL1_RDAIRQ _HX(02) /* Bit 1: Receive Data Interrupt Enable */
#define Z8_UARTCTL1_IREN _HX(01) /* Bit 0: Infrared Encoder/Decoder Eanble */
/* UART0/1 Mode Status/Select Register Bit Definitions ******************************/
#define Z8_UARTMDSEL_NORMAL _HX(00) /* Bits 5-7=0: Multiprocessor and Normal Mode */
#define Z8_UARTMDSEL_FILTER HX(20) /* Bits 5-7=1: Noise Filter Control/Status */
#define Z8_UARTMDSEL_LINP HX(40) /* Bits 5-7=2: LIN protocol Contol/Status */
#define Z8_UARTMDSEL_HWREV HX(e0) /* Bits 5-7=7: LIN-UART Hardware Revision */
/* Bits 0-4: Mode dependent status */
/* Register access macros ***********************************************************
*
* The register access mechanism provided in ez8.h differs from the useful in other
+5 -3
View File
@@ -42,9 +42,11 @@
************************************************************************************/
#include <sys/types.h>
#include <nuttx/sched.h>
#include <nuttx/arch.h>
#include "up_internal.h"
#ifndef __ASSEMBLY__
# include <nuttx/sched.h>
# include <nuttx/arch.h>
#endif
#include "common/up_internal.h"
/************************************************************************************
* Definitions
+156
View File
@@ -0,0 +1,156 @@
/*************************************************************************
* arch/z80/src/z8/z8_lowuart.asm
* ez8 UART management
*
* Copyright (C) 2008 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 "chip/chip.h"
#include "common/up_internal.h"
#ifdef CONFIG_USE_LOWUARTINIT
/*************************************************************************
* External References / External Definitions
*************************************************************************/
xdef _z8_lowuartinit
#ifdef CONFIG_Z80_LOWPUTC
xdef _up_lowputc
#endif
#ifdef CONFIG_Z80_LOWGETC
xdef _up_lowgetc
#endif
/*************************************************************************
* Data Allocation
*************************************************************************/
define CODESEG, SPACE=ROM
segment CODESEG
/*************************************************************************
* Code
*************************************************************************/
/*************************************************************************
* Name: z8_lowuartinit
*
* Description:
* Initialize UART0 or UART1
*
* Parameters:
* None
*
*************************************************************************/
_z8_lowuartinit:
#endif /* CONFIG_USE_LOWUARTINIT */
/*************************************************************************
* Name: _up_lowputc
*
* Description:
* Send one character to the selected serial console
*
* Parmeters:
* r1 = character
*
* Return:
* None
*
* Modifies r0 (and maybe r1)
*
*************************************************************************/
#ifdef CONFIG_Z80_LOWPUTC
_up_lowputc:
/* Check if the character to output is a linefeed */
/* Output a carriage return before the linefeed */
/*************************************************************************
* Name: _z8_xmitc
*
* Description:
* Send one character on the selected port (really a part of up_lowputc)
*
* Parameters:
* r1 = character
*
* Return:
* None
*
* Modifies r0
*
*************************************************************************/
_z8_xmitc:
_z8_xmitc1:
#ifdef CONFIG_UART1_SERIAL_CONSOLE
#else
#endif
ret /* Return */
#endif /* CONFIG_Z80_LOWPUTC */
/*************************************************************************
* Name: _up_lowgetc
*
* Description:
* Get a character from the serial port
*
* Parmeters:
* None
*
* Return
* R0 = Character read
*
*************************************************************************/
#ifdef CONFIG_Z80_LOWGETC
_up_lowgetc:
_up_lowgetc1:
#ifdef CONFIG_UART1_SERIAL_CONSOLE
#else
#endif
#endif
end
+802
View File
File diff suppressed because it is too large Load Diff