From 32051bc141f4b729a8738fc19633a4010201348b Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 14 Feb 2008 17:24:14 +0000 Subject: Move all z80-dependencies into arch/z80/src/z80 git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@683 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/configs/z80sim/src/Makefile | 2 +- nuttx/configs/z80sim/src/z80_decodeirq.c | 104 ------------------------------- nuttx/configs/z80sim/src/z80_irq.c | 4 -- 3 files changed, 1 insertion(+), 109 deletions(-) delete mode 100644 nuttx/configs/z80sim/src/z80_decodeirq.c (limited to 'nuttx/configs/z80sim') diff --git a/nuttx/configs/z80sim/src/Makefile b/nuttx/configs/z80sim/src/Makefile index be685f18c..46767d139 100644 --- a/nuttx/configs/z80sim/src/Makefile +++ b/nuttx/configs/z80sim/src/Makefile @@ -39,7 +39,7 @@ CFLAGS += -I$(TOPDIR)/sched -I$(TOPDIR)/arch/z80/src/common -I$(TOPDIR)/arch/z8 ASRCS = AOBJS = $(ASRCS:$(ASMEXT)=$(OBJEXT)) -CSRCS = z80_decodeirq.c z80_irq.c z80_serial.c z80_timerisr.c z80_lowputc.c +CSRCS = z80_irq.c z80_serial.c z80_timerisr.c z80_lowputc.c COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) diff --git a/nuttx/configs/z80sim/src/z80_decodeirq.c b/nuttx/configs/z80sim/src/z80_decodeirq.c deleted file mode 100644 index 0b52bc7a6..000000000 --- a/nuttx/configs/z80sim/src/z80_decodeirq.c +++ /dev/null @@ -1,104 +0,0 @@ -/******************************************************************************** - * board/z80_decodeirq.c - * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ********************************************************************************/ - -/******************************************************************************** - * Included Files - ********************************************************************************/ - -#include - -#include -#include -#include -#include -#include - -#include "os_internal.h" -#include "up_internal.h" - -/******************************************************************************** - * Definitions - ********************************************************************************/ - -/******************************************************************************** - * Public Data - ********************************************************************************/ - -/******************************************************************************** - * Private Data - ********************************************************************************/ - -/******************************************************************************** - * Private Functions - ********************************************************************************/ - -/******************************************************************************** - * Public Functions - ********************************************************************************/ - -FAR chipreg_t *up_decodeirq(uint8 rstno, FAR chipreg_t *regs) -{ -#ifdef CONFIG_SUPPRESS_INTERRUPTS - - lib_lowprintf("Unexpected IRQ\n"); - current_regs = regs; - PANIC(OSERR_ERREXCEPTION); - return NULL; /* Won't get here */ - -#else - - /* Current regs non-zero indicates that we are processing an interrupt; - * current_regs is also used to manage interrupt level context switches. - */ - - current_regs = regs; - - /* Deliver the IRQ -- the simulation supports only timer interrupts and - * the IRQ maps to the reset number (real hardware probably needs an - * additional level of interrupt decoding. - */ - - irq_dispatch((int)rstno, regs); - - /* If a context switch occurred, current_regs will hold the new context */ - - regs = current_regs; - - /* Indicate that we are no long in an interrupt handler */ - - current_regs = NULL; - return regs; -#endif -} diff --git a/nuttx/configs/z80sim/src/z80_irq.c b/nuttx/configs/z80sim/src/z80_irq.c index 5fd150359..c2b64a1d5 100644 --- a/nuttx/configs/z80sim/src/z80_irq.c +++ b/nuttx/configs/z80sim/src/z80_irq.c @@ -72,10 +72,6 @@ void up_irqinitialize(void) { - /* currents_regs is non-NULL only while processing an interrupt */ - - current_regs = NULL; - /* Attach the timer interrupt -- There is not special timer interrupt * enable in the simulation so it must be enabled here before interrupts * are enabled. -- cgit v1.2.3