[src/trunk]: src/sys/arch/evbmips renamed pb1000_intr to reflect that it isn'...

[gdamore <gdamore%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4702d425618f
branches:  trunk
changeset: 588087:4702d425618f
user:      gdamore <gdamore%NetBSD.org@localhost>
date:      Tue Feb 07 18:57:12 2006 +0000

description:
renamed pb1000_intr to reflect that it isn't board-specific.  Prune unused
pb1000_intr_establish/disestablish calls.

Change was reviewed by folks as part of PCI changes, and should be
non-controversial in any case.

diffstat:

 sys/arch/evbmips/alchemy/mach_intr.c   |   78 +++++++++++++++++++++++++
 sys/arch/evbmips/alchemy/pb1000_intr.c |  100 ---------------------------------
 sys/arch/evbmips/alchemy/pb1000var.h   |    8 +--
 sys/arch/evbmips/conf/files.pb1000     |    4 +-
 4 files changed, 81 insertions(+), 109 deletions(-)

diffs (217 lines):

diff -r 3e03375ac98e -r 4702d425618f sys/arch/evbmips/alchemy/mach_intr.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/evbmips/alchemy/mach_intr.c      Tue Feb 07 18:57:12 2006 +0000
@@ -0,0 +1,78 @@
+/*     $NetBSD: mach_intr.c,v 1.1 2006/02/07 18:57:12 gdamore Exp $    */
+
+/*-
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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 NetBSD
+ *     Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+/*
+ * Platform-specific interrupt support for the Alchemy parts.
+ *
+ * These boards just use the interrupt controller built into the
+ * Alchemy processors, so we just provide evbmips-compliant wrapper
+ * routines.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: mach_intr.c,v 1.1 2006/02/07 18:57:12 gdamore Exp $");
+
+#include "opt_ddb.h"
+
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/malloc.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/kernel.h>
+
+#include <machine/bus.h>
+#include <machine/intr.h>
+
+#include <mips/locore.h>
+#include <mips/alchemy/include/auvar.h>
+#include <mips/alchemy/include/aubusvar.h>
+
+void
+evbmips_intr_init(void)
+{
+       au_intr_init();
+}
+
+void
+evbmips_iointr(u_int32_t status, u_int32_t cause, u_int32_t pc,
+    u_int32_t ipending)
+{
+
+       au_iointr(status, cause, pc, ipending);
+}
diff -r 3e03375ac98e -r 4702d425618f sys/arch/evbmips/alchemy/pb1000_intr.c
--- a/sys/arch/evbmips/alchemy/pb1000_intr.c    Tue Feb 07 17:23:23 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-/*     $NetBSD: pb1000_intr.c,v 1.3 2005/12/11 12:17:11 christos Exp $ */
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * 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 NetBSD
- *     Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-/*
- * Platform-specific interrupt support for the Alchemy Semiconductor Pb1000.
- *
- * The Alchemy Semiconductor Pb1000's interrupts are wired to two internal
- * interrupt controllers.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pb1000_intr.c,v 1.3 2005/12/11 12:17:11 christos Exp $");
-
-#include "opt_ddb.h"
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/malloc.h>
-#include <sys/systm.h>
-#include <sys/device.h>
-#include <sys/kernel.h>
-
-#include <machine/bus.h>
-#include <machine/intr.h>
-
-#include <mips/locore.h>
-#include <mips/alchemy/include/auvar.h>
-
-#include <evbmips/evbmips/clockvar.h>
-#include <mips/alchemy/include/aubusvar.h>
-#include <evbmips/alchemy/pb1000reg.h>
-#include <evbmips/alchemy/pb1000var.h>
-
-#include <dev/ic/mc146818reg.h>
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcivar.h>
-
-void
-evbmips_intr_init(void)
-{
-       au_intr_init();
-}
-
-void *
-pb1000_intr_establish(int irq, int req, int level, int type,
-    int (*func)(void *), void *arg)
-{
-
-       return (au_intr_establish(irq, req, level, type, func, arg));
-}
-
-void
-pb1000_intr_disestablish(void *cookie)
-{
-
-       return (au_intr_disestablish(cookie));
-}
-
-void
-evbmips_iointr(u_int32_t status, u_int32_t cause, u_int32_t pc,
-    u_int32_t ipending)
-{
-
-       au_iointr(status, cause, pc, ipending);
-}
diff -r 3e03375ac98e -r 4702d425618f sys/arch/evbmips/alchemy/pb1000var.h
--- a/sys/arch/evbmips/alchemy/pb1000var.h      Tue Feb 07 17:23:23 2006 +0000
+++ b/sys/arch/evbmips/alchemy/pb1000var.h      Tue Feb 07 18:57:12 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pb1000var.h,v 1.1 2002/07/29 16:22:59 simonb Exp $     */
+/*     $NetBSD: pb1000var.h,v 1.2 2006/02/07 18:57:12 gdamore Exp $    */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -45,9 +45,3 @@
        struct mips_bus_space pc_cpuregt;
 };
 
-#ifdef _KERNEL
-extern struct pb1000_config pb1000_configuration;
-
-void *pb1000_intr_establish(int, int, int, int, int (*)(void *), void *);
-void pb1000_intr_disestablish(void *);
-#endif /* _KERNEL */
diff -r 3e03375ac98e -r 4702d425618f sys/arch/evbmips/conf/files.pb1000
--- a/sys/arch/evbmips/conf/files.pb1000        Tue Feb 07 17:23:23 2006 +0000
+++ b/sys/arch/evbmips/conf/files.pb1000        Tue Feb 07 18:57:12 2006 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: files.pb1000,v 1.9 2005/12/11 12:17:11 christos Exp $
+#      $NetBSD: files.pb1000,v 1.10 2006/02/07 18:57:12 gdamore Exp $
 
-file   arch/evbmips/alchemy/pb1000_intr.c
+file   arch/evbmips/alchemy/mach_intr.c
 
 file   arch/evbmips/alchemy/autoconf.c
 file   arch/evbmips/alchemy/machdep.c