arch/z80/src: Rename up_doirq.c and up_internal.h to z80_doirq.c and z80_internal.h for better consistency with the naming conventions

2019-06-09 19:08:42 -06:00 · 2019-06-09 19:08:42 -06:00 · 495a648573
commit 495a648573
parent 0148124e33
82 changed files with 85 additions and 85 deletions
--- a/arch/z80/src/common/up_allocateheap.c
+++ b/arch/z80/src/common/up_allocateheap.c
@ -48,7 +48,7 @@
 #include <nuttx/mm/mm.h>

 #include "up_arch.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 #ifdef SDCC
 /* For the SDCC toolchain, the arch/z80/src/Makefile will parse the map file
--- a/arch/z80/src/common/up_assert.c
+++ b/arch/z80/src/common/up_assert.c
@ -54,7 +54,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "sched/sched.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/arch/z80/src/common/up_blocktask.c
+++ b/arch/z80/src/common/up_blocktask.c
@ -49,7 +49,7 @@
 #include "chip/switch.h"
 #include "sched/sched.h"
 #include "group/group.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Public Functions
--- a/arch/z80/src/common/up_createstack.c
+++ b/arch/z80/src/common/up_createstack.c
@ -49,7 +49,7 @@
 #include <nuttx/board.h>

 #include "up_arch.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Private Types
--- a/arch/z80/src/common/up_exit.c
+++ b/arch/z80/src/common/up_exit.c
@ -54,7 +54,7 @@
 #include "task/task.h"
 #include "sched/sched.h"
 #include "group/group.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/arch/z80/src/common/up_idle.c
+++ b/arch/z80/src/common/up_idle.c
@ -45,7 +45,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>

-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/arch/z80/src/common/up_initialize.c
+++ b/arch/z80/src/common/up_initialize.c
@ -61,7 +61,7 @@

 #include "chip/switch.h"
 #include "up_arch.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Public Functions
--- a/arch/z80/src/common/up_interruptcontext.c
+++ b/arch/z80/src/common/up_interruptcontext.c
@ -45,7 +45,7 @@
 #include <nuttx/irq.h>

 #include "chip/switch.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Private Types
--- a/arch/z80/src/common/up_puts.c
+++ b/arch/z80/src/common/up_puts.c
@ -40,7 +40,7 @@
 #include <nuttx/config.h>
 #include <nuttx/arch.h>

-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/arch/z80/src/common/up_releasepending.c
+++ b/arch/z80/src/common/up_releasepending.c
@ -49,7 +49,7 @@
 #include "chip/switch.h"
 #include "sched/sched.h"
 #include "group/group.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Public Functions
--- a/arch/z80/src/common/up_releasestack.c
+++ b/arch/z80/src/common/up_releasestack.c
@ -45,7 +45,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>

-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Private Types
--- a/arch/z80/src/common/up_reprioritizertr.c
+++ b/arch/z80/src/common/up_reprioritizertr.c
@ -51,7 +51,7 @@
 #include "chip/switch.h"
 #include "sched/sched.h"
 #include "group/group.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Public Functions
--- a/arch/z80/src/common/up_stackdump.c
+++ b/arch/z80/src/common/up_stackdump.c
@ -44,7 +44,7 @@

 #include "up_arch.h"
 #include "sched/sched.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 #ifdef CONFIG_ARCH_STACKDUMP

--- a/arch/z80/src/common/up_stackframe.c
+++ b/arch/z80/src/common/up_stackframe.c
@ -46,7 +46,7 @@

 #include <nuttx/arch.h>

-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Pre-processor Macros
--- a/arch/z80/src/common/up_unblocktask.c
+++ b/arch/z80/src/common/up_unblocktask.c
@ -50,7 +50,7 @@
 #include "sched/sched.h"
 #include "group/group.h"
 #include "clock/clock.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Public Functions
--- a/arch/z80/src/common/up_usestack.c
+++ b/arch/z80/src/common/up_usestack.c
@ -46,7 +46,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>

-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Private Types
--- a/arch/z80/src/common/z80_doirq.c
+++ b/arch/z80/src/common/z80_doirq.c
@ -50,7 +50,7 @@
 #include <arch/irq.h>

 #include "chip/switch.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 #include "group/group.h"

--- a/arch/z80/src/common/z80_internal.h
+++ b/arch/z80/src/common/z80_internal.h
@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/z80/src/common/up_internal.h
+ * arch/z80/src/common/z80_internal.h
 *
 *   Copyright (C) 2007-2009, 2015, 2017-2018 Gregory Nutt. All rights
 *     reserved.
@ -34,8 +34,8 @@
 *
 ****************************************************************************/

-#ifndef __ARCH_Z80_SRC_COMMON_UP_INTERNAL_H
-#define __ARCH_Z80_SRC_COMMON_UP_INTERNAL_H
+#ifndef __ARCH_Z80_SRC_COMMON_Z80_INTERNAL_H
+#define __ARCH_Z80_SRC_COMMON_Z80_INTERNAL_H

 /****************************************************************************
 * Included Files
@ -211,4 +211,4 @@ void up_stackdump(void);
 #endif
 #endif

-#endif  /* __ARCH_Z80_SRC_COMMON_UP_INTERNAL_H */
+#endif  /* __ARCH_Z80_SRC_COMMON_Z80_INTERNAL_H */
--- a/arch/z80/src/ez80/Make.defs
+++ b/arch/z80/src/ez80/Make.defs
@ -40,7 +40,7 @@ CMN_SSRCS  =
 CMN_CSRCS  = up_initialize.c up_allocateheap.c up_createstack.c
 CMN_CSRCS += up_releasestack.c up_interruptcontext.c up_blocktask.c
 CMN_CSRCS += up_unblocktask.c up_exit.c up_releasepending.c
-CMN_CSRCS += up_reprioritizertr.c up_idle.c up_assert.c up_doirq.c
+CMN_CSRCS += up_reprioritizertr.c up_idle.c up_assert.c z80_doirq.c
 CMN_CSRCS += up_mdelay.c up_stackframe.c up_udelay.c up_usestack.c
 CMN_CSRCS += up_puts.c

--- a/arch/z80/src/ez80/ez80_copystate.c
+++ b/arch/z80/src/ez80/ez80_copystate.c
@ -42,7 +42,7 @@
 #include <arch/irq.h>

 #include "chip/switch.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/arch/z80/src/ez80/ez80_emac.c
+++ b/arch/z80/src/ez80/ez80_emac.c
@ -69,7 +69,7 @@
 #include <arch/io.h>

 #include "chip.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/arch/z80/src/ez80/ez80_initialstate.c
+++ b/arch/z80/src/ez80/ez80_initialstate.c
@ -44,7 +44,7 @@
 #include <nuttx/arch.h>

 #include "chip.h"
-#include "up_internal.h"
+#include "z80_internal.h"
 #include "up_arch.h"

 /****************************************************************************
--- a/arch/z80/src/ez80/ez80_irq.c
+++ b/arch/z80/src/ez80/ez80_irq.c
@ -43,7 +43,7 @@
 #include <nuttx/irq.h>

 #include "chip/switch.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Public Data
--- a/arch/z80/src/ez80/ez80_lowuart.c
+++ b/arch/z80/src/ez80/ez80_lowuart.c
@ -47,7 +47,7 @@
 #include <nuttx/sched.h>

 #include "chip.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 #ifdef USE_LOWSERIALINIT

--- a/arch/z80/src/ez80/ez80_registerdump.c
+++ b/arch/z80/src/ez80/ez80_registerdump.c
@ -45,7 +45,7 @@
 #include <nuttx/arch.h>

 #include "chip/switch.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 #ifdef CONFIG_ARCH_STACKDUMP

--- a/arch/z80/src/ez80/ez80_rtc.h
+++ b/arch/z80/src/ez80/ez80_rtc.h
@ -179,7 +179,7 @@ int ez80_rtc_setalarm(FAR struct alm_setalarm_s *alminfo);
 *   Return the current alarm setting.
 *
 * Input Parameters:
- *  almtime - Location to retun the current alarm ime.
+ *  almtime - Location to return the current alarm time.
 *
 * Returned Value:
 *   Zero (OK) on success; a negated errno on failure
--- a/arch/z80/src/ez80/ez80_schedulesigaction.c
+++ b/arch/z80/src/ez80/ez80_schedulesigaction.c
@ -48,7 +48,7 @@

 #include "chip/switch.h"
 #include "sched/sched.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Private Functions
--- a/arch/z80/src/ez80/ez80_serial.c
+++ b/arch/z80/src/ez80/ez80_serial.c
@ -54,7 +54,7 @@
 #include <arch/io.h>

 #include "chip.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 #ifdef USE_SERIALDRIVER

--- a/arch/z80/src/ez80/ez80_sigdeliver.c
+++ b/arch/z80/src/ez80/ez80_sigdeliver.c
@ -52,7 +52,7 @@

 #include "chip/switch.h"
 #include "sched/sched.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Public Functions
--- a/arch/z80/src/ez80/ez80_spi.c
+++ b/arch/z80/src/ez80/ez80_spi.c
@ -50,7 +50,7 @@
 #include <nuttx/spi/spi.h>
 #include <arch/io.h>

-#include "up_internal.h"
+#include "z80_internal.h"
 #include "up_arch.h"

 #include "chip.h"
--- a/arch/z80/src/ez80/ez80_timerisr.c
+++ b/arch/z80/src/ez80/ez80_timerisr.c
@ -47,7 +47,7 @@

 #include "chip.h"
 #include "clock/clock.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Private Functions
--- a/arch/z80/src/ez80/switch.h
+++ b/arch/z80/src/ez80/switch.h
@ -44,7 +44,7 @@
 #  include <nuttx/sched.h>
 #  include <nuttx/arch.h>
 #endif
-#include "up_internal.h"
+#include "z80_internal.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/z80/src/z180/Make.defs
+++ b/arch/z80/src/z180/Make.defs
@ -43,7 +43,7 @@ endif

 CMN_ASRCS  =
 CMN_CSRCS  = up_allocateheap.c up_assert.c up_blocktask.c up_createstack.c
-CMN_CSRCS += up_doirq.c up_exit.c up_idle.c up_initialize.c
+CMN_CSRCS += z80_doirq.c up_exit.c up_idle.c up_initialize.c
 CMN_CSRCS += up_interruptcontext.c up_mdelay.c up_releasepending.c
 CMN_CSRCS += up_releasestack.c up_stackframe.c up_reprioritizertr.c
 CMN_CSRCS += up_unblocktask.c up_udelay.c up_usestack.c
--- a/arch/z80/src/z180/switch.h
+++ b/arch/z80/src/z180/switch.h
@ -47,7 +47,7 @@
 #include <arch/io.h>

 #include "z180_iomap.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/z80/src/z180/z180_config.h
+++ b/arch/z80/src/z180/z180_config.h
@ -44,7 +44,7 @@

 #include <arch/z180/chip.h>

-#include "up_internal.h"
+#include "z80_internal.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/z80/src/z180/z180_copystate.c
+++ b/arch/z80/src/z180/z180_copystate.c
@ -42,7 +42,7 @@
 #include <arch/irq.h>

 #include "chip/switch.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/arch/z80/src/z180/z180_initialstate.c
+++ b/arch/z80/src/z180/z180_initialstate.c
@ -43,7 +43,7 @@
 #include <nuttx/arch.h>

 #include "chip.h"
-#include "up_internal.h"
+#include "z80_internal.h"
 #include "up_arch.h"

 /****************************************************************************
--- a/arch/z80/src/z180/z180_io.c
+++ b/arch/z80/src/z180/z180_io.c
@ -41,7 +41,7 @@
 #include <nuttx/arch.h>
 /* #include <nuttx/irq.h> */

-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/arch/z80/src/z180/z180_irq.c
+++ b/arch/z80/src/z180/z180_irq.c
@ -48,7 +48,7 @@

 #include "switch.h"
 #include "z180_iomap.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Public Data
--- a/arch/z80/src/z180/z180_lowscc.c
+++ b/arch/z80/src/z180/z180_lowscc.c
@ -47,7 +47,7 @@
 #include <nuttx/sched.h>

 #include "chip.h"
-#include "common/up_internal.h"
+#include "common/z80_internal.h"
 #include "z180_config.h"

 #if defined(USE_LOWSERIALINIT) && defined(HAVE_SCC)
--- a/arch/z80/src/z180/z180_lowserial.c
+++ b/arch/z80/src/z180/z180_lowserial.c
@ -39,7 +39,7 @@

 #include <nuttx/config.h>

-#include "common/up_internal.h"
+#include "common/z80_internal.h"

 #include "z180_config.h"
 #include "z180_serial.h"
--- a/arch/z80/src/z180/z180_lowuart.c
+++ b/arch/z80/src/z180/z180_lowuart.c
@ -47,7 +47,7 @@
 #include <nuttx/sched.h>

 #include "chip.h"
-#include "common/up_internal.h"
+#include "common/z80_internal.h"
 #include "z180_config.h"

 #if defined(USE_LOWSERIALINIT) && defined(HAVE_UART)
--- a/arch/z80/src/z180/z180_mmu.c
+++ b/arch/z80/src/z180/z180_mmu.c
@ -50,7 +50,7 @@
 #include <arch/irq.h>
 #include <arch/io.h>

-#include "up_internal.h"
+#include "z80_internal.h"
 #include "z180_mmu.h"

 /****************************************************************************
--- a/arch/z80/src/z180/z180_mmu.h
+++ b/arch/z80/src/z180/z180_mmu.h
@ -138,7 +138,7 @@ void z180_mmu_lowinit(void) __naked;
 *
 * Description:
 *   Perform higher level initialization of the MMU and physical memory
- *   memory management logic.  More correctly prototypes in up_internal.h.
+ *   memory management logic.  More correctly prototypes in z80_internal.h.
 *
 ****************************************************************************/

--- a/arch/z80/src/z180/z180_registerdump.c
+++ b/arch/z80/src/z180/z180_registerdump.c
@ -45,7 +45,7 @@
 #include <nuttx/arch.h>

 #include "chip/switch.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 #ifdef CONFIG_ARCH_STACKDUMP

--- a/arch/z80/src/z180/z180_scc.c
+++ b/arch/z80/src/z180/z180_scc.c
@ -54,7 +54,7 @@
 #include <arch/io.h>

 #include "chip.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 #include "z180_config.h"
 #include "z180_serial.h"
--- a/arch/z80/src/z180/z180_schedulesigaction.c
+++ b/arch/z80/src/z180/z180_schedulesigaction.c
@ -51,7 +51,7 @@

 #include "switch.h"
 #include "sched/sched.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Private Functions
--- a/arch/z80/src/z180/z180_serial.h
+++ b/arch/z80/src/z180/z180_serial.h
@ -42,7 +42,7 @@

 #include <nuttx/config.h>

-#include "up_internal.h"
+#include "z80_internal.h"
 #include "z180_config.h"

 /****************************************************************************
--- a/arch/z80/src/z180/z180_sigdeliver.c
+++ b/arch/z80/src/z180/z180_sigdeliver.c
@ -48,7 +48,7 @@

 #include "chip/switch.h"
 #include "sched/sched.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Public Functions
--- a/arch/z80/src/z180/z180_timerisr.c
+++ b/arch/z80/src/z180/z180_timerisr.c
@ -46,7 +46,7 @@
 #include <arch/board/board.h>

 #include "clock/clock.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 #include "chip.h"

--- a/arch/z80/src/z8/Make.defs
+++ b/arch/z80/src/z8/Make.defs
@ -39,7 +39,7 @@ CMN_SSRCS  =
 CMN_CSRCS  = up_initialize.c up_allocateheap.c up_createstack.c
 CMN_CSRCS += up_releasestack.c up_interruptcontext.c up_blocktask.c
 CMN_CSRCS += up_unblocktask.c up_exit.c up_releasepending.c
-CMN_CSRCS += up_reprioritizertr.c up_idle.c up_assert.c up_doirq.c
+CMN_CSRCS += up_reprioritizertr.c up_idle.c up_assert.c z80_doirq.c
 CMN_CSRCS += up_mdelay.c up_stackframe.c up_udelay.c up_usestack.c

 CHIP_SSRCS  = z8_vector.S z8_saveusercontext.S z8_restorecontext.S
--- a/arch/z80/src/z8/switch.h
+++ b/arch/z80/src/z8/switch.h
@ -46,7 +46,7 @@
 #  include <nuttx/sched.h>
 #  include <nuttx/arch.h>
 #endif
-#include "up_internal.h"
+#include "z80_internal.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/z80/src/z8/z8_initialstate.c
+++ b/arch/z80/src/z8/z8_initialstate.c
@ -45,7 +45,7 @@
 #include <nuttx/sched.h>

 #include "chip.h"
-#include "up_internal.h"
+#include "z80_internal.h"
 #include "up_arch.h"

 /****************************************************************************
--- a/arch/z80/src/z8/z8_irq.c
+++ b/arch/z80/src/z8/z8_irq.c
@ -45,7 +45,7 @@
 #include <nuttx/irq.h>

 #include "chip/switch.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Public Data
--- a/arch/z80/src/z8/z8_lowuart.c
+++ b/arch/z80/src/z8/z8_lowuart.c
@ -47,7 +47,7 @@
 #include <nuttx/sched.h>

 #include "chip.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 #ifdef USE_LOWSERIALINIT

--- a/arch/z80/src/z8/z8_registerdump.c
+++ b/arch/z80/src/z8/z8_registerdump.c
@ -46,7 +46,7 @@
 #include <nuttx/arch.h>

 #include "chip/switch.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 #ifdef CONFIG_ARCH_STACKDUMP

--- a/arch/z80/src/z8/z8_saveirqcontext.c
+++ b/arch/z80/src/z8/z8_saveirqcontext.c
@ -43,7 +43,7 @@
 #include <arch/irq.h>

 #include "chip/switch.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/arch/z80/src/z8/z8_schedulesigaction.c
+++ b/arch/z80/src/z8/z8_schedulesigaction.c
@ -48,7 +48,7 @@

 #include "chip/switch.h"
 #include "sched/sched.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Private Functions
--- a/arch/z80/src/z8/z8_serial.c
+++ b/arch/z80/src/z8/z8_serial.c
@ -54,7 +54,7 @@
 #include <nuttx/serial/serial.h>

 #include "chip.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 #ifdef USE_SERIALDRIVER

--- a/arch/z80/src/z8/z8_sigdeliver.c
+++ b/arch/z80/src/z8/z8_sigdeliver.c
@ -49,7 +49,7 @@

 #include "chip/switch.h"
 #include "sched/sched.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Private Functions
--- a/arch/z80/src/z8/z8_timerisr.c
+++ b/arch/z80/src/z8/z8_timerisr.c
@ -47,7 +47,7 @@

 #include "chip.h"
 #include "clock/clock.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Public Functions
--- a/arch/z80/src/z80/Make.defs
+++ b/arch/z80/src/z80/Make.defs
@ -46,7 +46,7 @@ CMN_ASRCS  =
 CMN_CSRCS  = up_initialize.c up_allocateheap.c up_createstack.c
 CMN_CSRCS += up_releasestack.c up_interruptcontext.c up_blocktask.c
 CMN_CSRCS += up_unblocktask.c up_exit.c up_releasepending.c
-CMN_CSRCS += up_reprioritizertr.c up_idle.c up_assert.c up_doirq.c
+CMN_CSRCS += up_reprioritizertr.c up_idle.c up_assert.c z80_doirq.c
 CMN_CSRCS += up_mdelay.c up_stackframe.c up_udelay.c up_usestack.c

 CHIP_ASRCS  = z80_saveusercontext.asm z80_restoreusercontext.asm
--- a/arch/z80/src/z80/switch.h
+++ b/arch/z80/src/z80/switch.h
@ -43,7 +43,7 @@
 #include <nuttx/sched.h>
 #include <nuttx/arch.h>

-#include "up_internal.h"
+#include "z80_internal.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/z80/src/z80/z80_copystate.c
+++ b/arch/z80/src/z80/z80_copystate.c
@ -42,7 +42,7 @@
 #include <arch/irq.h>

 #include "chip/switch.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/arch/z80/src/z80/z80_initialstate.c
+++ b/arch/z80/src/z80/z80_initialstate.c
@ -43,7 +43,7 @@
 #include <nuttx/arch.h>

 #include "chip.h"
-#include "up_internal.h"
+#include "z80_internal.h"
 #include "up_arch.h"

 /****************************************************************************
--- a/arch/z80/src/z80/z80_io.c
+++ b/arch/z80/src/z80/z80_io.c
@ -41,7 +41,7 @@
 #include <nuttx/arch.h>
 /* #include <nuttx/irq.h> */

-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/arch/z80/src/z80/z80_irq.c
+++ b/arch/z80/src/z80/z80_irq.c
@ -43,7 +43,7 @@
 #include <nuttx/irq.h>

 #include "chip/switch.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Public Data
--- a/arch/z80/src/z80/z80_registerdump.c
+++ b/arch/z80/src/z80/z80_registerdump.c
@ -45,7 +45,7 @@
 #include <nuttx/arch.h>

 #include "chip/switch.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 #ifdef CONFIG_ARCH_STACKDUMP

--- a/arch/z80/src/z80/z80_schedulesigaction.c
+++ b/arch/z80/src/z80/z80_schedulesigaction.c
@ -49,7 +49,7 @@

 #include "chip/switch.h"
 #include "sched/sched.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Private Functions
--- a/arch/z80/src/z80/z80_sigdeliver.c
+++ b/arch/z80/src/z80/z80_sigdeliver.c
@ -49,7 +49,7 @@

 #include "chip/switch.h"
 #include "sched/sched.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Public Functions
--- a/configs/ez80f910200kitg/src/ez80_leds.c
+++ b/configs/ez80f910200kitg/src/ez80_leds.c
@ -42,7 +42,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>

-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/configs/ez80f910200zco/src/ez80_buttons.c
+++ b/configs/ez80f910200zco/src/ez80_buttons.c
@ -46,7 +46,7 @@

 #include "chip.h"
 #include "up_arch.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/configs/ez80f910200zco/src/ez80_leds.c
+++ b/configs/ez80f910200zco/src/ez80_leds.c
@ -45,7 +45,7 @@
 #include <arch/board/board.h>

 #include "ez80f910200zco.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/configs/makerlisp/src/ez80_boot.c
+++ b/configs/makerlisp/src/ez80_boot.c
@ -48,7 +48,7 @@
 #include <arch/chip/io.h>

 #include "chip.h"
-#include "up_internal.h"
+#include "z80_internal.h"
 #include "makerlisp.h"

 /****************************************************************************
--- a/configs/makerlisp/src/ez80_leds.c
+++ b/configs/makerlisp/src/ez80_leds.c
@ -57,7 +57,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>

-#include "up_internal.h"
+#include "z80_internal.h"
 #include "makerlisp.h"

 #ifdef CONFIG_ARCH_LEDS
--- a/configs/makerlisp/src/ez80_spi.c
+++ b/configs/makerlisp/src/ez80_spi.c
@ -43,7 +43,7 @@
 #include <arch/chip/io.h>

 #include "chip.h"
-#include "up_internal.h"
+#include "z80_internal.h"
 #include "ez80f91_spi.h"
 #include "makerlisp.h"

--- a/configs/z80sim/src/z80_irq.c
+++ b/configs/z80sim/src/z80_irq.c
@ -42,7 +42,7 @@
 #include <nuttx/irq.h>

 #include "up_arch.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Public Function Prototypes
--- a/configs/z80sim/src/z80_lowputc.c
+++ b/configs/z80sim/src/z80_lowputc.c
@ -44,7 +44,7 @@
 #include <assert.h>
 #include <debug.h>

-#include "up_internal.h"
+#include "z80_internal.h"

 /********************************************************************************
 * Pre-processor Definitions
--- a/configs/z80sim/src/z80_serial.c
+++ b/configs/z80sim/src/z80_serial.c
@ -52,7 +52,7 @@
 #include <nuttx/serial/serial.h>

 #include "up_arch.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 #ifdef USE_SERIALDRIVER

--- a/configs/z80sim/src/z80_timerisr.c
+++ b/configs/z80sim/src/z80_timerisr.c
@ -44,7 +44,7 @@
 #include <nuttx/arch.h>

 #include "clock/clock.h"
-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Public Functions
--- a/configs/z8encore000zco/src/z8_leds.c
+++ b/configs/z8encore000zco/src/z8_leds.c
@ -52,7 +52,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>

-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/configs/z8f64200100kit/src/z8_leds.c
+++ b/configs/z8f64200100kit/src/z8_leds.c
@ -42,7 +42,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>

-#include "up_internal.h"
+#include "z80_internal.h"

 /****************************************************************************
 * Pre-processor Definitions