Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Move interrupt-related stuff out of the generic 32-...
details: https://anonhg.NetBSD.org/src/rev/f41b6f878e29
branches: trunk
changeset: 518257:f41b6f878e29
user: thorpej <thorpej%NetBSD.org@localhost>
date: Tue Nov 27 00:15:58 2001 +0000
description:
Move interrupt-related stuff out of the generic 32-bit ARM genassym.cf
and into platform-specific genassym.cf files.
diffstat:
sys/arch/acorn32/acorn32/genassym.cf | 55 ++++++++++++++++++++++++++
sys/arch/acorn32/conf/Makefile.acorn32 | 4 +-
sys/arch/arm/footbridge/genassym.cf | 55 ++++++++++++++++++++++++++
sys/arch/arm32/arm32/genassym.cf | 55 ++++++++++++++++++++++++++
sys/arch/arm32/conf/Makefile.arm32 | 4 +-
sys/arch/cats/conf/Makefile.cats.inc | 3 +
sys/arch/dnard/conf/Makefile.dnard.inc | 3 +
sys/arch/dnard/dnard/genassym.cf | 55 ++++++++++++++++++++++++++
sys/arch/evbarm/conf/Makefile.evbarm.inc | 4 +-
sys/arch/evbarm/ifpga/genassym.cf | 55 ++++++++++++++++++++++++++
sys/arch/evbarm/iq80310/genassym.cf | 55 ++++++++++++++++++++++++++
sys/arch/netwinder/conf/Makefile.netwinder.inc | 4 +-
12 files changed, 348 insertions(+), 4 deletions(-)
diffs (truncated from 435 to 300 lines):
diff -r e165f752f578 -r f41b6f878e29 sys/arch/acorn32/acorn32/genassym.cf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/acorn32/acorn32/genassym.cf Tue Nov 27 00:15:58 2001 +0000
@@ -0,0 +1,55 @@
+# $NetBSD: genassym.cf,v 1.1 2001/11/27 00:15:58 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 <machine/intr.h>
+
+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)
+
+define FH_FUNC offsetof(struct fiqhandler, fh_func)
+define FH_R8 offsetof(struct fiqhandler, fh_r8)
+define FH_R9 offsetof(struct fiqhandler, fh_r9)
+define FH_R10 offsetof(struct fiqhandler, fh_r10)
+define FH_R11 offsetof(struct fiqhandler, fh_r11)
+define FH_R12 offsetof(struct fiqhandler, fh_r12)
+define FH_R13 offsetof(struct fiqhandler, fh_r13)
+define FH_MASK offsetof(struct fiqhandler, fh_mask)
diff -r e165f752f578 -r f41b6f878e29 sys/arch/acorn32/conf/Makefile.acorn32
--- a/sys/arch/acorn32/conf/Makefile.acorn32 Mon Nov 26 23:54:49 2001 +0000
+++ b/sys/arch/acorn32/conf/Makefile.acorn32 Tue Nov 27 00:15:58 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.acorn32,v 1.7 2001/11/26 23:52:58 thorpej Exp $
+# $NetBSD: Makefile.acorn32,v 1.8 2001/11/27 00:16:00 thorpej Exp $
# Makefile for NetBSD
#
@@ -59,6 +59,8 @@
LINKFLAGS= -Ttext ${LOADADDRESS} -e start
STRIPFLAGS= -g
+GENASSYM_EXTRAS+= ${ACORN32}/acorn32/genassym.cf
+
%INCLUDES
HOSTED_CC= ${CC}
diff -r e165f752f578 -r f41b6f878e29 sys/arch/arm/footbridge/genassym.cf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/footbridge/genassym.cf Tue Nov 27 00:15:58 2001 +0000
@@ -0,0 +1,55 @@
+# $NetBSD: genassym.cf,v 1.1 2001/11/27 00:15:58 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 <machine/intr.h>
+
+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)
+
+define FH_FUNC offsetof(struct fiqhandler, fh_func)
+define FH_R8 offsetof(struct fiqhandler, fh_r8)
+define FH_R9 offsetof(struct fiqhandler, fh_r9)
+define FH_R10 offsetof(struct fiqhandler, fh_r10)
+define FH_R11 offsetof(struct fiqhandler, fh_r11)
+define FH_R12 offsetof(struct fiqhandler, fh_r12)
+define FH_R13 offsetof(struct fiqhandler, fh_r13)
+define FH_MASK offsetof(struct fiqhandler, fh_mask)
diff -r e165f752f578 -r f41b6f878e29 sys/arch/arm32/arm32/genassym.cf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm32/arm32/genassym.cf Tue Nov 27 00:15:58 2001 +0000
@@ -0,0 +1,55 @@
+# $NetBSD: genassym.cf,v 1.10 2001/11/27 00:15:58 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 <machine/intr.h>
+
+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)
+
+define FH_FUNC offsetof(struct fiqhandler, fh_func)
+define FH_R8 offsetof(struct fiqhandler, fh_r8)
+define FH_R9 offsetof(struct fiqhandler, fh_r9)
+define FH_R10 offsetof(struct fiqhandler, fh_r10)
+define FH_R11 offsetof(struct fiqhandler, fh_r11)
+define FH_R12 offsetof(struct fiqhandler, fh_r12)
+define FH_R13 offsetof(struct fiqhandler, fh_r13)
+define FH_MASK offsetof(struct fiqhandler, fh_mask)
diff -r e165f752f578 -r f41b6f878e29 sys/arch/arm32/conf/Makefile.arm32
--- a/sys/arch/arm32/conf/Makefile.arm32 Mon Nov 26 23:54:49 2001 +0000
+++ b/sys/arch/arm32/conf/Makefile.arm32 Tue Nov 27 00:15:58 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.arm32,v 1.62 2001/11/26 23:52:34 thorpej Exp $
+# $NetBSD: Makefile.arm32,v 1.63 2001/11/27 00:16:00 thorpej Exp $
# Makefile for NetBSD
#
@@ -59,6 +59,8 @@
LINKFLAGS= -Ttext ${LOADADDRESS} -e start
STRIPFLAGS= -g
+GENASSYM_EXTRAS+= ${ARM32}/arm32/genassym.cf
+
%INCLUDES
HOSTED_CC= ${CC}
diff -r e165f752f578 -r f41b6f878e29 sys/arch/cats/conf/Makefile.cats.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/cats/conf/Makefile.cats.inc Tue Nov 27 00:15:58 2001 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.cats.inc,v 1.1 2001/11/27 00:15:59 thorpej Exp $
+
+GENASSYM_EXTRAS+= ${ARM}/footbridge/genassym.cf
diff -r e165f752f578 -r f41b6f878e29 sys/arch/dnard/conf/Makefile.dnard.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/dnard/conf/Makefile.dnard.inc Tue Nov 27 00:15:58 2001 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.dnard.inc,v 1.1 2001/11/27 00:15:59 thorpej Exp $
+
+GENASSYM_EXTRAS+= ${THISARM}/dnard/genassym.cf
diff -r e165f752f578 -r f41b6f878e29 sys/arch/dnard/dnard/genassym.cf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/dnard/dnard/genassym.cf Tue Nov 27 00:15:58 2001 +0000
@@ -0,0 +1,55 @@
+# $NetBSD: genassym.cf,v 1.1 2001/11/27 00:15:59 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 <machine/intr.h>
+
+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)
+
+define FH_FUNC offsetof(struct fiqhandler, fh_func)
+define FH_R8 offsetof(struct fiqhandler, fh_r8)
+define FH_R9 offsetof(struct fiqhandler, fh_r9)
+define FH_R10 offsetof(struct fiqhandler, fh_r10)
+define FH_R11 offsetof(struct fiqhandler, fh_r11)
+define FH_R12 offsetof(struct fiqhandler, fh_r12)
+define FH_R13 offsetof(struct fiqhandler, fh_r13)
+define FH_MASK offsetof(struct fiqhandler, fh_mask)
diff -r e165f752f578 -r f41b6f878e29 sys/arch/evbarm/conf/Makefile.evbarm.inc
--- a/sys/arch/evbarm/conf/Makefile.evbarm.inc Mon Nov 26 23:54:49 2001 +0000
+++ b/sys/arch/evbarm/conf/Makefile.evbarm.inc Tue Nov 27 00:15:58 2001 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.evbarm.inc,v 1.4 2001/11/20 12:56:25 lukem Exp $
+# $NetBSD: Makefile.evbarm.inc,v 1.5 2001/11/27 00:16:00 thorpej Exp $
.if (${BOARDTYPE} == "integrator")
+GENASSYM_EXTRAS+= ${THISARM}/ifpga/genassym.cf
SYSTEM_FIRST_OBJ= intmmu.o
SYSTEM_FIRST_SFILE= ${THISARM}/integrator/intmmu.S
.endif
@@ -10,6 +11,7 @@
${DBSYM} $@ || true
Home |
Main Index |
Thread Index |
Old Index