diff --git a/sys/arch/evbarm/ifpga/genassym.cf b/sys/arch/evbarm/ifpga/genassym.cf deleted file mode 100644 index 8261a0fb4d40..000000000000 --- a/sys/arch/evbarm/ifpga/genassym.cf +++ /dev/null @@ -1,46 +0,0 @@ -# $NetBSD: genassym.cf,v 1.3 2002/01/30 03:59:41 thorpej Exp $ - -# Copyright (c) 1982, 1990 The Regents of the University of California. -# All rights reserved. -# -# This code is derived from software contributed to Berkeley by -# William Jolitz. -# -# 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. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by the University of -# California, Berkeley and its contributors. -# 4. Neither the name of the University 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 REGENTS 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 REGENTS 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. - -include - -define IH_FUNC offsetof(struct irqhandler, ih_func) -define IH_ARG offsetof(struct irqhandler, ih_arg) -define IH_FLAGS offsetof(struct irqhandler, ih_flags) -define IH_LEVEL offsetof(struct irqhandler, ih_level) -define IH_NUM offsetof(struct irqhandler, ih_num) -define IH_MASKADDR offsetof(struct irqhandler, ih_maskaddr) -define IH_MASKBITS offsetof(struct irqhandler, ih_maskbits) -define IH_NEXT offsetof(struct irqhandler, ih_next) diff --git a/sys/arch/evbarm/ifpga/ifpga_pci.c b/sys/arch/evbarm/ifpga/ifpga_pci.c index f5f48f723b9e..bb0ce67d50b3 100644 --- a/sys/arch/evbarm/ifpga/ifpga_pci.c +++ b/sys/arch/evbarm/ifpga/ifpga_pci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ifpga_pci.c,v 1.8 2003/09/06 11:31:22 rearnsha Exp $ */ +/* $NetBSD: ifpga_pci.c,v 1.9 2003/09/06 13:01:29 rearnsha Exp $ */ /* * Copyright (c) 2001 ARM Ltd @@ -64,7 +64,7 @@ #define _ARM32_BUS_DMA_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: ifpga_pci.c,v 1.8 2003/09/06 11:31:22 rearnsha Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ifpga_pci.c,v 1.9 2003/09/06 13:01:29 rearnsha Exp $"); #include #include @@ -75,7 +75,6 @@ __KERNEL_RCSID(0, "$NetBSD: ifpga_pci.c,v 1.8 2003/09/06 11:31:22 rearnsha Exp $ #include #include -#include /* XXX XXX XXX */ #include #include diff --git a/sys/arch/evbarm/ifpga/irqhandler.h b/sys/arch/evbarm/ifpga/irqhandler.h deleted file mode 100644 index 9e282440cdc8..000000000000 --- a/sys/arch/evbarm/ifpga/irqhandler.h +++ /dev/null @@ -1,95 +0,0 @@ -/* $NetBSD: irqhandler.h,v 1.2 2002/04/12 18:50:32 thorpej Exp $ */ - -/* - * Copyright (c) 1994-1996 Mark Brinicombe. - * Copyright (c) 1994 Brini. - * All rights reserved. - * - * This code is derived from software written for Brini by Mark Brinicombe - * - * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Mark Brinicombe - * for the NetBSD Project. - * 4. The name of the company nor the name of the author may be used to - * endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - * - * IRQ related stuff (defines + structures) - * - * Created : 30/09/94 - */ - -/* - * XXX This allows the Integrator code to continue using the old - * XXX arm32 interrupt code. Eventually, Integrator should be - * XXX changed to use something more like what the IQ80310 code - * XXX uses. - */ - -#ifndef _ARM32_IRQHANDLER_H_ -#define _ARM32_IRQHANDLER_H_ - -#ifndef _LOCORE -#include -#endif /* _LOCORE */ - -#define IRQ_INSTRUCT -1 -#define NIRQS 0x20 - -#ifndef _LOCORE -typedef struct irqhandler { - int (*ih_func) __P((void *arg));/* handler function */ - void *ih_arg; /* Argument to handler */ - int ih_level; /* Interrupt level */ - int ih_num; /* Interrupt number (for accounting) */ - const char *ih_name; /* Name of interrupt (for vmstat -i) */ - u_int ih_flags; /* Interrupt flags */ - u_int ih_maskaddr; /* mask address for expansion cards */ - u_int ih_maskbits; /* interrupt bit for expansion cards */ - struct irqhandler *ih_next; /* next handler */ -} irqhandler_t; - -#include - -#ifdef _KERNEL -extern u_int irqmasks[NIPL]; -extern irqhandler_t *irqhandlers[NIRQS]; - -void irq_init __P((void)); -void irq_postinit __P((void)); -int irq_claim __P((int, irqhandler_t *)); -int irq_release __P((int, irqhandler_t *)); -void *intr_claim __P((int irq, int level, const char *name, int (*func) __P((void *)), void *arg)); -int intr_release __P((void *ih)); -void irq_setmasks __P((void)); -void disable_irq __P((int)); -void enable_irq __P((int)); -#endif /* _KERNEL */ -#endif /* _LOCORE */ - -#define IRQ_FLAG_ACTIVE 0x00000001 /* This is the active handler in list */ - -#endif /* _ARM32_IRQHANDLER_H_ */ - -/* End of irqhandler.h */