Make sure z16f still builds

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

6 files changed, 48 insertions, 3 deletions

diff --git a/nuttx/arch/z16/src/z16f/z16f_irq.c b/nuttx/arch/z16/src/z16f/z16f_irq.c
index 5a214e6d6..fe522ab60 100644
--- a/nuttx/arch/z16/src/z16f/z16f_irq.c
+++ b/nuttx/arch/z16/src/z16f/z16f_irq.c
@@ -200,3 +200,17 @@ void up_maskack_irq(int irq)
         }
     }
 }
+
+/****************************************************************************
+ * Name: up_prioritize_irq
+ *
+ * Description:
+ *   Set interrupt priority
+ *
+ ****************************************************************************/
+
+void up_prioritize_irq(int irq, int priority)
+{
+  /* To be provided */
+}
+
diff --git a/nuttx/configs/z16f2800100zcog/ostest/defconfig b/nuttx/configs/z16f2800100zcog/ostest/defconfig
index 4c9a7c93b..8b927a451 100644
--- a/nuttx/configs/z16f2800100zcog/ostest/defconfig
+++ b/nuttx/configs/z16f2800100zcog/ostest/defconfig
@@ -51,6 +51,12 @@
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
 #   the board that supports the particular chip or SoC.
 # CONFIG_ARCH_BOARD_name - for use in C code
+# CONFIG_ARCH_NOINTC - define if the architecture does not
+#   support an interrupt controller or otherwise cannot support
+#   APIs like up_enable_irq() and up_disable_irq().
+# CONFIG_ARCH_IRQPRIO
+#   Define if the architecture suports prioritizaton of interrupts
+#   and the up_prioritize_irq() API.
 # CONFIG_BOARD_LOOPSPERMSEC - for delay loops
 # CONFIG_ENDIAN_BIG - define if big endian (default is little endian)
 # CONFIG_DRAM_SIZE - Describes the installed DRAM.
@@ -66,6 +72,8 @@ CONFIG_ARCH_CHIP_Z16F3211=n
 CONFIG_ARCH_CHIP_Z16F6411=n
 CONFIG_ARCH_BOARD=z16f2800100zcog
 CONFIG_ARCH_BOARD_Z16F2800100ZCOG=y
+CONFIG_ARCH_NOINTC=n
+CONFIG_ARCH_IRQPRIO=y
 CONFIG_BOARD_LOOPSPERMSEC=1250
 CONFIG_ENDIAN_BIG=y
 CONFIG_DRAM_SIZE=65536
diff --git a/nuttx/configs/z16f2800100zcog/pashello/defconfig b/nuttx/configs/z16f2800100zcog/pashello/defconfig
index 1149c1dc2..233582953 100644
--- a/nuttx/configs/z16f2800100zcog/pashello/defconfig
+++ b/nuttx/configs/z16f2800100zcog/pashello/defconfig
@@ -51,6 +51,12 @@
 # CONFIG_ARCH_BOARD - identifies the configs subdirectory and, hence,
 #   the board that supports the particular chip or SoC.
 # CONFIG_ARCH_BOARD_name - for use in C code
+# CONFIG_ARCH_NOINTC - define if the architecture does not
+#   support an interrupt controller or otherwise cannot support
+#   APIs like up_enable_irq() and up_disable_irq().
+# CONFIG_ARCH_IRQPRIO
+#   Define if the architecture suports prioritizaton of interrupts
+#   and the up_prioritize_irq() API.
 # CONFIG_BOARD_LOOPSPERMSEC - for delay loops
 # CONFIG_ENDIAN_BIG - define if big endian (default is little endian)
 # CONFIG_DRAM_SIZE - Describes the installed DRAM.
@@ -66,6 +72,8 @@ CONFIG_ARCH_CHIP_Z16F3211=n
 CONFIG_ARCH_CHIP_Z16F6411=n
 CONFIG_ARCH_BOARD=z16f2800100zcog
 CONFIG_ARCH_BOARD_Z16F2800100ZCOG=y
+CONFIG_ARCH_NOINTC=n
+CONFIG_ARCH_IRQPRIO=y
 CONFIG_BOARD_LOOPSPERMSEC=1250
 CONFIG_ENDIAN_BIG=y
 CONFIG_DRAM_SIZE=65536
diff --git a/nuttx/drivers/Makefile b/nuttx/drivers/Makefile
index df5c838f8..9f8344621 100644
--- a/nuttx/drivers/Makefile
+++ b/nuttx/drivers/Makefile
@@ -35,6 +35,8 @@
 
 -include $(TOPDIR)/Make.defs
 
+COMPILER	= ${shell basename $(CC)}
+
 ifeq ($(CONFIG_NET),y)
 include net/Make.defs
 ROOTDEPPATH	= --dep-path .
@@ -45,13 +47,25 @@ ifeq ($(CONFIG_USBDEV),y)
 include usbdev/Make.defs
 ROOTDEPPATH	= --dep-path .
 USBDEVDEPPATH	= --dep-path usbdev
-CFLAGS		+= -I$(TOPDIR)/drivers/usbdev
+ifeq ($(COMPILER),zneocc.exe)
+USBDEVDIR	= ${shell cygpath -w $(TOPDIR)/drivers/usbdev}
+CFLAGS		+= -usrinc:'$(USBDEVDIR)'
+else
+USBDEVDIR	= $(TOPDIR)/drivers/usbdev
+CFLAGS		+= -I$(USBDEVDIR)
+endif
 endif
 
 include mmcsd/Make.defs
 ROOTDEPPATH	= --dep-path .
 MMCSDDEPPATH	= --dep-path mmcsd
-CFLAGS		+= -I$(TOPDIR)/drivers/mmcsd
+ifeq ($(COMPILER),zneocc.exe)
+MMCSDDIR	= ${shell cygpath -w $(TOPDIR)/drivers/mmcsd}
+CFLAGS		+= -usrinc:'$(MMCSDDIR)'
+else
+MMCSDDIR	= $(TOPDIR)/drivers/mmcsd
+CFLAGS		+= -I$(MMCSDDIR)
+endif
 
 ASRCS		= $(NET_ASRCS) $(USBDEV_ASRCS) $(MMCSD_ASRCS)
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
diff --git a/nuttx/include/stdio.h b/nuttx/include/stdio.h
index 0a1cc9371..23a9bf35b 100644
--- a/nuttx/include/stdio.h
+++ b/nuttx/include/stdio.h
@@ -82,7 +82,7 @@
 
 /* Streams */
 
-typedef FAR struct file_struct FILE;
+typedef struct file_struct FILE;
 
 /****************************************************************************
  * Public Variables
diff --git a/nuttx/sched/sched_setupidlefiles.c b/nuttx/sched/sched_setupidlefiles.c
index 7ff94674b..bdf796ecd 100644
--- a/nuttx/sched/sched_setupidlefiles.c
+++ b/nuttx/sched/sched_setupidlefiles.c
@@ -39,6 +39,7 @@
 
 #include <nuttx/config.h>
 
+#include <sys/types.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>