Various changes for a clean ZNEO ZDS-II build

5 files changed, 139 insertions, 14 deletions

diff --git a/nuttx/arch/z16/include/z16f/arch.h b/nuttx/arch/z16/include/z16f/arch.h
index 52f77228a..c79ce0cf8 100644
--- a/nuttx/arch/z16/include/z16f/arch.h
+++ b/nuttx/arch/z16/include/z16f/arch.h
@@ -1,6 +1,5 @@
 /****************************************************************************
- * arch/z26f/arch.h
- * arch/chip/arch.h
+ * arch/z16/include/z16f/arch.h
  *
  *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -38,8 +37,8 @@
  * only indirectly through nuttx/arch.h (via arch/arch.h)
  */
 
-#ifndef __ARCH_Z16F_ARCH_H
-#define __ARCH_Z16F_ARCH_H
+#ifndef __ARCH_Z16_INCLUDE_Z16F_IRQ_H
+#define __ARCH_Z16_INCLUDE_Z16F_IRQ_H
 
 /****************************************************************************
  * Included Files
@@ -73,5 +72,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __ARCH_Z16F_ARCH_H */
+#endif /* __ARCH_Z16_INCLUDE_Z16F_IRQ_H */
 
diff --git a/nuttx/arch/z16/include/z16f/chip.h b/nuttx/arch/z16/include/z16f/chip.h
new file mode 100644
index 000000000..376c3b060
--- /dev/null
+++ b/nuttx/arch/z16/include/z16f/chip.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+ * arch/z16f/chip.h
+ *
+ *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+#ifndef __ARCH_Z16_INCLUDE_Z16F_CHIP_H
+#define __ARCH_Z16_INCLUDE_Z16F_CHIP_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Variables
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C" {
+#else
+#define EXTERN extern
+#endif
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ARCH_Z16_INCLUDE_Z16F_CHIP_H */
diff --git a/nuttx/arch/z16/include/z16f/irq.h b/nuttx/arch/z16/include/z16f/irq.h
index e470ddfcb..ccb0561bc 100644
--- a/nuttx/arch/z16/include/z16f/irq.h
+++ b/nuttx/arch/z16/include/z16f/irq.h
@@ -1,6 +1,5 @@
 /****************************************************************************
- * arch/z16f/irq.h
- * arch/chip/irq.h
+ * arch/z16/include/z16f/irq.h
  *
  *   Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -38,8 +37,8 @@
  * only indirectly through nuttx/irq.h (via arch/irq.h)
  */
 
-#ifndef __ARCH_Z16F_IRQ_H
-#define __ARCH_Z16F_IRQ_H
+#ifndef __ARCH_Z16_INCLUDE_Z16F_IRQ_H
+#define __ARCH_Z16_INCLUDE_Z16F_IRQ_H
 
 /****************************************************************************
  * Included Files
@@ -50,7 +49,7 @@
 #endif
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Interrupt Vectors (excluding reset and sysexec which are handled differently) */
@@ -245,5 +244,5 @@ EXTERN void       irqrestore(irqstate_t flags);
 #endif
 #endif
 
-#endif /* __ARCH_Z16F_IRQ_H */
+#endif /* __ARCH_Z16_INCLUDE_Z16F_IRQ_H */
 
diff --git a/nuttx/arch/z16/src/common/up_arch.h b/nuttx/arch/z16/src/common/up_arch.h
new file mode 100644
index 000000000..be1f77d67
--- /dev/null
+++ b/nuttx/arch/z16/src/common/up_arch.h
@@ -0,0 +1,52 @@
+/************************************************************************************
+ * common/up_arch.h
+ *
+ *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * 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.
+ *
+ ************************************************************************************/
+
+#ifndef __ARCH_Z16_SRC_COMMON_UP_ARCH_H
+#define __ARCH_Z16_SRC_COMMON_UP_ARCH_H
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <arch/board/board.h>
+#include "chip/chip.h"
+
+/************************************************************************************
+ * Pre-processor Definitions
+ ************************************************************************************/
+
+#endif  /* __ARCH_Z16_SRC_COMMON_UP_ARCH_H */
diff --git a/nuttx/arch/z16/src/z16f/z16f_irq.c b/nuttx/arch/z16/src/z16f/z16f_irq.c
index 5c089d654..667f0a976 100644
--- a/nuttx/arch/z16/src/z16f/z16f_irq.c
+++ b/nuttx/arch/z16/src/z16f/z16f_irq.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * z16f/z16f_irq.c
+ * arch/z16/src/z16f/z16f_irq.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,8 @@
 
 #include <nuttx/config.h>
 
+#include <errno.h>
+
 #include <nuttx/irq.h>
 #include <arch/irq.h>
 
@@ -207,8 +209,10 @@ void up_maskack_irq(int irq)
  *
  ****************************************************************************/
 
-void up_prioritize_irq(int irq, int priority)
+int up_prioritize_irq(int irq, int priority)
 {
   /* To be provided */
+
+  return -ENOSYS;
 }