ZNEO configurations updated to use ZDS-II version 5.0.1

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

4 files changed, 33 insertions, 11 deletions

diff --git a/nuttx/arch/z16/include/z16f/irq.h b/nuttx/arch/z16/include/z16f/irq.h
index 83b251e81..e470ddfcb 100644
--- a/nuttx/arch/z16/include/z16f/irq.h
+++ b/nuttx/arch/z16/include/z16f/irq.h
@@ -2,7 +2,7 @@
  * arch/z16f/irq.h
  * arch/chip/irq.h
  *
- *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -188,8 +188,8 @@ struct xcptcontext
 
   /* The following retains that state during signal execution */
 
-  uint32_t saved_pc;	/* Saved return address */
-  uint16_t saved_i;		/* Saved interrupt state */
+  uint32_t saved_pc;  /* Saved return address */
+  uint16_t saved_i;   /* Saved interrupt state */
 #endif
 };
 #endif
@@ -231,7 +231,7 @@ extern "C" {
 EXTERN intrinsic void EI(void);
 EXTERN intrinsic void DI(void);
 EXTERN intrinsic void RI(unsigned short);
-EXTERN intrinsic SET_VECTOR(int,void (* func) (void));
+EXTERN intrinsic void SET_VECTOR(int,void (* func) (void));
 EXTERN intrinsic unsigned short TDI(void);
 
 #ifndef __ZILOG__
diff --git a/nuttx/arch/z16/src/Makefile b/nuttx/arch/z16/src/Makefile
index b34d91c68..f209dcaed 100644
--- a/nuttx/arch/z16/src/Makefile
+++ b/nuttx/arch/z16/src/Makefile
@@ -38,18 +38,29 @@
 
 COMPILER = ${shell basename "$(CC)"}
 ARCHSRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
+
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+  USRINCLUDES = -usrinc:'.;$(TOPDIR)/sched;$(ARCHSRCDIR);$(ARCHSRCDIR)/common'
+else
 ifeq ($(COMPILER),zneocc.exe)
-WARCHSRCDIR := ${shell cygpath -w $(ARCHSRCDIR)}
-USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common'
+  WARCHSRCDIR := ${shell cygpath -w $(ARCHSRCDIR)}
+  USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common'
 else
-WARCHSRCDIR = $(ARCHSRCDIR)
-USRINCLUDES = -I$(TOPDIR)/sched -I$(ARCHSRCDIR) -I$(ARCHSRCDIR)/common
+  WARCHSRCDIR = $(ARCHSRCDIR)
+  USRINCLUDES = -I$(TOPDIR)/sched -I$(ARCHSRCDIR) -I$(ARCHSRCDIR)/common
+endif
 endif
+
 INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES)
 CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 CPPFLAGS += -I$(ARCHSRCDIR)
+
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+  LDFLAGS  += @"$(ARCHSRCDIR)/nuttx.linkcmd"
+else
 ifeq ($(COMPILER),zneocc.exe)
-LDFLAGS  += "${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}"
+  LDFLAGS  += @"${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}"
+endif
 endif
 
 HEAD_ASRC = $(HEAD_SSRC:.S=$(ASMEXT))
@@ -96,6 +107,14 @@ board/libboard$(LIBEXT):
 ifeq ($(COMPILER),zneocc.exe)
 nuttx.linkcmd: $(LINKCMDTEMPLATE)
 	$(Q) cp -f $(LINKCMDTEMPLATE) nuttx.linkcmd
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+	@echo "$(TOPDIR)\nuttx}"= \>>nuttx.linkcmd
+	@echo   "$(ARCHSRCDIR)\$(HEAD_OBJ)", \>>nuttx.linkcmd
+	$(Q) for %%G in ($(LINKLIBS)) do ( echo   "$(TOPDIR)\lib\%%G", \>>nuttx.linkcmd )
+	@echo   "$(ARCHSRCDIR)\board\libboard$(LIBEXT)", \>>nuttx.linkcmd
+	@echo   "$(ZDSSTDLIBDIR)\chelpld$(LIBEXT)", \>>nuttx.linkcmd
+	@echo   "$(ZDSSTDLIBDIR)\fpld$(LIBEXT)">>nuttx.linkcmd
+else
 	@echo "\"${shell cygpath -w $(TOPDIR)/nuttx}\"= \\" >>nuttx.linkcmd
 	@echo "  \"${shell cygpath -w $(ARCHSRCDIR)/$(HEAD_OBJ)}\", \\" >>nuttx.linkcmd
 	$(Q) ( for lib in $(LINKLIBS); do \
@@ -104,6 +123,7 @@ nuttx.linkcmd: $(LINKCMDTEMPLATE)
 	@echo "  \"${shell cygpath -w $(ARCHSRCDIR)/board/libboard$(LIBEXT)}\", \\"  >>nuttx.linkcmd
 	@echo "  \"${shell cygpath -w $(ZDSSTDLIBDIR)/chelpld$(LIBEXT)}\", \\"  >>nuttx.linkcmd
 	@echo "  \"${shell cygpath -w $(ZDSSTDLIBDIR)/fpld$(LIBEXT)}\""  >>nuttx.linkcmd
+endif
 else
 nuttx.linkcmd:
 endif
diff --git a/nuttx/arch/z16/src/common/up_doirq.c b/nuttx/arch/z16/src/common/up_doirq.c
index e8f40fb56..670e6985d 100644
--- a/nuttx/arch/z16/src/common/up_doirq.c
+++ b/nuttx/arch/z16/src/common/up_doirq.c
@@ -95,7 +95,7 @@ FAR chipreg_t *up_doirq(int irq, FAR chipreg_t *regs)
        * interrupt level context switches.
        */
 
-      savestate    = (uint32_t*)current_regs;
+      savestate    = (FAR chipreg_t *)current_regs;
       current_regs = regs;
 
       /* Mask and acknowledge the interrupt */
@@ -120,7 +120,9 @@ FAR chipreg_t *up_doirq(int irq, FAR chipreg_t *regs)
 
       up_enable_irq(irq);
     }
+
   up_ledoff(LED_INIRQ);
 #endif
+
   return ret;
 }
diff --git a/nuttx/arch/z16/src/common/up_internal.h b/nuttx/arch/z16/src/common/up_internal.h
index 4d07392d9..2c1968e8d 100644
--- a/nuttx/arch/z16/src/common/up_internal.h
+++ b/nuttx/arch/z16/src/common/up_internal.h
@@ -105,7 +105,7 @@ typedef void (*up_vector_t)(void);
  * interrupt processing.
  */
 
-extern voltile FAR chipreg_t *current_regs;
+extern volatile FAR chipreg_t *current_regs;
 #endif
 
 /****************************************************************************