sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some ZDS-II compile errors

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@554 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2008-01-11 22:40:09 +00:00
parent 0d102fa42e
commit b07eb44e4e
18 changed files with 58 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/z16/src/Makefile
View File

@ -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)

2
arch/z16/src/common/up_allocateheap.c
View File

@ -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"

3
arch/z16/src/common/up_assert.c
View File

@ -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"

5
arch/z16/src/common/up_createstack.c
View File

@ -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"
/****************************************************************************

4
arch/z16/src/common/up_doirq.c
View File

@ -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"

2
arch/z16/src/common/up_exit.c
View File

@ -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"

1
arch/z16/src/common/up_initialstate.c
View File

@ -45,7 +45,6 @@
#include "chip/chip.h"
#include "up_internal.h"
#include "up_arch.h"
/****************************************************************************
* Private Definitions

2
arch/z16/src/common/up_internal.h
View File

@ -41,7 +41,7 @@
****************************************************************************/
#include <arch/irq.h>
#include <chip/chip.h>
#include "chip/chip.h"
/****************************************************************************
* Definitions

2
arch/z16/src/common/up_releasepending.c
View File

@ -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"

2
arch/z16/src/common/up_reprioritizertr.c
View File

@ -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"

2
arch/z16/src/common/up_stackdump.c
View File

@ -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"

2
arch/z16/src/common/up_unblocktask.c
View File

@ -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"

12
arch/z16/src/z16f/chip.h
View File

@ -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 */

30
arch/z16/src/z16f/z16f_head.S
View File

@ -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

4
arch/z16/src/z16f/z16f_lowuart.S
View File

@ -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 */

2
arch/z16/src/z16f/z16f_timerisr.c
View File

@ -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"

4
configs/z16f2800100zcog/src/Makefile
View File

@ -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)

2
configs/z16f2800100zcog/src/z16f_lowinit.c
View File

@ -39,6 +39,8 @@
* Included Files
***************************************************************************/
#include "chip/chip.h"
/***************************************************************************
* Definitions
***************************************************************************/