From 07d0fe58fca45da941ae898a714552b15d922a4f Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 14 Dec 2012 19:15:07 +0000 Subject: [PATCH] More z180 serial logic git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5437 42af7a65-404d-4744-a932-0658087f49c3 --- configs/ez80f910200kitg/ostest/defconfig | 2 +- configs/ez80f910200zco/dhcpd/defconfig | 2 +- configs/ez80f910200zco/httpd/defconfig | 2 +- configs/ez80f910200zco/nettest/defconfig | 2 +- configs/ez80f910200zco/nsh/defconfig | 2 +- configs/ez80f910200zco/ostest/defconfig | 2 +- configs/ez80f910200zco/poll/defconfig | 2 +- configs/p112/ostest/defconfig | 48 ++++++++++-------------- configs/z8encore000zco/ostest/defconfig | 2 +- configs/z8f64200100kit/ostest/defconfig | 2 +- 10 files changed, 29 insertions(+), 37 deletions(-) diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig index d8be31a97d..50efbfdaf3 100644 --- a/configs/ez80f910200kitg/ostest/defconfig +++ b/configs/ez80f910200kitg/ostest/defconfig @@ -99,7 +99,7 @@ CONFIG_EZ80_UART0=y # CONFIG_EZ80_UART1 is not set # CONFIG_EZ80_UART2 is not set # CONFIG_EZ80_EMAC is not set -CONFIG_HAVE_LOWUARTINIT=y +CONFIG_HAVE_LOWSERIALINIT=y # # Architecture Options diff --git a/configs/ez80f910200zco/dhcpd/defconfig b/configs/ez80f910200zco/dhcpd/defconfig index 37a256d5eb..95baadc13b 100644 --- a/configs/ez80f910200zco/dhcpd/defconfig +++ b/configs/ez80f910200zco/dhcpd/defconfig @@ -115,7 +115,7 @@ CONFIG_START_YEAR=2009 CONFIG_START_MONTH=3 CONFIG_START_DAY=14 CONFIG_JULIAN_TIME=n -CONFIG_HAVE_LOWUARTINIT=y +CONFIG_HAVE_LOWSERIALINIT=y CONFIG_DEV_CONSOLE=y CONFIG_DEV_LOWCONSOLE=y CONFIG_MUTEX_TYPES=n diff --git a/configs/ez80f910200zco/httpd/defconfig b/configs/ez80f910200zco/httpd/defconfig index 0cf4c33aaa..6a910ee0bb 100644 --- a/configs/ez80f910200zco/httpd/defconfig +++ b/configs/ez80f910200zco/httpd/defconfig @@ -115,7 +115,7 @@ CONFIG_START_YEAR=2009 CONFIG_START_MONTH=3 CONFIG_START_DAY=14 CONFIG_JULIAN_TIME=n -CONFIG_HAVE_LOWUARTINIT=y +CONFIG_HAVE_LOWSERIALINIT=y CONFIG_DEV_CONSOLE=y CONFIG_DEV_LOWCONSOLE=y CONFIG_MUTEX_TYPES=n diff --git a/configs/ez80f910200zco/nettest/defconfig b/configs/ez80f910200zco/nettest/defconfig index 9f7d438be7..22cf35a0c4 100644 --- a/configs/ez80f910200zco/nettest/defconfig +++ b/configs/ez80f910200zco/nettest/defconfig @@ -115,7 +115,7 @@ CONFIG_START_YEAR=2009 CONFIG_START_MONTH=3 CONFIG_START_DAY=14 CONFIG_JULIAN_TIME=n -CONFIG_HAVE_LOWUARTINIT=y +CONFIG_HAVE_LOWSERIALINIT=y CONFIG_DEV_CONSOLE=y CONFIG_DEV_LOWCONSOLE=y CONFIG_MUTEX_TYPES=n diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig index 804a4563ff..8ad3930fff 100644 --- a/configs/ez80f910200zco/nsh/defconfig +++ b/configs/ez80f910200zco/nsh/defconfig @@ -115,7 +115,7 @@ CONFIG_START_YEAR=2009 CONFIG_START_MONTH=3 CONFIG_START_DAY=14 CONFIG_JULIAN_TIME=n -CONFIG_HAVE_LOWUARTINIT=y +CONFIG_HAVE_LOWSERIALINIT=y CONFIG_DEV_CONSOLE=y CONFIG_DEV_LOWCONSOLE=n CONFIG_MUTEX_TYPES=n diff --git a/configs/ez80f910200zco/ostest/defconfig b/configs/ez80f910200zco/ostest/defconfig index 977dda1dc5..3a13523331 100644 --- a/configs/ez80f910200zco/ostest/defconfig +++ b/configs/ez80f910200zco/ostest/defconfig @@ -99,7 +99,7 @@ CONFIG_EZ80_UART0=y # CONFIG_EZ80_UART1 is not set # CONFIG_EZ80_UART2 is not set # CONFIG_EZ80_EMAC is not set -CONFIG_HAVE_LOWUARTINIT=y +CONFIG_HAVE_LOWSERIALINIT=y CONFIG_ARCH_TIMERHOOK=y # diff --git a/configs/ez80f910200zco/poll/defconfig b/configs/ez80f910200zco/poll/defconfig index 316d150d0a..82cea4fcf2 100644 --- a/configs/ez80f910200zco/poll/defconfig +++ b/configs/ez80f910200zco/poll/defconfig @@ -115,7 +115,7 @@ CONFIG_START_YEAR=2009 CONFIG_START_MONTH=3 CONFIG_START_DAY=14 CONFIG_JULIAN_TIME=n -CONFIG_HAVE_LOWUARTINIT=y +CONFIG_HAVE_LOWSERIALINIT=y CONFIG_DEV_CONSOLE=y CONFIG_DEV_LOWCONSOLE=y CONFIG_MUTEX_TYPES=n diff --git a/configs/p112/ostest/defconfig b/configs/p112/ostest/defconfig index 62162f37e9..eb02fe6bcf 100644 --- a/configs/p112/ostest/defconfig +++ b/configs/p112/ostest/defconfig @@ -119,6 +119,7 @@ CONFIG_ARCH_CHIP_Z8018216FSG=y # CONFIG_ARCH_CHIP_EZ80F93 is not set CONFIG_ARCH_CHIP_Z180=y CONFIG_ARCH_CHIP_Z80182=y +CONFIG_HAVE_LOWSERIALINIT=y CONFIG_LINKER_HOME_AREA=0x0000 CONFIG_LINKER_CODE_AREA=0x0200 CONFIG_LINKER_DATA_AREA=0x8000 @@ -135,8 +136,25 @@ CONFIG_Z180_PHYSHEAP_END=0x100000 # # Z180 Peripheral Support # -CONFIG_Z180_UART0=y -CONFIG_Z180_UART1=y +# CONFIG_Z180_UART0 is not set +# CONFIG_Z180_UART1 is not set +CONFIG_Z180_ESCCA=y +# CONFIG_Z180_ESCCB is not set +# CONFIG_Z180_TMR1 is not set +# CONFIG_Z180_PORTA is not set +# CONFIG_Z180_PORTB is not set +# CONFIG_Z180_MIMIC is not set +CONFIG_Z180_ESCCA_SERIAL_CONSOLE=y + +# +# ESCC Channel A Configuration +# +CONFIG_Z180_ESCCA_RXBUFSIZE=64 +CONFIG_Z180_ESCCA_TXBUFSIZE=64 +CONFIG_Z180_ESCCA_BAUD=9600 +CONFIG_Z180_ESCCA_BITS=8 +CONFIG_Z180_ESCCA_PARITY=0 +CONFIG_Z180_ESCCA_2STOP=0 # # Architecture Options @@ -261,32 +279,6 @@ CONFIG_DEV_NULL=y CONFIG_SERIAL=y CONFIG_DEV_LOWCONSOLE=y # CONFIG_16550_UART is not set -CONFIG_ARCH_HAVE_UART0=y -CONFIG_ARCH_HAVE_UART1=y -CONFIG_MCU_SERIAL=y -CONFIG_UART0_SERIAL_CONSOLE=y -# CONFIG_UART1_SERIAL_CONSOLE is not set -# CONFIG_NO_SERIAL_CONSOLE is not set - -# -# UART0 Configuration -# -CONFIG_UART0_RXBUFSIZE=64 -CONFIG_UART0_TXBUFSIZE=64 -CONFIG_UART0_BAUD=115200 -CONFIG_UART0_BITS=8 -CONFIG_UART0_PARITY=0 -CONFIG_UART0_2STOP=0 - -# -# UART1 Configuration -# -CONFIG_UART1_RXBUFSIZE=64 -CONFIG_UART1_TXBUFSIZE=64 -CONFIG_UART1_BAUD=115200 -CONFIG_UART1_BITS=8 -CONFIG_UART1_PARITY=0 -CONFIG_UART1_2STOP=0 # CONFIG_USBDEV is not set # CONFIG_USBHOST is not set # CONFIG_WIRELESS is not set diff --git a/configs/z8encore000zco/ostest/defconfig b/configs/z8encore000zco/ostest/defconfig index b098c682bc..7d9b227f4b 100644 --- a/configs/z8encore000zco/ostest/defconfig +++ b/configs/z8encore000zco/ostest/defconfig @@ -88,7 +88,7 @@ CONFIG_ARCH_CHIP_Z8F6403=y # CONFIG_ARCH_CHIP_EZ80F93 is not set CONFIG_ARCH_CHIP_Z8F640X=y CONFIG_ARCH_CHIP_Z8=y -CONFIG_HAVE_LOWUARTINIT=y +CONFIG_HAVE_LOWSERIALINIT=y CONFIG_Z8_UART0=y CONFIG_Z8_UART1=y diff --git a/configs/z8f64200100kit/ostest/defconfig b/configs/z8f64200100kit/ostest/defconfig index caa6854198..a349529872 100644 --- a/configs/z8f64200100kit/ostest/defconfig +++ b/configs/z8f64200100kit/ostest/defconfig @@ -88,7 +88,7 @@ CONFIG_ARCH_CHIP_Z8F6423=y # CONFIG_ARCH_CHIP_EZ80F93 is not set CONFIG_ARCH_CHIP_Z8F642X=y CONFIG_ARCH_CHIP_Z8=y -CONFIG_HAVE_LOWUARTINIT=y +CONFIG_HAVE_LOWSERIALINIT=y CONFIG_Z8_UART0=y CONFIG_Z8_UART1=y