diff options
-rw-r--r-- | nuttx/TODO | 7 | ||||
-rw-r--r-- | nuttx/arch/z80/src/common/up_doirq.c | 2 | ||||
-rwxr-xr-x | nuttx/arch/z80/src/z8/z8_restorecontext.S | 7 | ||||
-rw-r--r-- | nuttx/configs/z8encore000zco/ostest/defconfig | 12 | ||||
-rw-r--r-- | nuttx/configs/z8encore000zco/ostest/ostest.zdsproj (renamed from nuttx/configs/z8encore000zco/ostest/ostest.zfpproj) | 0 |
5 files changed, 18 insertions, 10 deletions
diff --git a/nuttx/TODO b/nuttx/TODO index 67bb7943f..89f406389 100644 --- a/nuttx/TODO +++ b/nuttx/TODO @@ -20,7 +20,7 @@ NuttX TODO List (Last updated February 13, 2008) (1) ARM/DM320 (arch/arm/src/dm320/) (2) ARM/LPC214x (arch/arm/src/lpc214x/) (4) pjrc-8052 / MCS51 (arch/pjrc-8051/) - (5) z80/z8 (arch/z80/) + (6) z80/z8 (arch/z80/) (7) z16 (arch/z16/) o Task/Scheduler (sched/) @@ -401,6 +401,11 @@ o z80/z8 (arch/z80) Status: Open Priority: Low + Description: The z8Encore! port has only been verified on the ZDS-II instruction + set simulator. + Status: Open + Priority: Medium + o z16 (arch/z16) ^^^^^^^^^^^^^^^^ diff --git a/nuttx/arch/z80/src/common/up_doirq.c b/nuttx/arch/z80/src/common/up_doirq.c index 951dedc04..fae0142eb 100644 --- a/nuttx/arch/z80/src/common/up_doirq.c +++ b/nuttx/arch/z80/src/common/up_doirq.c @@ -96,7 +96,7 @@ FAR chipreg_t *up_doirq(ubyte irq, FAR chipreg_t *regs) regs = IRQ_STATE(); - /* Indicate that we are no long in interrupt processing logic */ + /* Indicate that we are no longer in interrupt processing logic */ IRQ_LEAVE(irq); } diff --git a/nuttx/arch/z80/src/z8/z8_restorecontext.S b/nuttx/arch/z80/src/z8/z8_restorecontext.S index ef22b10e4..4cdd0d3d0 100755 --- a/nuttx/arch/z80/src/z8/z8_restorecontext.S +++ b/nuttx/arch/z80/src/z8/z8_restorecontext.S @@ -97,8 +97,7 @@ _z8_restorecontext: ldx r7, 3(rr0)
/* Copy all registers into the user register area. NOTE: we
- * should use the saved RP value to determine the destination
- * address
+ * use the saved RP value to determine the destination adress.
*/
clr r0 /* rr0 = destination address */
@@ -130,8 +129,8 @@ _z8_restore: /* Recover the flags and RP settings.. but don't restore them yet */
- ldx r1, XCPT_FLAGS_OFFS(rr0)
- ldx r2, XCPT_RP_OFFS(rr0)
+ ldx r1, XCPT_FLAGS_OFFS(rr6)
+ ldx r2, XCPT_RP_OFFS(rr6)
/* Determine whether interrupts must be enabled on return. This
* would be nicer to do below, but later we will need to preserve
diff --git a/nuttx/configs/z8encore000zco/ostest/defconfig b/nuttx/configs/z8encore000zco/ostest/defconfig index 2b5500295..0725f16ec 100644 --- a/nuttx/configs/z8encore000zco/ostest/defconfig +++ b/nuttx/configs/z8encore000zco/ostest/defconfig @@ -311,11 +311,15 @@ CONFIG_NET_DHCP_LIGHT=n CONFIG_NET_RESOLV_ENTRIES=4 # +# Settings for examples/ostest +CONFIG_OSTEST_STACKSIZE=256 + +# # Settings for examples/nsh CONFIG_EXAMPLES_NSH_TELNET=n CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512 CONFIG_EXAMPLES_NSH_CMD_SIZE=40 -CONFIG_EXAMPLES_NSH_STACKSIZE=4096 +CONFIG_EXAMPLES_NSH_STACKSIZE=512 CONFIG_EXAMPLES_NSH_DHCPC=n CONFIG_EXAMPLES_NSH_NOMAC=n CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2) @@ -338,8 +342,8 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0) # CONFIG_BOOT_FROM_FLASH=n CONFIG_CUSTOM_STACK=n -CONFIG_PROC_STACK_SIZE=1024 -CONFIG_PTHREAD_STACK_MIN=256 -CONFIG_PTHREAD_STACK_DEFAULT=1024 +CONFIG_PROC_STACK_SIZE=256 +CONFIG_PTHREAD_STACK_MIN=128 +CONFIG_PTHREAD_STACK_DEFAULT=256 CONFIG_HEAP_SIZE= CONFIG_HEAP_BASE= diff --git a/nuttx/configs/z8encore000zco/ostest/ostest.zfpproj b/nuttx/configs/z8encore000zco/ostest/ostest.zdsproj index d46a19859..d46a19859 100644 --- a/nuttx/configs/z8encore000zco/ostest/ostest.zfpproj +++ b/nuttx/configs/z8encore000zco/ostest/ostest.zdsproj |