Fix some ZDS-II compile errors

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@554 7fd9a85b-ad96-42d3-883c-3090e2eb8679
2008-01-11 22:40:09 +00:00 · 2008-01-11 22:40:09 +00:00 · ef0de06cdb
parent a593295150
commit ef0de06cdb
18 changed files with 58 additions and 25 deletions
--- a/nuttx/arch/z16/src/Makefile
+++ b/nuttx/arch/z16/src/Makefile
@ -38,7 +38,7 @@

 ARCHSRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
 WARCHSRCDIR	= ${shell cygpath -w $(ARCHSRCDIR)}
-USRINCLUDES	= -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR)\chip;$(WARCHSRCDIR)\common'
+USRINCLUDES	= -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common'
 INCLUDES	= $(ARCHSTDINCLUDES) $(USRINCLUDES)
 CFLAGS		= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES)
 CPPFLAGS	+= -I$(ARCHSRCDIR)
--- a/nuttx/arch/z16/src/common/up_allocateheap.c
+++ b/nuttx/arch/z16/src/common/up_allocateheap.c
@ -44,7 +44,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/mm.h>

-#include "up_arch.h"
+#include "chip/chip.h"
 #include "up_internal.h"
 #include "up_mem.h"

--- a/nuttx/arch/z16/src/common/up_assert.c
+++ b/nuttx/arch/z16/src/common/up_assert.c
@ -46,9 +46,8 @@

 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <chip/chip.h>

-#include "up_arch.h"
+#include "chip/chip.h"
 #include "os_internal.h"
 #include "up_internal.h"
 #include "up_mem.h"
--- a/nuttx/arch/z16/src/common/up_createstack.c
+++ b/nuttx/arch/z16/src/common/up_createstack.c
@ -38,12 +38,15 @@
 ****************************************************************************/

 #include <nuttx/config.h>
+
 #include <sys/types.h>
 #include <sched.h>
 #include <debug.h>
+
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
-#include "up_arch.h"
+
+#include "chip/chip.h"
 #include "up_internal.h"

 /****************************************************************************
--- a/nuttx/arch/z16/src/common/up_doirq.c
+++ b/nuttx/arch/z16/src/common/up_doirq.c
@ -38,11 +38,13 @@
 ****************************************************************************/

 #include <nuttx/config.h>
+
 #include <sys/types.h>
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <assert.h>
-#include "up_arch.h"
+
+#include "chip/chip.h"
 #include "os_internal.h"
 #include "up_internal.h"

--- a/nuttx/arch/z16/src/common/up_exit.c
+++ b/nuttx/arch/z16/src/common/up_exit.c
@ -44,8 +44,8 @@
 #include <debug.h>

 #include <nuttx/arch.h>
-#include <chip/chip.h>

+#include "chip/chip.h"
 #include "os_internal.h"
 #include "up_internal.h"

--- a/nuttx/arch/z16/src/common/up_initialstate.c
+++ b/nuttx/arch/z16/src/common/up_initialstate.c
@ -45,7 +45,6 @@

 #include "chip/chip.h"
 #include "up_internal.h"
-#include "up_arch.h"

 /****************************************************************************
 * Private Definitions
--- a/nuttx/arch/z16/src/common/up_internal.h
+++ b/nuttx/arch/z16/src/common/up_internal.h
@ -41,7 +41,7 @@
 ****************************************************************************/

 #include <arch/irq.h>
-#include <chip/chip.h>
+#include "chip/chip.h"

 /****************************************************************************
 * Definitions
--- a/nuttx/arch/z16/src/common/up_releasepending.c
+++ b/nuttx/arch/z16/src/common/up_releasepending.c
@ -44,8 +44,8 @@
 #include <debug.h>

 #include <nuttx/arch.h>
-#include <chip/chip.h>

+#include "chip/chip.h"
 #include "os_internal.h"
 #include "up_internal.h"

--- a/nuttx/arch/z16/src/common/up_reprioritizertr.c
+++ b/nuttx/arch/z16/src/common/up_reprioritizertr.c
@ -44,8 +44,8 @@
 #include <debug.h>

 #include <nuttx/arch.h>
-#include <chip/chip.h>

+#include "chip/chip.h"
 #include "os_internal.h"
 #include "up_internal.h"

--- a/nuttx/arch/z16/src/common/up_stackdump.c
+++ b/nuttx/arch/z16/src/common/up_stackdump.c
@ -42,7 +42,7 @@
 #include <sys/types.h>
 #include <debug.h>

-#include "up_arch.h"
+#include "chip/chip.h"
 #include "os_internal.h"
 #include "up_internal.h"

--- a/nuttx/arch/z16/src/common/up_unblocktask.c
+++ b/nuttx/arch/z16/src/common/up_unblocktask.c
@ -44,8 +44,8 @@
 #include <debug.h>

 #include <nuttx/arch.h>
-#include <chip/chip.h>

+#include "chip/chip.h"
 #include "os_internal.h"
 #include "clock_internal.h"
 #include "up_internal.h"
--- a/nuttx/arch/z16/src/z16f/chip.h
+++ b/nuttx/arch/z16/src/z16f/chip.h
@ -403,12 +403,12 @@
                                                /* Bits 1-2: PW mode */
 #define Z16F_TIMERCTL0_NODELAY   _HZ8(00)       /*    No delay */
 #define Z16F_TIMERCTL0_DELAY2    _HZ8(01)       /*      2 cycle delay */
-#define Z16F_TIMERCTL0_DELAY2    _HZ8(02)       /*      4 cycle delay */
-#define Z16F_TIMERCTL0_DELAY2    _HZ8(03)       /*      8 cycle delay */
-#define Z16F_TIMERCTL0_DELAY2    _HZ8(04)       /*     16 cycle delay */
-#define Z16F_TIMERCTL0_DELAY2    _HZ8(05)       /*     32 cycle delay */
-#define Z16F_TIMERCTL0_DELAY2    _HZ8(06)       /*     64 cycle delay */
-#define Z16F_TIMERCTL0_DELAY2    _HZ8(07)       /*    128 cycle delay */
+#define Z16F_TIMERCTL0_DELAY4    _HZ8(02)       /*      4 cycle delay */
+#define Z16F_TIMERCTL0_DELAY8    _HZ8(03)       /*      8 cycle delay */
+#define Z16F_TIMERCTL0_DELAY16   _HZ8(04)       /*     16 cycle delay */
+#define Z16F_TIMERCTL0_DELAY32   _HZ8(05)       /*     32 cycle delay */
+#define Z16F_TIMERCTL0_DELAY64   _HZ8(06)       /*     64 cycle delay */
+#define Z16F_TIMERCTL0_DELAY128  _HZ8(07)       /*    128 cycle delay */

 #define Z16F_TIMERCTL1_TEN       _HX8(80)       /* Bit 7: Timer enable */
 #define Z16F_TIMERCTL1_TPOL      _HX8(40)       /* Bit 6: Input output polarity */
--- a/nuttx/arch/z16/src/z16f/z16f_head.S
+++ b/nuttx/arch/z16/src/z16f/z16f_head.S
@ -45,9 +45,37 @@
 **************************************************************************/

 	xref _z16f_lowinit:EROM
+#if defined(CONFIG_ARCH_LOWPUTC) || defined(CONFIG_ARCH_LOWGETC)
+	xref _z16f_lowuartinit:EROM
+#endif
 	xref _os_start:EROM
-	xdef _default_handler
 	xdef _reset
+	xdef _sysexc_isr
+	xdef _timer2_isr
+	xdef _timer1_isr
+	xdef _timer0_isr
+	xdef _uart0rx_isr
+	xdef _uart0tx_isr
+	xdef _i2c_isr
+	xdef _spi_isr
+	xdef _adc_isr
+	xdef _p7ad_isr
+	xdef _p6ad_isr
+	xdef _p5ad_isr
+	xdef _p4ad_isr
+	xdef _p3ad_isr
+	xdef _p2ad_isr
+	xdef _p1ad_isr
+	xdef _p0ad_isr
+	xdef _pwmtimer_isr
+	xdef _uart1rx_isr
+	xdef _uart1tx_isr
+	xdef _pwmfault_isr
+	xdef _c3_isr
+	xdef _c2_isr
+	xdef _c1_isr
+	xdef _c0_isr
+	xdef _common_isr
 
 /**************************************************************************
 * Flash Option Byte Setup
--- a/nuttx/arch/z16/src/z16f/z16f_lowuart.S
+++ b/nuttx/arch/z16/src/z16f/z16f_lowuart.S
@ -39,7 +39,7 @@
 *************************************************************************/

 #include <nuttx/config.h>
-#include <chip/chip.h>
+#include "chip/chip.h"

 #if defined(CONFIG_ARCH_LOWPUTC) || defined(CONFIG_ARCH_LOWGETC)

@ -104,7 +104,7 @@ z16f_lowuartinit:
 	ld	r0, #%30
 	or.b	Z16F_GPIOA_AFL, r0	/* Z16F_GPIOA_AFL |= %30 */
 	clr.b	Z16F_UART0_CTL1 	/* Z16F_UART0_CTL1 = 0 */
-	ld	0, #%c0
+	ld	r0, #%c0
 	ld.b	Z16F_UART0_CTL0, r0	/* Z16F_UART0_CTL0 = %c0 */
 #else
 	ld.w	Z16F_UART1_BR, r0	/* Z16F_UART1_BR = BRG */
--- a/nuttx/arch/z16/src/z16f/z16f_timerisr.c
+++ b/nuttx/arch/z16/src/z16f/z16f_timerisr.c
@ -43,8 +43,8 @@
 #include <debug.h>

 #include <nuttx/arch.h>
-#include <chip/chip.h>

+#include "chip/chip.h"
 #include "clock_internal.h"
 #include "up_internal.h"

--- a/nuttx/configs/z16f2800100zcog/src/Makefile
+++ b/nuttx/configs/z16f2800100zcog/src/Makefile
@ -37,13 +37,13 @@

 ARCHSRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
 WARCHSRCDIR	= ${shell cygpath -w $(ARCHSRCDIR)}
-USRINCLUDES	= -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR)\chip;$(WARCHSRCDIR)\common'
+USRINCLUDES	= -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)/common'
 INCLUDES	= $(ARCHSTDINCLUDES) $(USRINCLUDES)
 CFLAGS		= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES)

 ASRCS		= 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
-CSRCS		= z16_lowinit.c
+CSRCS		= z16f_lowinit.c
 COBJS		= $(CSRCS:.c=$(OBJEXT))

 SRCS		= $(ASRCS) $(CSRCS)
--- a/nuttx/configs/z16f2800100zcog/src/z16f_lowinit.c
+++ b/nuttx/configs/z16f2800100zcog/src/z16f_lowinit.c
@ -39,6 +39,8 @@
 * Included Files
 ***************************************************************************/

+#include "chip/chip.h"
+
 /***************************************************************************
 * Definitions
 ***************************************************************************/