pc32: Split out isa_intr.h and move isa/intr_machdep.h to include/

diff --git a/sys/platform/pc32/apic/apic_abi.c b/sys/platform/pc32/apic/apic_abi.c
index 332595e..68d79d0 100644 (file)
--- a/sys/platform/pc32/apic/apic_abi.c
+++ b/sys/platform/pc32/apic/apic_abi.c
@@ -50,7 +50,7 @@
 #include <machine/smp.h>
 #include <machine/segments.h>
 #include <machine/md_var.h>
-#include <machine_base/isa/intr_machdep.h>
+#include <machine/intr_machdep.h>
 #include <machine_base/icu/icu.h>
 #include <machine/globaldata.h>
 

diff --git a/sys/platform/pc32/apic/apic_vector.s b/sys/platform/pc32/apic/apic_vector.s
index de515db..c571d30 100644 (file)
--- a/sys/platform/pc32/apic/apic_vector.s
+++ b/sys/platform/pc32/apic/apic_vector.s
@@ -18,7 +18,7 @@
 #include "apicreg.h"
 #include "apic_ipl.h"
 #include <machine/smp.h>
-#include <machine_base/isa/intr_machdep.h>
+#include <machine/intr_machdep.h>
 
 /* convert an absolute IRQ# into bitmask */
 #define IRQ_LBIT(irq_num)      (1 << ((irq_num) & 0x1f))

diff --git a/sys/platform/pc32/apic/mpapic.c b/sys/platform/pc32/apic/mpapic.c
index f7c3f5d..488dce2 100644 (file)
--- a/sys/platform/pc32/apic/mpapic.c
+++ b/sys/platform/pc32/apic/mpapic.c
@@ -37,7 +37,7 @@
 #include <machine/segments.h>
 #include <sys/thread2.h>
 
-#include <machine_base/isa/intr_machdep.h>     /* Xspuriousint() */
+#include <machine/intr_machdep.h>
 
 /* XXX */
 extern pt_entry_t *SMPpt;

diff --git a/sys/platform/pc32/conf/files b/sys/platform/pc32/conf/files
index d6b1321..64a6586 100644 (file)
--- a/sys/platform/pc32/conf/files
+++ b/sys/platform/pc32/conf/files
@@ -235,7 +235,7 @@ dev/netif/el/if_el.c                        optional        el
 dev/netif/le/if_le.c                   optional        le
 dev/netif/rdp/if_rdp.c                 optional nowerror       rdp
 dev/netif/wl/if_wl.c                   optional        wl
-platform/pc32/isa/intr_machdep.c       standard
+platform/pc32/isa/isa_intr.c           standard
 bus/isa/i386/isa.c                     optional        isa
 bus/isa/i386/isa_compat.c              optional nowerror       isa compat_oldisa
 bus/isa/i386/isa_dma.c                 optional        isa

diff --git a/sys/platform/pc32/i386/identcpu.c b/sys/platform/pc32/i386/identcpu.c
index 9d90e37..ea8a6d9 100644 (file)
--- a/sys/platform/pc32/i386/identcpu.c
+++ b/sys/platform/pc32/i386/identcpu.c
@@ -52,8 +52,7 @@
 #include <machine/segments.h>
 #include <machine/specialreg.h>
 #include <machine/md_var.h>
-
-#include <machine_base/isa/intr_machdep.h>
+#include <machine/intr_machdep.h>
 
 #define        IDENTBLUE_CYRIX486      0
 #define        IDENTBLUE_IBMCPU        1

diff --git a/sys/platform/pc32/i386/machdep.c b/sys/platform/pc32/i386/machdep.c
index eb9cc66..df36dcb 100644 (file)
--- a/sys/platform/pc32/i386/machdep.c
+++ b/sys/platform/pc32/i386/machdep.c
@@ -106,11 +106,12 @@
 #include <machine/perfmon.h>
 #endif
 #include <machine/cputypes.h>
+#include <machine/intr_machdep.h>
 
 #ifdef OLD_BUS_ARCH
 #include <bus/isa/isa_device.h>
 #endif
-#include <machine_base/isa/intr_machdep.h>
+#include <machine_base/isa/isa_intr.h>
 #include <machine_base/isa/elcr_var.h>
 #include <bus/isa/rtc.h>
 #include <machine/vm86.h>

diff --git a/sys/platform/pc32/i386/mp_machdep.c b/sys/platform/pc32/i386/mp_machdep.c
index 24ec767..a4f85ad 100644 (file)
--- a/sys/platform/pc32/i386/mp_machdep.c
+++ b/sys/platform/pc32/i386/mp_machdep.c
@@ -65,8 +65,8 @@
 #include <machine/pmap_inval.h>
 
 #include <machine/md_var.h>            /* setidt() */
-#include <machine_base/icu/icu.h>              /* IPIs */
-#include <machine_base/isa/intr_machdep.h>     /* IPIs */
+#include <machine_base/icu/icu.h>      /* IPIs */
+#include <machine/intr_machdep.h>      /* IPIs */
 
 #define FIXUP_EXTRA_APIC_INTS  8       /* additional entries we may create */
 

diff --git a/sys/platform/pc32/i386/nexus.c b/sys/platform/pc32/i386/nexus.c
index 49d1cfd..765fedc 100644 (file)
--- a/sys/platform/pc32/i386/nexus.c
+++ b/sys/platform/pc32/i386/nexus.c
@@ -57,7 +57,6 @@
 #include <machine/nexusvar.h>
 #include <machine/smp.h>
 #include <machine_base/apic/mpapic.h>
-#include <machine_base/isa/intr_machdep.h>
 
 #include <bus/pci/pcivar.h>
 #include <bus/pci/pcireg.h>

diff --git a/sys/platform/pc32/i386/trap.c b/sys/platform/pc32/i386/trap.c
index 18ed5e2..1e51fbd 100644 (file)
--- a/sys/platform/pc32/i386/trap.c
+++ b/sys/platform/pc32/i386/trap.c
@@ -92,8 +92,9 @@
 #include <machine/tss.h>
 #include <machine/specialreg.h>
 #include <machine/globaldata.h>
+#include <machine/intr_machdep.h>
 
-#include <machine_base/isa/intr_machdep.h>
+#include <machine_base/isa/isa_intr.h>
 
 #ifdef POWERFAIL_NMI
 #include <sys/syslog.h>

diff --git a/sys/platform/pc32/icu/icu.c b/sys/platform/pc32/icu/icu.c
index 56a6bd4..e302907 100644 (file)
--- a/sys/platform/pc32/icu/icu.c
+++ b/sys/platform/pc32/icu/icu.c
@@ -53,7 +53,7 @@
 #include <bus/isa/isareg.h>
 #include <cpu/cpufunc.h>
 #include <machine/smp.h>
-#include <machine_base/isa/intr_machdep.h>
+#include <machine/intr_machdep.h>
 #include <machine_base/icu/icu.h>
 #include <machine_base/icu/icu_var.h>
 

diff --git a/sys/platform/pc32/icu/icu_abi.c b/sys/platform/pc32/icu/icu_abi.c
index 024737c..3953c5c 100644 (file)
--- a/sys/platform/pc32/icu/icu_abi.c
+++ b/sys/platform/pc32/icu/icu_abi.c
@@ -48,7 +48,7 @@
 
 #include <machine/segments.h>
 #include <machine/md_var.h>
-#include <machine_base/isa/intr_machdep.h>
+#include <machine/intr_machdep.h>
 #include <machine/globaldata.h>
 #include <machine/smp.h>
 

diff --git a/sys/platform/pc32/isa/intr_machdep.h b/sys/platform/pc32/include/intr_machdep.h
similarity index 99%
rename from sys/platform/pc32/isa/intr_machdep.h
rename to sys/platform/pc32/include/intr_machdep.h
index 69d0d44..2f03813 100644 (file)
--- a/sys/platform/pc32/isa/intr_machdep.h
+++ b/sys/platform/pc32/include/intr_machdep.h
@@ -153,9 +153,6 @@ inthand_t
        Xipiq;          /* handle lwkt_send_ipiq() requests */
 #endif /* SMP */
 
-void   isa_defaultirq(void);
-int    isa_nmi(int);
-
 #endif /* LOCORE */
 
 #endif /* _KERNEL */

diff --git a/sys/platform/pc32/isa/clock.c b/sys/platform/pc32/isa/clock.c
index 4d04d55..71434a2 100644 (file)
--- a/sys/platform/pc32/isa/clock.c
+++ b/sys/platform/pc32/isa/clock.c
@@ -87,7 +87,7 @@
 #include <bus/isa/rtc.h>
 #include <machine_base/isa/timerreg.h>
 
-#include <machine_base/isa/intr_machdep.h>
+#include <machine/intr_machdep.h>
 
 #ifdef SMP /* APIC-IO */
 /* The interrupt triggered by the 8254 (timer) chip */

diff --git a/sys/platform/pc32/isa/intr_machdep.c b/sys/platform/pc32/isa/isa_intr.c
similarity index 98%
rename from sys/platform/pc32/isa/intr_machdep.c
rename to sys/platform/pc32/isa/isa_intr.c
index b168176..04fb58d 100644 (file)
--- a/sys/platform/pc32/isa/intr_machdep.c
+++ b/sys/platform/pc32/isa/isa_intr.c
@@ -53,7 +53,7 @@
 #include <bus/isa/isavar.h>
 
 #include <machine_base/icu/icu_var.h>
-#include <machine_base/isa/intr_machdep.h>
+#include <machine_base/isa/isa_intr.h>
 
 #define NMI_PARITY (1 << 7)
 #define NMI_IOCHAN (1 << 6)

diff --git a/sys/platform/pc32/isa/isa_intr.h b/sys/platform/pc32/isa/isa_intr.h
new file mode 100644 (file)
index 0000000..d587572
--- /dev/null
+++ b/sys/platform/pc32/isa/isa_intr.h
@@ -0,0 +1,43 @@
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * 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.
+ *
+ * $FreeBSD: src/sys/i386/isa/intr_machdep.h,v 1.19.2.2 2001/10/14 20:05:50 luigi Exp $
+ * $DragonFly: src/sys/platform/pc32/isa/intr_machdep.h,v 1.25 2006/10/23 21:50:31 dillon Exp $
+ */
+
+#ifndef _ARCH_ISA_ISA_INTR_H_
+#define        _ARCH_ISA_ISA_INTR_H_
+
+void   isa_defaultirq(void);
+int    isa_nmi(int);
+
+#endif /* !_ARCH_ISA_ISA_INTR_H_ */

diff --git a/sys/platform/pc32/isa/npx.c b/sys/platform/pc32/isa/npx.c
index 6c3033f..6cdedd5 100644 (file)
--- a/sys/platform/pc32/isa/npx.c
+++ b/sys/platform/pc32/isa/npx.c
@@ -75,7 +75,7 @@
 
 #ifndef SMP
 #include <machine_base/icu/icu.h>
-#include <machine_base/isa/intr_machdep.h>
+#include <machine/intr_machdep.h>
 #include <bus/isa/isa.h>
 #endif