From 495a6485730750f3e33e393564359d1cd14e1a24 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 9 Jun 2019 19:08:42 -0600 Subject: [PATCH] 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 --- arch/z80/src/common/up_allocateheap.c | 2 +- arch/z80/src/common/up_assert.c | 2 +- arch/z80/src/common/up_blocktask.c | 2 +- arch/z80/src/common/up_createstack.c | 2 +- arch/z80/src/common/up_exit.c | 2 +- arch/z80/src/common/up_idle.c | 2 +- arch/z80/src/common/up_initialize.c | 2 +- arch/z80/src/common/up_interruptcontext.c | 2 +- arch/z80/src/common/up_puts.c | 2 +- arch/z80/src/common/up_releasepending.c | 2 +- arch/z80/src/common/up_releasestack.c | 2 +- arch/z80/src/common/up_reprioritizertr.c | 2 +- arch/z80/src/common/up_stackdump.c | 2 +- arch/z80/src/common/up_stackframe.c | 2 +- arch/z80/src/common/up_unblocktask.c | 2 +- arch/z80/src/common/up_usestack.c | 2 +- arch/z80/src/common/{up_doirq.c => z80_doirq.c} | 2 +- arch/z80/src/common/{up_internal.h => z80_internal.h} | 8 ++++---- arch/z80/src/ez80/Make.defs | 2 +- arch/z80/src/ez80/ez80_copystate.c | 2 +- arch/z80/src/ez80/ez80_emac.c | 2 +- arch/z80/src/ez80/ez80_initialstate.c | 2 +- arch/z80/src/ez80/ez80_irq.c | 2 +- arch/z80/src/ez80/ez80_lowuart.c | 2 +- arch/z80/src/ez80/ez80_registerdump.c | 2 +- arch/z80/src/ez80/ez80_rtc.h | 2 +- arch/z80/src/ez80/ez80_schedulesigaction.c | 2 +- arch/z80/src/ez80/ez80_serial.c | 2 +- arch/z80/src/ez80/ez80_sigdeliver.c | 2 +- arch/z80/src/ez80/ez80_spi.c | 2 +- arch/z80/src/ez80/ez80_timerisr.c | 2 +- arch/z80/src/ez80/switch.h | 2 +- arch/z80/src/z180/Make.defs | 2 +- arch/z80/src/z180/switch.h | 2 +- arch/z80/src/z180/z180_config.h | 2 +- arch/z80/src/z180/z180_copystate.c | 2 +- arch/z80/src/z180/z180_initialstate.c | 2 +- arch/z80/src/z180/z180_io.c | 2 +- arch/z80/src/z180/z180_irq.c | 2 +- arch/z80/src/z180/z180_lowscc.c | 2 +- arch/z80/src/z180/z180_lowserial.c | 2 +- arch/z80/src/z180/z180_lowuart.c | 2 +- arch/z80/src/z180/z180_mmu.c | 2 +- arch/z80/src/z180/z180_mmu.h | 2 +- arch/z80/src/z180/z180_registerdump.c | 2 +- arch/z80/src/z180/z180_scc.c | 2 +- arch/z80/src/z180/z180_schedulesigaction.c | 2 +- arch/z80/src/z180/z180_serial.h | 2 +- arch/z80/src/z180/z180_sigdeliver.c | 2 +- arch/z80/src/z180/z180_timerisr.c | 2 +- arch/z80/src/z8/Make.defs | 2 +- arch/z80/src/z8/switch.h | 2 +- arch/z80/src/z8/z8_initialstate.c | 2 +- arch/z80/src/z8/z8_irq.c | 2 +- arch/z80/src/z8/z8_lowuart.c | 2 +- arch/z80/src/z8/z8_registerdump.c | 2 +- arch/z80/src/z8/z8_saveirqcontext.c | 2 +- arch/z80/src/z8/z8_schedulesigaction.c | 2 +- arch/z80/src/z8/z8_serial.c | 2 +- arch/z80/src/z8/z8_sigdeliver.c | 2 +- arch/z80/src/z8/z8_timerisr.c | 2 +- arch/z80/src/z80/Make.defs | 2 +- arch/z80/src/z80/switch.h | 2 +- arch/z80/src/z80/z80_copystate.c | 2 +- arch/z80/src/z80/z80_initialstate.c | 2 +- arch/z80/src/z80/z80_io.c | 2 +- arch/z80/src/z80/z80_irq.c | 2 +- arch/z80/src/z80/z80_registerdump.c | 2 +- arch/z80/src/z80/z80_schedulesigaction.c | 2 +- arch/z80/src/z80/z80_sigdeliver.c | 2 +- configs/ez80f910200kitg/src/ez80_leds.c | 2 +- configs/ez80f910200zco/src/ez80_buttons.c | 2 +- configs/ez80f910200zco/src/ez80_leds.c | 2 +- configs/makerlisp/src/ez80_boot.c | 2 +- configs/makerlisp/src/ez80_leds.c | 2 +- configs/makerlisp/src/ez80_spi.c | 2 +- configs/z80sim/src/z80_irq.c | 2 +- configs/z80sim/src/z80_lowputc.c | 2 +- configs/z80sim/src/z80_serial.c | 2 +- configs/z80sim/src/z80_timerisr.c | 2 +- configs/z8encore000zco/src/z8_leds.c | 2 +- configs/z8f64200100kit/src/z8_leds.c | 2 +- 82 files changed, 85 insertions(+), 85 deletions(-) rename arch/z80/src/common/{up_doirq.c => z80_doirq.c} (99%) rename arch/z80/src/common/{up_internal.h => z80_internal.h} (97%) diff --git a/arch/z80/src/common/up_allocateheap.c b/arch/z80/src/common/up_allocateheap.c index d949f7ffe9..007a4afb53 100644 --- a/arch/z80/src/common/up_allocateheap.c +++ b/arch/z80/src/common/up_allocateheap.c @@ -48,7 +48,7 @@ #include #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 diff --git a/arch/z80/src/common/up_assert.c b/arch/z80/src/common/up_assert.c index 9c7a9c758a..6fbfc266a9 100644 --- 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 diff --git a/arch/z80/src/common/up_blocktask.c b/arch/z80/src/common/up_blocktask.c index 068a03cf01..90bf5b3d3f 100644 --- 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 diff --git a/arch/z80/src/common/up_createstack.c b/arch/z80/src/common/up_createstack.c index 388cfb184d..d85acc0303 100644 --- a/arch/z80/src/common/up_createstack.c +++ b/arch/z80/src/common/up_createstack.c @@ -49,7 +49,7 @@ #include #include "up_arch.h" -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Private Types diff --git a/arch/z80/src/common/up_exit.c b/arch/z80/src/common/up_exit.c index 250de67605..dd240f61b3 100644 --- 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 diff --git a/arch/z80/src/common/up_idle.c b/arch/z80/src/common/up_idle.c index bf5b54f754..df11aba5d0 100644 --- a/arch/z80/src/common/up_idle.c +++ b/arch/z80/src/common/up_idle.c @@ -45,7 +45,7 @@ #include #include -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c index e61dcc489c..b70c871e6d 100644 --- 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 diff --git a/arch/z80/src/common/up_interruptcontext.c b/arch/z80/src/common/up_interruptcontext.c index fc92512894..30a2cca4c9 100644 --- a/arch/z80/src/common/up_interruptcontext.c +++ b/arch/z80/src/common/up_interruptcontext.c @@ -45,7 +45,7 @@ #include #include "chip/switch.h" -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Private Types diff --git a/arch/z80/src/common/up_puts.c b/arch/z80/src/common/up_puts.c index bab4a0f9c3..3ae39aa7de 100644 --- a/arch/z80/src/common/up_puts.c +++ b/arch/z80/src/common/up_puts.c @@ -40,7 +40,7 @@ #include #include -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/z80/src/common/up_releasepending.c b/arch/z80/src/common/up_releasepending.c index 1278692d78..9902d5418c 100644 --- 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 diff --git a/arch/z80/src/common/up_releasestack.c b/arch/z80/src/common/up_releasestack.c index 101953d756..4853da71c9 100644 --- a/arch/z80/src/common/up_releasestack.c +++ b/arch/z80/src/common/up_releasestack.c @@ -45,7 +45,7 @@ #include #include -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Private Types diff --git a/arch/z80/src/common/up_reprioritizertr.c b/arch/z80/src/common/up_reprioritizertr.c index 1af19ded1f..1a5561f313 100644 --- 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 diff --git a/arch/z80/src/common/up_stackdump.c b/arch/z80/src/common/up_stackdump.c index a8ff40f7af..7731057b3e 100644 --- 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 diff --git a/arch/z80/src/common/up_stackframe.c b/arch/z80/src/common/up_stackframe.c index 60ad0851ce..738fc87e36 100644 --- a/arch/z80/src/common/up_stackframe.c +++ b/arch/z80/src/common/up_stackframe.c @@ -46,7 +46,7 @@ #include -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Pre-processor Macros diff --git a/arch/z80/src/common/up_unblocktask.c b/arch/z80/src/common/up_unblocktask.c index 734370f909..029d17787a 100644 --- 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 diff --git a/arch/z80/src/common/up_usestack.c b/arch/z80/src/common/up_usestack.c index 7c75a14419..c3320548e7 100644 --- a/arch/z80/src/common/up_usestack.c +++ b/arch/z80/src/common/up_usestack.c @@ -46,7 +46,7 @@ #include #include -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Private Types diff --git a/arch/z80/src/common/up_doirq.c b/arch/z80/src/common/z80_doirq.c similarity index 99% rename from arch/z80/src/common/up_doirq.c rename to arch/z80/src/common/z80_doirq.c index 4d12c2b780..86122f142d 100644 --- a/arch/z80/src/common/up_doirq.c +++ b/arch/z80/src/common/z80_doirq.c @@ -50,7 +50,7 @@ #include #include "chip/switch.h" -#include "up_internal.h" +#include "z80_internal.h" #include "group/group.h" diff --git a/arch/z80/src/common/up_internal.h b/arch/z80/src/common/z80_internal.h similarity index 97% rename from arch/z80/src/common/up_internal.h rename to arch/z80/src/common/z80_internal.h index d225e633ef..21913fb0ef 100644 --- a/arch/z80/src/common/up_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 */ diff --git a/arch/z80/src/ez80/Make.defs b/arch/z80/src/ez80/Make.defs index fb197236c2..f5e48016ba 100644 --- 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 diff --git a/arch/z80/src/ez80/ez80_copystate.c b/arch/z80/src/ez80/ez80_copystate.c index 06670bca61..00fc7b9338 100644 --- a/arch/z80/src/ez80/ez80_copystate.c +++ b/arch/z80/src/ez80/ez80_copystate.c @@ -42,7 +42,7 @@ #include #include "chip/switch.h" -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c index 65aeee458b..da40aa55de 100644 --- a/arch/z80/src/ez80/ez80_emac.c +++ b/arch/z80/src/ez80/ez80_emac.c @@ -69,7 +69,7 @@ #include #include "chip.h" -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/z80/src/ez80/ez80_initialstate.c b/arch/z80/src/ez80/ez80_initialstate.c index 9e87efc0ac..6f28acaed4 100644 --- a/arch/z80/src/ez80/ez80_initialstate.c +++ b/arch/z80/src/ez80/ez80_initialstate.c @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "up_internal.h" +#include "z80_internal.h" #include "up_arch.h" /**************************************************************************** diff --git a/arch/z80/src/ez80/ez80_irq.c b/arch/z80/src/ez80/ez80_irq.c index c099c68af1..c55866de56 100644 --- a/arch/z80/src/ez80/ez80_irq.c +++ b/arch/z80/src/ez80/ez80_irq.c @@ -43,7 +43,7 @@ #include #include "chip/switch.h" -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Public Data diff --git a/arch/z80/src/ez80/ez80_lowuart.c b/arch/z80/src/ez80/ez80_lowuart.c index dc69ecca8e..d0029a8867 100644 --- a/arch/z80/src/ez80/ez80_lowuart.c +++ b/arch/z80/src/ez80/ez80_lowuart.c @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "up_internal.h" +#include "z80_internal.h" #ifdef USE_LOWSERIALINIT diff --git a/arch/z80/src/ez80/ez80_registerdump.c b/arch/z80/src/ez80/ez80_registerdump.c index 8035b86857..96bb0da1a8 100644 --- a/arch/z80/src/ez80/ez80_registerdump.c +++ b/arch/z80/src/ez80/ez80_registerdump.c @@ -45,7 +45,7 @@ #include #include "chip/switch.h" -#include "up_internal.h" +#include "z80_internal.h" #ifdef CONFIG_ARCH_STACKDUMP diff --git a/arch/z80/src/ez80/ez80_rtc.h b/arch/z80/src/ez80/ez80_rtc.h index 57b2f77520..9c15799881 100644 --- 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 diff --git a/arch/z80/src/ez80/ez80_schedulesigaction.c b/arch/z80/src/ez80/ez80_schedulesigaction.c index bd08d3da8c..6fba9db3ed 100644 --- 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 diff --git a/arch/z80/src/ez80/ez80_serial.c b/arch/z80/src/ez80/ez80_serial.c index 17c615868e..552ad391e4 100644 --- a/arch/z80/src/ez80/ez80_serial.c +++ b/arch/z80/src/ez80/ez80_serial.c @@ -54,7 +54,7 @@ #include #include "chip.h" -#include "up_internal.h" +#include "z80_internal.h" #ifdef USE_SERIALDRIVER diff --git a/arch/z80/src/ez80/ez80_sigdeliver.c b/arch/z80/src/ez80/ez80_sigdeliver.c index 6e32d977be..4b17b4bf85 100644 --- 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 diff --git a/arch/z80/src/ez80/ez80_spi.c b/arch/z80/src/ez80/ez80_spi.c index fabba0d967..801337b701 100644 --- a/arch/z80/src/ez80/ez80_spi.c +++ b/arch/z80/src/ez80/ez80_spi.c @@ -50,7 +50,7 @@ #include #include -#include "up_internal.h" +#include "z80_internal.h" #include "up_arch.h" #include "chip.h" diff --git a/arch/z80/src/ez80/ez80_timerisr.c b/arch/z80/src/ez80/ez80_timerisr.c index 6aee7ebdb0..977c3d46b5 100644 --- 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 diff --git a/arch/z80/src/ez80/switch.h b/arch/z80/src/ez80/switch.h index b390cdab6b..97e70624bf 100644 --- a/arch/z80/src/ez80/switch.h +++ b/arch/z80/src/ez80/switch.h @@ -44,7 +44,7 @@ # include # include #endif -#include "up_internal.h" +#include "z80_internal.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/z80/src/z180/Make.defs b/arch/z80/src/z180/Make.defs index 0f71bb9494..2da78c55f3 100644 --- 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 diff --git a/arch/z80/src/z180/switch.h b/arch/z80/src/z180/switch.h index 4843fa450b..cb7acdcfa3 100644 --- a/arch/z80/src/z180/switch.h +++ b/arch/z80/src/z180/switch.h @@ -47,7 +47,7 @@ #include #include "z180_iomap.h" -#include "up_internal.h" +#include "z80_internal.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/z80/src/z180/z180_config.h b/arch/z80/src/z180/z180_config.h index 556973a753..470945e82a 100644 --- a/arch/z80/src/z180/z180_config.h +++ b/arch/z80/src/z180/z180_config.h @@ -44,7 +44,7 @@ #include -#include "up_internal.h" +#include "z80_internal.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/z80/src/z180/z180_copystate.c b/arch/z80/src/z180/z180_copystate.c index 6824438cab..bcb387573f 100644 --- a/arch/z80/src/z180/z180_copystate.c +++ b/arch/z80/src/z180/z180_copystate.c @@ -42,7 +42,7 @@ #include #include "chip/switch.h" -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/z80/src/z180/z180_initialstate.c b/arch/z80/src/z180/z180_initialstate.c index 2c54b5b3b2..4f4b4fe75e 100644 --- a/arch/z80/src/z180/z180_initialstate.c +++ b/arch/z80/src/z180/z180_initialstate.c @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "up_internal.h" +#include "z80_internal.h" #include "up_arch.h" /**************************************************************************** diff --git a/arch/z80/src/z180/z180_io.c b/arch/z80/src/z180/z180_io.c index e5b13a7eb7..409ace9ace 100644 --- a/arch/z80/src/z180/z180_io.c +++ b/arch/z80/src/z180/z180_io.c @@ -41,7 +41,7 @@ #include /* #include */ -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/z80/src/z180/z180_irq.c b/arch/z80/src/z180/z180_irq.c index ecd2d60a54..9ed7f36add 100644 --- 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 diff --git a/arch/z80/src/z180/z180_lowscc.c b/arch/z80/src/z180/z180_lowscc.c index c36bb9afc7..1b281ff895 100644 --- a/arch/z80/src/z180/z180_lowscc.c +++ b/arch/z80/src/z180/z180_lowscc.c @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "common/up_internal.h" +#include "common/z80_internal.h" #include "z180_config.h" #if defined(USE_LOWSERIALINIT) && defined(HAVE_SCC) diff --git a/arch/z80/src/z180/z180_lowserial.c b/arch/z80/src/z180/z180_lowserial.c index 78fdb26427..68a40df820 100644 --- a/arch/z80/src/z180/z180_lowserial.c +++ b/arch/z80/src/z180/z180_lowserial.c @@ -39,7 +39,7 @@ #include -#include "common/up_internal.h" +#include "common/z80_internal.h" #include "z180_config.h" #include "z180_serial.h" diff --git a/arch/z80/src/z180/z180_lowuart.c b/arch/z80/src/z180/z180_lowuart.c index 18de900abc..8ec775c95f 100644 --- a/arch/z80/src/z180/z180_lowuart.c +++ b/arch/z80/src/z180/z180_lowuart.c @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "common/up_internal.h" +#include "common/z80_internal.h" #include "z180_config.h" #if defined(USE_LOWSERIALINIT) && defined(HAVE_UART) diff --git a/arch/z80/src/z180/z180_mmu.c b/arch/z80/src/z180/z180_mmu.c index 631e087b43..8af556b58f 100644 --- a/arch/z80/src/z180/z180_mmu.c +++ b/arch/z80/src/z180/z180_mmu.c @@ -50,7 +50,7 @@ #include #include -#include "up_internal.h" +#include "z80_internal.h" #include "z180_mmu.h" /**************************************************************************** diff --git a/arch/z80/src/z180/z180_mmu.h b/arch/z80/src/z180/z180_mmu.h index e6bb27b481..b6b747d03b 100644 --- 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. * ****************************************************************************/ diff --git a/arch/z80/src/z180/z180_registerdump.c b/arch/z80/src/z180/z180_registerdump.c index b19a2659da..e6c694fbd7 100644 --- a/arch/z80/src/z180/z180_registerdump.c +++ b/arch/z80/src/z180/z180_registerdump.c @@ -45,7 +45,7 @@ #include #include "chip/switch.h" -#include "up_internal.h" +#include "z80_internal.h" #ifdef CONFIG_ARCH_STACKDUMP diff --git a/arch/z80/src/z180/z180_scc.c b/arch/z80/src/z180/z180_scc.c index 19eff69059..fc6e3b968f 100644 --- a/arch/z80/src/z180/z180_scc.c +++ b/arch/z80/src/z180/z180_scc.c @@ -54,7 +54,7 @@ #include #include "chip.h" -#include "up_internal.h" +#include "z80_internal.h" #include "z180_config.h" #include "z180_serial.h" diff --git a/arch/z80/src/z180/z180_schedulesigaction.c b/arch/z80/src/z180/z180_schedulesigaction.c index 470b6ab194..18009b0f80 100644 --- 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 diff --git a/arch/z80/src/z180/z180_serial.h b/arch/z80/src/z180/z180_serial.h index 0b0e12d793..b07c644144 100644 --- a/arch/z80/src/z180/z180_serial.h +++ b/arch/z80/src/z180/z180_serial.h @@ -42,7 +42,7 @@ #include -#include "up_internal.h" +#include "z80_internal.h" #include "z180_config.h" /**************************************************************************** diff --git a/arch/z80/src/z180/z180_sigdeliver.c b/arch/z80/src/z180/z180_sigdeliver.c index b6b90038fb..8330f7f7cf 100644 --- 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 diff --git a/arch/z80/src/z180/z180_timerisr.c b/arch/z80/src/z180/z180_timerisr.c index 6aecaf108a..f6d4236562 100644 --- a/arch/z80/src/z180/z180_timerisr.c +++ b/arch/z80/src/z180/z180_timerisr.c @@ -46,7 +46,7 @@ #include #include "clock/clock.h" -#include "up_internal.h" +#include "z80_internal.h" #include "chip.h" diff --git a/arch/z80/src/z8/Make.defs b/arch/z80/src/z8/Make.defs index 7a7476aa4f..4f19363e38 100644 --- 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 diff --git a/arch/z80/src/z8/switch.h b/arch/z80/src/z8/switch.h index e2c8111cff..06eb75decf 100644 --- a/arch/z80/src/z8/switch.h +++ b/arch/z80/src/z8/switch.h @@ -46,7 +46,7 @@ # include # include #endif -#include "up_internal.h" +#include "z80_internal.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/z80/src/z8/z8_initialstate.c b/arch/z80/src/z8/z8_initialstate.c index 9e36896e49..962043fc42 100644 --- a/arch/z80/src/z8/z8_initialstate.c +++ b/arch/z80/src/z8/z8_initialstate.c @@ -45,7 +45,7 @@ #include #include "chip.h" -#include "up_internal.h" +#include "z80_internal.h" #include "up_arch.h" /**************************************************************************** diff --git a/arch/z80/src/z8/z8_irq.c b/arch/z80/src/z8/z8_irq.c index 2f3244b157..00e3b2d505 100644 --- a/arch/z80/src/z8/z8_irq.c +++ b/arch/z80/src/z8/z8_irq.c @@ -45,7 +45,7 @@ #include #include "chip/switch.h" -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Public Data diff --git a/arch/z80/src/z8/z8_lowuart.c b/arch/z80/src/z8/z8_lowuart.c index 0e89dbe2cd..c1b3393dc1 100644 --- a/arch/z80/src/z8/z8_lowuart.c +++ b/arch/z80/src/z8/z8_lowuart.c @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "up_internal.h" +#include "z80_internal.h" #ifdef USE_LOWSERIALINIT diff --git a/arch/z80/src/z8/z8_registerdump.c b/arch/z80/src/z8/z8_registerdump.c index 6457204386..f584679952 100644 --- a/arch/z80/src/z8/z8_registerdump.c +++ b/arch/z80/src/z8/z8_registerdump.c @@ -46,7 +46,7 @@ #include #include "chip/switch.h" -#include "up_internal.h" +#include "z80_internal.h" #ifdef CONFIG_ARCH_STACKDUMP diff --git a/arch/z80/src/z8/z8_saveirqcontext.c b/arch/z80/src/z8/z8_saveirqcontext.c index 9a85955533..01e407d9fe 100644 --- a/arch/z80/src/z8/z8_saveirqcontext.c +++ b/arch/z80/src/z8/z8_saveirqcontext.c @@ -43,7 +43,7 @@ #include #include "chip/switch.h" -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/z80/src/z8/z8_schedulesigaction.c b/arch/z80/src/z8/z8_schedulesigaction.c index d29b0dfe67..f8c6ccc4d4 100644 --- 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 diff --git a/arch/z80/src/z8/z8_serial.c b/arch/z80/src/z8/z8_serial.c index e0f874c254..c83ef22e4d 100644 --- a/arch/z80/src/z8/z8_serial.c +++ b/arch/z80/src/z8/z8_serial.c @@ -54,7 +54,7 @@ #include #include "chip.h" -#include "up_internal.h" +#include "z80_internal.h" #ifdef USE_SERIALDRIVER diff --git a/arch/z80/src/z8/z8_sigdeliver.c b/arch/z80/src/z8/z8_sigdeliver.c index 96bc5cb9af..bf81707887 100644 --- 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 diff --git a/arch/z80/src/z8/z8_timerisr.c b/arch/z80/src/z8/z8_timerisr.c index a38598af36..a24c7c074e 100644 --- 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 diff --git a/arch/z80/src/z80/Make.defs b/arch/z80/src/z80/Make.defs index 485dc3bbcd..531ca0061b 100644 --- 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 diff --git a/arch/z80/src/z80/switch.h b/arch/z80/src/z80/switch.h index 863fbad009..bb9f8d49f1 100644 --- a/arch/z80/src/z80/switch.h +++ b/arch/z80/src/z80/switch.h @@ -43,7 +43,7 @@ #include #include -#include "up_internal.h" +#include "z80_internal.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/z80/src/z80/z80_copystate.c b/arch/z80/src/z80/z80_copystate.c index 3e22146765..2609d34bd2 100644 --- a/arch/z80/src/z80/z80_copystate.c +++ b/arch/z80/src/z80/z80_copystate.c @@ -42,7 +42,7 @@ #include #include "chip/switch.h" -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/z80/src/z80/z80_initialstate.c b/arch/z80/src/z80/z80_initialstate.c index 00c058489d..d42ce6f081 100644 --- a/arch/z80/src/z80/z80_initialstate.c +++ b/arch/z80/src/z80/z80_initialstate.c @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "up_internal.h" +#include "z80_internal.h" #include "up_arch.h" /**************************************************************************** diff --git a/arch/z80/src/z80/z80_io.c b/arch/z80/src/z80/z80_io.c index a44be35597..2314967776 100644 --- a/arch/z80/src/z80/z80_io.c +++ b/arch/z80/src/z80/z80_io.c @@ -41,7 +41,7 @@ #include /* #include */ -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/z80/src/z80/z80_irq.c b/arch/z80/src/z80/z80_irq.c index 2e8f05c990..c86a8d2c7c 100644 --- a/arch/z80/src/z80/z80_irq.c +++ b/arch/z80/src/z80/z80_irq.c @@ -43,7 +43,7 @@ #include #include "chip/switch.h" -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Public Data diff --git a/arch/z80/src/z80/z80_registerdump.c b/arch/z80/src/z80/z80_registerdump.c index 0c5a84a23a..1637b7e343 100644 --- a/arch/z80/src/z80/z80_registerdump.c +++ b/arch/z80/src/z80/z80_registerdump.c @@ -45,7 +45,7 @@ #include #include "chip/switch.h" -#include "up_internal.h" +#include "z80_internal.h" #ifdef CONFIG_ARCH_STACKDUMP diff --git a/arch/z80/src/z80/z80_schedulesigaction.c b/arch/z80/src/z80/z80_schedulesigaction.c index 028c78afc1..2cef6e9813 100644 --- 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 diff --git a/arch/z80/src/z80/z80_sigdeliver.c b/arch/z80/src/z80/z80_sigdeliver.c index ad33e7e122..bc787a0e88 100644 --- 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 diff --git a/configs/ez80f910200kitg/src/ez80_leds.c b/configs/ez80f910200kitg/src/ez80_leds.c index 2543c5d593..7101d85c32 100644 --- a/configs/ez80f910200kitg/src/ez80_leds.c +++ b/configs/ez80f910200kitg/src/ez80_leds.c @@ -42,7 +42,7 @@ #include #include -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/configs/ez80f910200zco/src/ez80_buttons.c b/configs/ez80f910200zco/src/ez80_buttons.c index ee76218d0d..119755f292 100644 --- 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 diff --git a/configs/ez80f910200zco/src/ez80_leds.c b/configs/ez80f910200zco/src/ez80_leds.c index 56a41af8a2..c228fddf80 100644 --- a/configs/ez80f910200zco/src/ez80_leds.c +++ b/configs/ez80f910200zco/src/ez80_leds.c @@ -45,7 +45,7 @@ #include #include "ez80f910200zco.h" -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/configs/makerlisp/src/ez80_boot.c b/configs/makerlisp/src/ez80_boot.c index 1cc3e721bc..3e41c30a19 100644 --- a/configs/makerlisp/src/ez80_boot.c +++ b/configs/makerlisp/src/ez80_boot.c @@ -48,7 +48,7 @@ #include #include "chip.h" -#include "up_internal.h" +#include "z80_internal.h" #include "makerlisp.h" /**************************************************************************** diff --git a/configs/makerlisp/src/ez80_leds.c b/configs/makerlisp/src/ez80_leds.c index f19cdff18b..b1b7892852 100644 --- a/configs/makerlisp/src/ez80_leds.c +++ b/configs/makerlisp/src/ez80_leds.c @@ -57,7 +57,7 @@ #include #include -#include "up_internal.h" +#include "z80_internal.h" #include "makerlisp.h" #ifdef CONFIG_ARCH_LEDS diff --git a/configs/makerlisp/src/ez80_spi.c b/configs/makerlisp/src/ez80_spi.c index 584efe62b3..2fca246f44 100644 --- a/configs/makerlisp/src/ez80_spi.c +++ b/configs/makerlisp/src/ez80_spi.c @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "up_internal.h" +#include "z80_internal.h" #include "ez80f91_spi.h" #include "makerlisp.h" diff --git a/configs/z80sim/src/z80_irq.c b/configs/z80sim/src/z80_irq.c index 29a0358d74..4fae32493d 100644 --- a/configs/z80sim/src/z80_irq.c +++ b/configs/z80sim/src/z80_irq.c @@ -42,7 +42,7 @@ #include #include "up_arch.h" -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Public Function Prototypes diff --git a/configs/z80sim/src/z80_lowputc.c b/configs/z80sim/src/z80_lowputc.c index 669c53c976..2ca2c0a27b 100644 --- a/configs/z80sim/src/z80_lowputc.c +++ b/configs/z80sim/src/z80_lowputc.c @@ -44,7 +44,7 @@ #include #include -#include "up_internal.h" +#include "z80_internal.h" /******************************************************************************** * Pre-processor Definitions diff --git a/configs/z80sim/src/z80_serial.c b/configs/z80sim/src/z80_serial.c index a2e8788a1f..14de8e0e89 100644 --- a/configs/z80sim/src/z80_serial.c +++ b/configs/z80sim/src/z80_serial.c @@ -52,7 +52,7 @@ #include #include "up_arch.h" -#include "up_internal.h" +#include "z80_internal.h" #ifdef USE_SERIALDRIVER diff --git a/configs/z80sim/src/z80_timerisr.c b/configs/z80sim/src/z80_timerisr.c index b405ab34de..8e93b90d57 100644 --- a/configs/z80sim/src/z80_timerisr.c +++ b/configs/z80sim/src/z80_timerisr.c @@ -44,7 +44,7 @@ #include #include "clock/clock.h" -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Public Functions diff --git a/configs/z8encore000zco/src/z8_leds.c b/configs/z8encore000zco/src/z8_leds.c index 6cac5cdee3..0c5d2ed036 100644 --- a/configs/z8encore000zco/src/z8_leds.c +++ b/configs/z8encore000zco/src/z8_leds.c @@ -52,7 +52,7 @@ #include #include -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/configs/z8f64200100kit/src/z8_leds.c b/configs/z8f64200100kit/src/z8_leds.c index 40a641a242..1b1af82145 100644 --- a/configs/z8f64200100kit/src/z8_leds.c +++ b/configs/z8f64200100kit/src/z8_leds.c @@ -42,7 +42,7 @@ #include #include -#include "up_internal.h" +#include "z80_internal.h" /**************************************************************************** * Pre-processor Definitions