summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nuttx/arch/z16/src/Makefile2
-rw-r--r--nuttx/arch/z16/src/common/up_allocateheap.c2
-rw-r--r--nuttx/arch/z16/src/common/up_assert.c3
-rw-r--r--nuttx/arch/z16/src/common/up_createstack.c5
-rw-r--r--nuttx/arch/z16/src/common/up_doirq.c4
-rw-r--r--nuttx/arch/z16/src/common/up_exit.c2
-rw-r--r--nuttx/arch/z16/src/common/up_initialstate.c1
-rw-r--r--nuttx/arch/z16/src/common/up_internal.h2
-rw-r--r--nuttx/arch/z16/src/common/up_releasepending.c2
-rw-r--r--nuttx/arch/z16/src/common/up_reprioritizertr.c2
-rw-r--r--nuttx/arch/z16/src/common/up_stackdump.c2
-rw-r--r--nuttx/arch/z16/src/common/up_unblocktask.c2
-rw-r--r--nuttx/arch/z16/src/z16f/chip.h12
-rwxr-xr-xnuttx/arch/z16/src/z16f/z16f_head.S30
-rwxr-xr-xnuttx/arch/z16/src/z16f/z16f_lowuart.S4
-rw-r--r--nuttx/arch/z16/src/z16f/z16f_timerisr.c2
-rw-r--r--nuttx/configs/z16f2800100zcog/src/Makefile4
-rw-r--r--nuttx/configs/z16f2800100zcog/src/z16f_lowinit.c2
18 files changed, 58 insertions, 25 deletions
diff --git a/nuttx/arch/z16/src/Makefile b/nuttx/arch/z16/src/Makefile
index e900db026..31b5671cd 100644
--- 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)
diff --git a/nuttx/arch/z16/src/common/up_allocateheap.c b/nuttx/arch/z16/src/common/up_allocateheap.c
index 28205ecd7..a73515ac2 100644
--- 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"
diff --git a/nuttx/arch/z16/src/common/up_assert.c b/nuttx/arch/z16/src/common/up_assert.c
index d0e89fded..4f6b900af 100644
--- 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"
diff --git a/nuttx/arch/z16/src/common/up_createstack.c b/nuttx/arch/z16/src/common/up_createstack.c
index 7528b0af2..7b731bf62 100644
--- 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"
/****************************************************************************
diff --git a/nuttx/arch/z16/src/common/up_doirq.c b/nuttx/arch/z16/src/common/up_doirq.c
index 6771006db..fab038411 100644
--- 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"
diff --git a/nuttx/arch/z16/src/common/up_exit.c b/nuttx/arch/z16/src/common/up_exit.c
index 8838603bb..52a9b148b 100644
--- 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"
diff --git a/nuttx/arch/z16/src/common/up_initialstate.c b/nuttx/arch/z16/src/common/up_initialstate.c
index 493df1fa3..4a7c49a2b 100644
--- 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
diff --git a/nuttx/arch/z16/src/common/up_internal.h b/nuttx/arch/z16/src/common/up_internal.h
index 28e4ed2e2..a218a5e35 100644
--- 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
diff --git a/nuttx/arch/z16/src/common/up_releasepending.c b/nuttx/arch/z16/src/common/up_releasepending.c
index 13586a7ba..699b61997 100644
--- 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"
diff --git a/nuttx/arch/z16/src/common/up_reprioritizertr.c b/nuttx/arch/z16/src/common/up_reprioritizertr.c
index 5caf2d8ef..d8ef42ddd 100644
--- 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"
diff --git a/nuttx/arch/z16/src/common/up_stackdump.c b/nuttx/arch/z16/src/common/up_stackdump.c
index 482f7bf1b..515e3c30b 100644
--- 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"
diff --git a/nuttx/arch/z16/src/common/up_unblocktask.c b/nuttx/arch/z16/src/common/up_unblocktask.c
index b67886b8c..56cb6bde2 100644
--- 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"
diff --git a/nuttx/arch/z16/src/z16f/chip.h b/nuttx/arch/z16/src/z16f/chip.h
index 64124008e..2c439d1b0 100644
--- 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 */
diff --git a/nuttx/arch/z16/src/z16f/z16f_head.S b/nuttx/arch/z16/src/z16f/z16f_head.S
index 24238be2e..1a35e4064 100755
--- 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
diff --git a/nuttx/arch/z16/src/z16f/z16f_lowuart.S b/nuttx/arch/z16/src/z16f/z16f_lowuart.S
index 20c4fc35a..628dad431 100755
--- 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 */
diff --git a/nuttx/arch/z16/src/z16f/z16f_timerisr.c b/nuttx/arch/z16/src/z16f/z16f_timerisr.c
index 12925b933..78d1b51d2 100644
--- 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"
diff --git a/nuttx/configs/z16f2800100zcog/src/Makefile b/nuttx/configs/z16f2800100zcog/src/Makefile
index 0de50c802..85997d0bd 100644
--- 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)
diff --git a/nuttx/configs/z16f2800100zcog/src/z16f_lowinit.c b/nuttx/configs/z16f2800100zcog/src/z16f_lowinit.c
index 258cb4630..71744134c 100644
--- 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
***************************************************************************/
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-17 23:05:55 +0000