Fix Z8F6403 compile issues

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@703 42af7a65-404d-4744-a932-0658087f49c3

2 files changed, 55 insertions, 61 deletions

diff --git a/nuttx/configs/z8encore000zco/ostest/Make.defs b/nuttx/configs/z8encore000zco/ostest/Make.defs
index 7318e9e6d..1efab1b0f 100644
--- a/nuttx/configs/z8encore000zco/ostest/Make.defs
+++ b/nuttx/configs/z8encore000zco/ostest/Make.defs
@@ -68,26 +68,36 @@ EZDSZILOGINCDIR 	:= ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"}
 
 # Assembler definitions
 
+ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
+ARCHFAMILYDEF		= _Z8ENCORE_F642X
+ARCHSERIESDEF		= _Z8ENCORE_64K_SERIES
+ARCHREVAA		= -NOrevaa
+ifeq ($(CONFIG_ARCH_CHIP_Z8F6423),y)
+ARCHCPU			= Z8F6423
+ARCHCPUDEF		= _Z8F6423
+endif
+endif
+
+ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
+ARCHFAMILYDEF		= _Z8ENCORE_F640X
+ARCHSERIESDEF		= _Z8ENCORE_640_FAMILY
+ARCHREVAA		= -revaa
+ifeq ($(CONFIG_ARCH_CHIP_Z8F6403),y)
+ARCHCPU			= Z8F6403
+ARCHCPUDEF		= _Z8F6403
+endif
+endif
+
 ifeq ("${CONFIG_DEBUG}","y")
   ARCHASMOPTIMIZATION	= -debug -sdiopt
 else
   ARCHASMOPTIMIZATION	= -nodebug -sdiopt
 endif
 
-ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
-ARCHASMCPUFLAGS 	= -cpu:Z8F6423 -NOigcase -NOrevaa
-endif
-ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
-ARCHASMCPUFLAGS 	= -cpu:Z8F6403 -NOigcase -revaa
-endif
+ARCHASMCPUFLAGS 	= -cpu:$(ARCHCPU) -NOigcase $(ARCHREVAA)
 ARCHASMLIST		= -list -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet
 ARCHASMWARNINGS 	= -warn
-ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
-ARCHASMDEFINES		= -define:_Z8F6423=1 -define:_Z8ENCORE_64K_SERIES=1 -define:_Z8ENCORE_F642X=1 \ 				  -define:__ASSEMBLY__
-endif
-ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
-ARCHASMDEFINES		= -define:_Z8F6403=1 -define:_Z8ENCORE_640_FAMILY=1 -define:_Z8ENCORE_F640X=1 \ 				  -define:__ASSEMBLY__
-endif
+ARCHASMDEFINES		= -define:$(ARCHCPUDEF)=1 -define:$(ARCHSERIESDEF)=1 -define:$(ARCHFAMILYDEF)=1 \ 				  -define:__ASSEMBLY__
 ARCHASMINCLUDES 	= -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
 EARCHASMINCLUDES 	= -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
 AFLAGS			= $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) \
@@ -101,35 +111,19 @@ else
   ARCHOPTIMIZATION	= -nodebug -regvar
 endif
 
-ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
-ARCHCPUFLAGS		= -chartype:S -model:L -const:RAM -NOoptlink -promote -cpu:Z8F6423 -NOgenprintf \
+ARCHCPUFLAGS		= -chartype:S -model:L -const:RAM -NOoptlink -promote -cpu:$(ARCHCPU) $(ARCHREVAA) -NOgenprintf \
 			  -asmsw:" $(ARCHASMCPUFLAGS) $(EARCHASMINCLUDES) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)"
-endif
-ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
-ARCHCPUFLAGS		= -chartype:S -model:L -const:RAM -NOoptlink -promote -cpu:Z8F6403 -NOgenprintf \
-			  -asmsw:" $(ARCHASMCPUFLAGS) $(EARCHASMINCLUDES) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)"
-endif
 ARCHLIST		= -keeplst -NOlist -NOlistinc -keepasm
 ARCHPICFLAGS		=
 ARCHWARNINGS		= -warn
-ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
-ARCHDEFINES		= -define:_Z8ENCORE_F642X -define:_Z8F6423 -define:_Z8ENCORE_64K_SERIES
-endif
-ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
-ARCHDEFINES		= -define:_Z8ENCORE_F640X -define:_Z8F6403 -define:_Z8ENCORE_640_FAMILY
-endif
+ARCHDEFINES		= -define:$(ARCHFAMILYDEF) -define:$(ARCHCPUDEF) -define:$(ARCHSERIESDEF)
 ARCHSTDINCLUDES 	= -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR);$(WZDSDEVINCDIR)'
 ARCHUSRINCLUDES 	= -usrinc:'.'
 ARCHINCLUDES		= $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
 CFLAGS			= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) \
 			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES)
 
-ifeq ($(CONFIG_ARCH_CHIP_Z8F642X),y)
-CPPDEFINES              = -D_Z8ENCORE_F642X -D_Z8F6423 -D_Z8ENCORE_64K_SERIES -D__ASSEMBLY__
-endif
-ifeq ($(CONFIG_ARCH_CHIP_Z8F640X),y)
-CPPDEFINES              = -D_Z8ENCORE_F640X -D_Z8F6403 -D_Z8ENCORE_640_FAMILY -D__ASSEMBLY__
-endif
+CPPDEFINES              = -D$(ARCHFAMILYDEF) -D$(ARCHCPUDEF) -D$(ARCHSERIESDEF) -D__ASSEMBLY__
 CPPINCLUDES             = -I$(TOPDIR)/include
 CPPFLAGS                = $(CPPDEFINES) $(CPPINCLUDES)
 
diff --git a/nuttx/configs/z8encore000zco/ostest/defconfig b/nuttx/configs/z8encore000zco/ostest/defconfig
index c5b5b9405..7f864c456 100644
--- a/nuttx/configs/z8encore000zco/ostest/defconfig
+++ b/nuttx/configs/z8encore000zco/ostest/defconfig
@@ -60,10 +60,10 @@ CONFIG_ARCH=z80
 CONFIG_ARCH_Z8=y
 CONFIG_ARCH_CHIP=z8
 CONFIG_ARCH_CHIP_Z8=y
-CONFIG_ARCH_CHIP_Z8F642X=y
-CONFIG_ARCH_CHIP_Z8F6423=y
-CONFIG_ARCH_CHIP_Z8F640X=n
-CONFIG_ARCH_CHIP_Z8F6403=n
+CONFIG_ARCH_CHIP_Z8F640X=y
+CONFIG_ARCH_CHIP_Z8F6403=y
+CONFIG_ARCH_CHIP_Z8F642X=n
+CONFIG_ARCH_CHIP_Z8F6423=n
 CONFIG_ARCH_BOARD=z8encore000zco
 CONFIG_ARCH_BOARD_Z8ENCORE000ZCO=y
 CONFIG_BOARD_LOOPSPERMSEC=1250
@@ -85,10 +85,10 @@ CONFIG_ARCH_LEDS=n
 #
 CONFIG_UART0_SERIAL_CONSOLE=y
 CONFIG_UART1_SERIAL_CONSOLE=n
-CONFIG_UART0_TXBUFSIZE=256
-CONFIG_UART1_TXBUFSIZE=256
-CONFIG_UART0_RXBUFSIZE=256
-CONFIG_UART1_RXBUFSIZE=256
+CONFIG_UART0_TXBUFSIZE=0
+CONFIG_UART1_TXBUFSIZE=0
+CONFIG_UART0_RXBUFSIZE=0
+CONFIG_UART1_RXBUFSIZE=0
 CONFIG_UART0_BAUD=57600
 CONFIG_UART1_BAUD=57600
 CONFIG_UART0_PARITY=0
@@ -145,15 +145,15 @@ CONFIG_DEBUG=y
 CONFIG_DEBUG_VERBOSE=n
 CONFIG_MM_REGIONS=1
 CONFIG_ARCH_LOWPUTC=y
-CONFIG_RR_INTERVAL=200
+CONFIG_RR_INTERVAL=0
 CONFIG_SCHED_INSTRUMENTATION=n
 CONFIG_TASK_NAME_SIZE=0
 CONFIG_START_YEAR=2008
 CONFIG_START_MONTH=2
-CONFIG_START_DAY=12
+CONFIG_START_DAY=17
 CONFIG_JULIAN_TIME=n
-CONFIG_DEV_CONSOLE=y
-CONFIG_DEV_LOWCONSOLE=y
+CONFIG_DEV_CONSOLE=n
+CONFIG_DEV_LOWCONSOLE=n
 
 #
 # The following can be used to disable categories of
@@ -170,13 +170,13 @@ CONFIG_DEV_LOWCONSOLE=y
 # o pthread_condtimedwait() depends on signals to wake
 #   up waiting tasks.
 #
-CONFIG_DISABLE_CLOCK=n
-CONFIG_DISABLE_POSIX_TIMERS=n
-CONFIG_DISABLE_PTHREAD=n
-CONFIG_DISABLE_SIGNALS=n
-CONFIG_DISABLE_MQUEUE=n
-CONFIG_DISABLE_MOUNTPOINT=n
-CONFIG_DISABLE_ENVIRON=n
+CONFIG_DISABLE_CLOCK=y
+CONFIG_DISABLE_POSIX_TIMERS=y
+CONFIG_DISABLE_PTHREAD=y
+CONFIG_DISABLE_SIGNALS=y
+CONFIG_DISABLE_MQUEUE=y
+CONFIG_DISABLE_MOUNTPOINT=y
+CONFIG_DISABLE_ENVIRON=y
 
 #
 # Misc libc settings
@@ -240,19 +240,19 @@ CONFIG_ARCH_KFREE=n
 #   timer structures to minimize dynamic allocations.  Set to
 #   zero for all dynamic allocations.
 #
-CONFIG_MAX_TASKS=16
+CONFIG_MAX_TASKS=8
 CONFIG_MAX_TASK_ARGS=4
-CONFIG_NPTHREAD_KEYS=4
-CONFIG_NFILE_DESCRIPTORS=8
-CONFIG_NFILE_STREAMS=8
+CONFIG_NPTHREAD_KEYS=0
+CONFIG_NFILE_DESCRIPTORS=0
+CONFIG_NFILE_STREAMS=0
 CONFIG_NAME_MAX=32
-CONFIG_STDIO_BUFFER_SIZE=256
-CONFIG_NUNGET_CHARS=2
-CONFIG_PREALLOC_MQ_MSGS=4
-CONFIG_MQ_MAXMSGSIZE=32
+CONFIG_STDIO_BUFFER_SIZE=0
+CONFIG_NUNGET_CHARS=0
+CONFIG_PREALLOC_MQ_MSGS=0
+CONFIG_MQ_MAXMSGSIZE=0
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_PREALLOC_WDOGS=4
-CONFIG_PREALLOC_TIMERS=4
+CONFIG_PREALLOC_TIMERS=0
 
 #
 # TCP/IP and UDP support via uIP
@@ -332,8 +332,8 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
 #
 CONFIG_BOOT_FROM_FLASH=n
 CONFIG_CUSTOM_STACK=n
-CONFIG_PROC_STACK_SIZE=4096
+CONFIG_PROC_STACK_SIZE=1024
 CONFIG_PTHREAD_STACK_MIN=256
-CONFIG_PTHREAD_STACK_DEFAULT=4096
+CONFIG_PTHREAD_STACK_DEFAULT=1024
 CONFIG_HEAP_SIZE=
 CONFIG_HEAP_BASE=