diff --git a/arch/z80/src/.gitignore b/arch/z80/src/.gitignore index 3db121e5a4..6aabefb630 100644 --- a/arch/z80/src/.gitignore +++ b/arch/z80/src/.gitignore @@ -1,6 +1,6 @@ /Make.dep /.depend -/up_mem.h +/z80_mem.h /asm_mem.h /board /chip diff --git a/arch/z80/src/common/up_allocateheap.c b/arch/z80/src/common/z80_allocateheap.c similarity index 94% rename from arch/z80/src/common/up_allocateheap.c rename to arch/z80/src/common/z80_allocateheap.c index 6fde6e1b03..7d396f3f38 100644 --- a/arch/z80/src/common/up_allocateheap.c +++ b/arch/z80/src/common/z80_allocateheap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/z80/src/common/up_allocateheap.c + * arch/z80/src/common/z80_allocateheap.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -32,16 +32,16 @@ #include #include -#include "up_arch.h" +#include "z80_arch.h" #include "z80_internal.h" #ifdef SDCC /* For the SDCC toolchain, the arch/z80/src/Makefile will parse the map file * to determine how much memory is available for the heap. This parsed data - * is provided via the auto-generated file up_mem.h + * is provided via the auto-generated file z80_mem.h */ -# include "up_mem.h" +# include "z80_mem.h" #else /* For other toolchains, the architecture must provide a header file in the @@ -49,7 +49,7 @@ * in the configuration file ) */ -# include "chip/up_mem.h" +# include "chip/z80_mem.h" #endif /**************************************************************************** diff --git a/arch/z80/src/common/up_arch.h b/arch/z80/src/common/z80_arch.h similarity index 97% rename from arch/z80/src/common/up_arch.h rename to arch/z80/src/common/z80_arch.h index 70137c6635..e61d14d239 100644 --- a/arch/z80/src/common/up_arch.h +++ b/arch/z80/src/common/z80_arch.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/z80/src/common/up_arch.h + * arch/z80/src/common/z80_arch.h * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/z80/src/common/up_assert.c b/arch/z80/src/common/z80_assert.c similarity index 98% rename from arch/z80/src/common/up_assert.c rename to arch/z80/src/common/z80_assert.c index 007af17ffd..dfd62481dd 100644 --- a/arch/z80/src/common/up_assert.c +++ b/arch/z80/src/common/z80_assert.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/z80/src/common/up_assert.c + * arch/z80/src/common/z80_assert.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -36,7 +36,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "z80_arch.h" #include "sched/sched.h" #include "z80_internal.h" diff --git a/arch/z80/src/common/up_blocktask.c b/arch/z80/src/common/z80_blocktask.c similarity index 99% rename from arch/z80/src/common/up_blocktask.c rename to arch/z80/src/common/z80_blocktask.c index 74d8f67b04..2eb5bc1ad2 100644 --- a/arch/z80/src/common/up_blocktask.c +++ b/arch/z80/src/common/z80_blocktask.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/z80/src/common/up_blocktask.c + * arch/z80/src/common/z80_blocktask.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/z80/src/common/up_createstack.c b/arch/z80/src/common/z80_createstack.c similarity index 98% rename from arch/z80/src/common/up_createstack.c rename to arch/z80/src/common/z80_createstack.c index 46e45e97f5..3f62467f97 100644 --- a/arch/z80/src/common/up_createstack.c +++ b/arch/z80/src/common/z80_createstack.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/z80/src/common/up_createstack.c + * arch/z80/src/common/z80_createstack.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -33,7 +33,7 @@ #include #include -#include "up_arch.h" +#include "z80_arch.h" #include "z80_internal.h" /**************************************************************************** diff --git a/arch/z80/src/common/z80_doirq.c b/arch/z80/src/common/z80_doirq.c index 72ad8a0865..5ee0c89ad1 100644 --- a/arch/z80/src/common/z80_doirq.c +++ b/arch/z80/src/common/z80_doirq.c @@ -26,7 +26,7 @@ #include #include -#include "up_arch.h" +#include "z80_arch.h" #include #include diff --git a/arch/z80/src/common/up_exit.c b/arch/z80/src/common/z80_exit.c similarity index 99% rename from arch/z80/src/common/up_exit.c rename to arch/z80/src/common/z80_exit.c index 4ed1dfcc72..ee6e708d38 100644 --- a/arch/z80/src/common/up_exit.c +++ b/arch/z80/src/common/z80_exit.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/z80/src/common/up_exit.c + * arch/z80/src/common/z80_exit.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/z80/src/common/up_idle.c b/arch/z80/src/common/z80_idle.c similarity index 98% rename from arch/z80/src/common/up_idle.c rename to arch/z80/src/common/z80_idle.c index 81519f704f..0d9a4bfbaf 100644 --- a/arch/z80/src/common/up_idle.c +++ b/arch/z80/src/common/z80_idle.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/z80/src/common/up_idle.c + * arch/z80/src/common/z80_idle.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/z80_initialize.c similarity index 98% rename from arch/z80/src/common/up_initialize.c rename to arch/z80/src/common/z80_initialize.c index c4ca44f4cf..8672d6fdfc 100644 --- a/arch/z80/src/common/up_initialize.c +++ b/arch/z80/src/common/z80_initialize.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/z80/src/common/up_initialize.c + * arch/z80/src/common/z80_initialize.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -43,7 +43,7 @@ #include #include "chip/switch.h" -#include "up_arch.h" +#include "z80_arch.h" #include "z80_internal.h" /**************************************************************************** diff --git a/arch/z80/src/common/up_interruptcontext.c b/arch/z80/src/common/z80_interruptcontext.c similarity index 97% rename from arch/z80/src/common/up_interruptcontext.c rename to arch/z80/src/common/z80_interruptcontext.c index 9ae008d570..62407cc87b 100644 --- a/arch/z80/src/common/up_interruptcontext.c +++ b/arch/z80/src/common/z80_interruptcontext.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/z80/src/common/up_interruptcontext.c + * arch/z80/src/common/z80_interruptcontext.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/z80/src/common/up_mdelay.c b/arch/z80/src/common/z80_mdelay.c similarity index 98% rename from arch/z80/src/common/up_mdelay.c rename to arch/z80/src/common/z80_mdelay.c index 62d1a1ce23..f9cc97523a 100644 --- a/arch/z80/src/common/up_mdelay.c +++ b/arch/z80/src/common/z80_mdelay.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/z80/src/common/up_mdelay.c + * arch/z80/src/common/z80_mdelay.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/z80/src/common/up_puts.c b/arch/z80/src/common/z80_puts.c similarity index 98% rename from arch/z80/src/common/up_puts.c rename to arch/z80/src/common/z80_puts.c index c2e73582b9..64b197f7f4 100644 --- a/arch/z80/src/common/up_puts.c +++ b/arch/z80/src/common/z80_puts.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/z80/src/common/up_puts.c + * arch/z80/src/common/z80_puts.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/z80/src/common/up_releasepending.c b/arch/z80/src/common/z80_releasepending.c similarity index 98% rename from arch/z80/src/common/up_releasepending.c rename to arch/z80/src/common/z80_releasepending.c index 75239bae8a..bf8a821716 100644 --- a/arch/z80/src/common/up_releasepending.c +++ b/arch/z80/src/common/z80_releasepending.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/z80/src/common/up_releasepending.c + * arch/z80/src/common/z80_releasepending.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/z80/src/common/up_releasestack.c b/arch/z80/src/common/z80_releasestack.c similarity index 98% rename from arch/z80/src/common/up_releasestack.c rename to arch/z80/src/common/z80_releasestack.c index 00864a31e8..234218626f 100644 --- a/arch/z80/src/common/up_releasestack.c +++ b/arch/z80/src/common/z80_releasestack.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/z80/src/common/up_releasestack.c + * arch/z80/src/common/z80_releasestack.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/z80/src/common/up_reprioritizertr.c b/arch/z80/src/common/z80_reprioritizertr.c similarity index 99% rename from arch/z80/src/common/up_reprioritizertr.c rename to arch/z80/src/common/z80_reprioritizertr.c index a812361219..0d385098ce 100644 --- a/arch/z80/src/common/up_reprioritizertr.c +++ b/arch/z80/src/common/z80_reprioritizertr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/z80/src/common/up_reprioritizertr.c + * arch/z80/src/common/z80_reprioritizertr.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/z80/src/common/up_stackdump.c b/arch/z80/src/common/z80_stackdump.c similarity index 97% rename from arch/z80/src/common/up_stackdump.c rename to arch/z80/src/common/z80_stackdump.c index 6fe696b157..189c5a9e99 100644 --- a/arch/z80/src/common/up_stackdump.c +++ b/arch/z80/src/common/z80_stackdump.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/z80/src/common/up_stackdump.c + * arch/z80/src/common/z80_stackdump.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -27,7 +27,7 @@ #include #include -#include "up_arch.h" +#include "z80_arch.h" #include "sched/sched.h" #include "z80_internal.h" diff --git a/arch/z80/src/common/up_stackframe.c b/arch/z80/src/common/z80_stackframe.c similarity index 99% rename from arch/z80/src/common/up_stackframe.c rename to arch/z80/src/common/z80_stackframe.c index 1fd880b736..5c0c20ece5 100644 --- a/arch/z80/src/common/up_stackframe.c +++ b/arch/z80/src/common/z80_stackframe.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/z80/src/common/up_stackframe.c + * arch/z80/src/common/z80_stackframe.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/z80/src/common/up_udelay.c b/arch/z80/src/common/z80_udelay.c similarity index 99% rename from arch/z80/src/common/up_udelay.c rename to arch/z80/src/common/z80_udelay.c index ff2be69dae..ec69c00443 100644 --- a/arch/z80/src/common/up_udelay.c +++ b/arch/z80/src/common/z80_udelay.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/z80/src/common/up_udelay.c + * arch/z80/src/common/z80_udelay.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/z80/src/common/up_unblocktask.c b/arch/z80/src/common/z80_unblocktask.c similarity index 99% rename from arch/z80/src/common/up_unblocktask.c rename to arch/z80/src/common/z80_unblocktask.c index e2edf4df02..f9b6bc96f5 100644 --- a/arch/z80/src/common/up_unblocktask.c +++ b/arch/z80/src/common/z80_unblocktask.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/z80/src/common/up_unblocktask.c + * arch/z80/src/common/z80_unblocktask.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/z80/src/common/up_usestack.c b/arch/z80/src/common/z80_usestack.c similarity index 99% rename from arch/z80/src/common/up_usestack.c rename to arch/z80/src/common/z80_usestack.c index 60bbb967d2..90c53b5bdc 100644 --- a/arch/z80/src/common/up_usestack.c +++ b/arch/z80/src/common/z80_usestack.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/z80/src/common/up_usestack.c + * arch/z80/src/common/z80_usestack.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/z80/src/ez80/Make.defs b/arch/z80/src/ez80/Make.defs index 7afa337705..3d9791df27 100644 --- a/arch/z80/src/ez80/Make.defs +++ b/arch/z80/src/ez80/Make.defs @@ -22,15 +22,15 @@ HEAD_ASRC = HEAD_SSRC = 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 z80_doirq.c -CMN_CSRCS += up_mdelay.c up_stackframe.c up_udelay.c up_usestack.c -CMN_CSRCS += up_puts.c +CMN_CSRCS = z80_initialize.c z80_allocateheap.c z80_createstack.c +CMN_CSRCS += z80_releasestack.c z80_interruptcontext.c z80_blocktask.c +CMN_CSRCS += z80_unblocktask.c z80_exit.c z80_releasepending.c +CMN_CSRCS += z80_reprioritizertr.c z80_idle.c z80_assert.c z80_doirq.c +CMN_CSRCS += z80_mdelay.c z80_stackframe.c z80_udelay.c z80_usestack.c +CMN_CSRCS += z80_puts.c ifeq ($(CONFIG_ARCH_STACKDUMP),y) -CMN_CSRCS += up_stackdump.c +CMN_CSRCS += z80_stackdump.c endif CHIP_ASRCS = ez80_startup.asm ez80_io.asm ez80_irqsave.asm diff --git a/arch/z80/src/ez80/ez80_initialstate.c b/arch/z80/src/ez80/ez80_initialstate.c index 845db9d2e1..d6d057330a 100644 --- a/arch/z80/src/ez80/ez80_initialstate.c +++ b/arch/z80/src/ez80/ez80_initialstate.c @@ -30,7 +30,7 @@ #include "chip.h" #include "z80_internal.h" -#include "up_arch.h" +#include "z80_arch.h" /**************************************************************************** * Public Functions diff --git a/arch/z80/src/ez80/ez80_rtc.c b/arch/z80/src/ez80/ez80_rtc.c index 666288a08b..220fa27f1a 100644 --- a/arch/z80/src/ez80/ez80_rtc.c +++ b/arch/z80/src/ez80/ez80_rtc.c @@ -38,7 +38,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "z80_arch.h" #include "ez80_rtc.h" #include diff --git a/arch/z80/src/ez80/ez80_rtc_lowerhalf.c b/arch/z80/src/ez80/ez80_rtc_lowerhalf.c index 18a0ca6911..9729866e6b 100644 --- a/arch/z80/src/ez80/ez80_rtc_lowerhalf.c +++ b/arch/z80/src/ez80/ez80_rtc_lowerhalf.c @@ -32,7 +32,7 @@ #include #include -#include "up_arch.h" +#include "z80_arch.h" #include "chip.h" #include "ez80_rtc.h" diff --git a/arch/z80/src/ez80/ez80_spi.c b/arch/z80/src/ez80/ez80_spi.c index ff92ac57c1..f0229b9945 100644 --- a/arch/z80/src/ez80/ez80_spi.c +++ b/arch/z80/src/ez80/ez80_spi.c @@ -37,7 +37,7 @@ #include #include "z80_internal.h" -#include "up_arch.h" +#include "z80_arch.h" #include "chip.h" diff --git a/arch/z80/src/ez80/up_mem.h b/arch/z80/src/ez80/z80_mem.h similarity index 98% rename from arch/z80/src/ez80/up_mem.h rename to arch/z80/src/ez80/z80_mem.h index e4d1b59386..b21c4ed82a 100644 --- a/arch/z80/src/ez80/up_mem.h +++ b/arch/z80/src/ez80/z80_mem.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/z80/src/ez80/up_mem.h + * arch/z80/src/ez80/z80_mem.h * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/z80/src/z180/Make.defs b/arch/z80/src/z180/Make.defs index 2da78c55f3..f44427d6df 100644 --- a/arch/z80/src/z180/Make.defs +++ b/arch/z80/src/z180/Make.defs @@ -42,11 +42,11 @@ endif endif CMN_ASRCS = -CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_createstack.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 +CMN_CSRCS = z80_allocateheap.c z80_assert.c z80_blocktask.c z80_createstack.c +CMN_CSRCS += z80_doirq.c z80_exit.c z80_idle.c z80_initialize.c +CMN_CSRCS += z80_interruptcontext.c z80_mdelay.c z80_releasepending.c +CMN_CSRCS += z80_releasestack.c z80_stackframe.c z80_reprioritizertr.c +CMN_CSRCS += z80_unblocktask.c z80_udelay.c z80_usestack.c CHIP_ASRCS = z180_restoreusercontext.asm z180_saveusercontext.asm CHIP_ASRCS += z180_vectcommon.asm diff --git a/arch/z80/src/z180/z180_initialstate.c b/arch/z80/src/z180/z180_initialstate.c index 4f4b4fe75e..7e19a1eb06 100644 --- a/arch/z80/src/z180/z180_initialstate.c +++ b/arch/z80/src/z180/z180_initialstate.c @@ -44,7 +44,7 @@ #include "chip.h" #include "z80_internal.h" -#include "up_arch.h" +#include "z80_arch.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/z80/src/z180/up_mem.h b/arch/z80/src/z180/z80_mem.h similarity index 100% rename from arch/z80/src/z180/up_mem.h rename to arch/z80/src/z180/z80_mem.h diff --git a/arch/z80/src/z8/Make.defs b/arch/z80/src/z8/Make.defs index 023e5bb02b..10212d9bd5 100644 --- a/arch/z80/src/z8/Make.defs +++ b/arch/z80/src/z8/Make.defs @@ -36,11 +36,11 @@ HEAD_SSRC = z8_head.S 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 z80_doirq.c -CMN_CSRCS += up_mdelay.c up_stackframe.c up_udelay.c up_usestack.c +CMN_CSRCS = z80_initialize.c z80_allocateheap.c z80_createstack.c +CMN_CSRCS += z80_releasestack.c z80_interruptcontext.c z80_blocktask.c +CMN_CSRCS += z80_unblocktask.c z80_exit.c z80_releasepending.c +CMN_CSRCS += z80_reprioritizertr.c z80_idle.c z80_assert.c z80_doirq.c +CMN_CSRCS += z80_mdelay.c z80_stackframe.c z80_udelay.c z80_usestack.c CHIP_SSRCS = z8_vector.S z8_saveusercontext.S z8_restorecontext.S CHIP_CSRCS = z8_initialstate.c z8_irq.c z8_saveirqcontext.c diff --git a/arch/z80/src/z8/up_mem.h b/arch/z80/src/z8/z80_mem.h similarity index 98% rename from arch/z80/src/z8/up_mem.h rename to arch/z80/src/z8/z80_mem.h index 08812a182c..a93a6f3d55 100644 --- a/arch/z80/src/z8/up_mem.h +++ b/arch/z80/src/z8/z80_mem.h @@ -1,6 +1,6 @@ /************************************************************************************ - * arch/z80/src/z8/up_mem.h - * arch/z80/src/chip/up_mem.h + * arch/z80/src/z8/z80_mem.h + * arch/z80/src/chip/z80_mem.h * * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/arch/z80/src/z8/z8_initialstate.c b/arch/z80/src/z8/z8_initialstate.c index 342bcf4d3c..85eca288a6 100644 --- a/arch/z80/src/z8/z8_initialstate.c +++ b/arch/z80/src/z8/z8_initialstate.c @@ -46,7 +46,7 @@ #include "chip.h" #include "z80_internal.h" -#include "up_arch.h" +#include "z80_arch.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/z80/src/z80/Make.defs b/arch/z80/src/z80/Make.defs index 531ca0061b..f1044aa39e 100644 --- a/arch/z80/src/z80/Make.defs +++ b/arch/z80/src/z80/Make.defs @@ -43,11 +43,11 @@ endif 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 z80_doirq.c -CMN_CSRCS += up_mdelay.c up_stackframe.c up_udelay.c up_usestack.c +CMN_CSRCS = z80_initialize.c z80_allocateheap.c z80_createstack.c +CMN_CSRCS += z80_releasestack.c z80_interruptcontext.c z80_blocktask.c +CMN_CSRCS += z80_unblocktask.c z80_exit.c z80_releasepending.c +CMN_CSRCS += z80_reprioritizertr.c z80_idle.c z80_assert.c z80_doirq.c +CMN_CSRCS += z80_mdelay.c z80_stackframe.c z80_udelay.c z80_usestack.c CHIP_ASRCS = z80_saveusercontext.asm z80_restoreusercontext.asm diff --git a/arch/z80/src/z80/z80_initialstate.c b/arch/z80/src/z80/z80_initialstate.c index d42ce6f081..6a1d6e150f 100644 --- a/arch/z80/src/z80/z80_initialstate.c +++ b/arch/z80/src/z80/z80_initialstate.c @@ -44,7 +44,7 @@ #include "chip.h" #include "z80_internal.h" -#include "up_arch.h" +#include "z80_arch.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/z80/src/z80/up_mem.h b/arch/z80/src/z80/z80_mem.h similarity index 100% rename from arch/z80/src/z80/up_mem.h rename to arch/z80/src/z80/z80_mem.h diff --git a/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c b/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c index e125d2181b..b55a7ec43c 100644 --- a/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c +++ b/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c @@ -45,7 +45,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "z80_arch.h" #include "z80_internal.h" /**************************************************************************** diff --git a/boards/z80/z180/p112/src/.gitignore b/boards/z80/z180/p112/src/.gitignore index 04b280c8ba..d5d4331977 100644 --- a/boards/z80/z180/p112/src/.gitignore +++ b/boards/z80/z180/p112/src/.gitignore @@ -1,6 +1,6 @@ /Make.dep /.depend -/up_mem.h +/z80_mem.h /*.sym /*.asm /*.rel diff --git a/boards/z80/z80/z80sim/src/.gitignore b/boards/z80/z80/z80sim/src/.gitignore index 04b280c8ba..d5d4331977 100644 --- a/boards/z80/z80/z80sim/src/.gitignore +++ b/boards/z80/z80/z80sim/src/.gitignore @@ -1,6 +1,6 @@ /Make.dep /.depend -/up_mem.h +/z80_mem.h /*.sym /*.asm /*.rel diff --git a/boards/z80/z80/z80sim/src/z80_irq.c b/boards/z80/z80/z80sim/src/z80_irq.c index 3efee0fe4d..c0f6d7b820 100644 --- a/boards/z80/z80/z80sim/src/z80_irq.c +++ b/boards/z80/z80/z80sim/src/z80_irq.c @@ -41,7 +41,7 @@ #include -#include "up_arch.h" +#include "z80_arch.h" #include "z80_internal.h" /**************************************************************************** diff --git a/boards/z80/z80/z80sim/src/z80_serial.c b/boards/z80/z80/z80sim/src/z80_serial.c index 0c6f373aec..6817f02e25 100644 --- a/boards/z80/z80/z80sim/src/z80_serial.c +++ b/boards/z80/z80/z80sim/src/z80_serial.c @@ -51,7 +51,7 @@ #include #include -#include "up_arch.h" +#include "z80_arch.h" #include "z80_internal.h" #ifdef USE_SERIALDRIVER