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

diff --git a/sys/platform/pc64/apic/apic_abi.c b/sys/platform/pc64/apic/apic_abi.c
index 97ba321..5731547 100644 (file)
--- a/sys/platform/pc64/apic/apic_abi.c
+++ b/sys/platform/pc64/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/pc64/apic/apic_vector.s b/sys/platform/pc64/apic/apic_vector.s
index 56ad6ec..3603069 100644 (file)
--- a/sys/platform/pc64/apic/apic_vector.s
+++ b/sys/platform/pc64/apic/apic_vector.s
@@ -21,7 +21,7 @@
 #include "apicreg.h"
 #include "apic_ipl.h"
 #include <machine/smp.h>
-#include <machine_base/isa/intr_machdep.h>
+#include <machine/intr_machdep.h>
 
 #ifdef foo
 /* convert an absolute IRQ# into bitmask */

diff --git a/sys/platform/pc64/apic/mpapic.c b/sys/platform/pc64/apic/mpapic.c
index 059e9ca..65711e6 100644 (file)
--- a/sys/platform/pc64/apic/mpapic.c
+++ b/sys/platform/pc64/apic/mpapic.c
@@ -36,7 +36,7 @@
 #include <machine/segments.h>
 #include <sys/thread2.h>
 
-#include <machine_base/isa/intr_machdep.h>     /* Xspuriousint() */
+#include <machine/intr_machdep.h>
 
 #include "apicvar.h"
 

diff --git a/sys/platform/pc64/conf/files b/sys/platform/pc64/conf/files
index adb27f4..29426b4 100644 (file)
--- a/sys/platform/pc64/conf/files
+++ b/sys/platform/pc64/conf/files
@@ -209,5 +209,5 @@ bus/isa/syscons_isa.c                       optional        sc
 bus/isa/vga_isa.c                      optional        vga
 platform/pc64/isa/clock.c              standard nowerror
 platform/pc64/isa/elcr.c               standard
-platform/pc64/isa/intr_machdep.c       standard
+platform/pc64/isa/isa_intr.c           standard
 platform/pc64/x86_64/spinlock.s                standard

diff --git a/sys/platform/pc64/icu/icu.c b/sys/platform/pc64/icu/icu.c
index 6727405..584c9a6 100644 (file)
--- a/sys/platform/pc64/icu/icu.c
+++ b/sys/platform/pc64/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/pc64/icu/icu_abi.c b/sys/platform/pc64/icu/icu_abi.c
index 663ae51..751dace 100644 (file)
--- a/sys/platform/pc64/icu/icu_abi.c
+++ b/sys/platform/pc64/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/pc64/isa/intr_machdep.h b/sys/platform/pc64/include/intr_machdep.h
similarity index 96%
rename from sys/platform/pc64/isa/intr_machdep.h
rename to sys/platform/pc64/include/intr_machdep.h
index bc77056..aaae503 100644 (file)
--- a/sys/platform/pc64/isa/intr_machdep.h
+++ b/sys/platform/pc64/include/intr_machdep.h
@@ -35,8 +35,8 @@
  * $DragonFly: src/sys/platform/pc64/isa/intr_machdep.h,v 1.1 2008/08/29 17:07:19 dillon Exp $
  */
 
-#ifndef _ARCH_ISA_INTR_MACHDEP_H_
-#define        _ARCH_ISA_INTR_MACHDEP_H_
+#ifndef _ARCH_INTR_MACHDEP_H_
+#define        _ARCH_INTR_MACHDEP_H_
 
 #ifndef LOCORE
 #ifndef _SYS_TYPES_H_
@@ -157,11 +157,8 @@ inthand_t
        Xipiq;          /* handle lwkt_send_ipiq() requests */
 #endif /* SMP */
 
-void   isa_defaultirq(void);
-int    isa_nmi(int);
-
 #endif /* LOCORE */
 
 #endif /* _KERNEL */
 
-#endif /* !_ARCH_ISA_INTR_MACHDEP_H_ */
+#endif /* !_ARCH_INTR_MACHDEP_H_ */

diff --git a/sys/platform/pc64/isa/clock.c b/sys/platform/pc64/isa/clock.c
index f315811..ea5a589 100644 (file)
--- a/sys/platform/pc64/isa/clock.c
+++ b/sys/platform/pc64/isa/clock.c
@@ -84,14 +84,13 @@
 #include <machine/segments.h>
 #include <machine/smp.h>
 #include <machine/specialreg.h>
+#include <machine/intr_machdep.h>
 
 #include <machine_base/icu/icu.h>
 #include <bus/isa/isa.h>
 #include <bus/isa/rtc.h>
 #include <machine_base/isa/timerreg.h>
 
-#include <machine_base/isa/intr_machdep.h>
-
 #ifdef SMP /* APIC-IO */
 /* The interrupt triggered by the 8254 (timer) chip */
 int apic_8254_intr;

diff --git a/sys/platform/pc64/isa/intr_machdep.c b/sys/platform/pc64/isa/isa_intr.c
similarity index 98%
rename from sys/platform/pc64/isa/intr_machdep.c
rename to sys/platform/pc64/isa/isa_intr.c
index 9640819..b6028bc 100644 (file)
--- a/sys/platform/pc64/isa/intr_machdep.c
+++ b/sys/platform/pc64/isa/isa_intr.c
@@ -54,7 +54,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/pc64/isa/isa_intr.h b/sys/platform/pc64/isa/isa_intr.h
new file mode 100644 (file)
index 0000000..6aa66eb
--- /dev/null
+++ b/sys/platform/pc64/isa/isa_intr.h
@@ -0,0 +1,44 @@
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
+ * Copyright (c) 2008 The DragonFly Project.
+ * 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/pc64/isa/intr_machdep.h,v 1.1 2008/08/29 17:07:19 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/pc64/x86_64/identcpu.c b/sys/platform/pc64/x86_64/identcpu.c
index 858598d..98c8652 100644 (file)
--- a/sys/platform/pc64/x86_64/identcpu.c
+++ b/sys/platform/pc64/x86_64/identcpu.c
@@ -53,7 +53,6 @@
 #include <machine/clock.h>
 #include <machine/cputypes.h>
 #include <machine/frame.h>
-#include <machine_base/isa/intr_machdep.h>
 #include <machine/segments.h>
 #include <machine/specialreg.h>
 #include <machine/md_var.h>

diff --git a/sys/platform/pc64/x86_64/machdep.c b/sys/platform/pc64/x86_64/machdep.c
index a5ce94a..eae84d1 100644 (file)
--- a/sys/platform/pc64/x86_64/machdep.c
+++ b/sys/platform/pc64/x86_64/machdep.c
@@ -109,11 +109,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 <sys/random.h>

diff --git a/sys/platform/pc64/x86_64/mp_machdep.c b/sys/platform/pc64/x86_64/mp_machdep.c
index a4a7822..c426c1b 100644 (file)
--- a/sys/platform/pc64/x86_64/mp_machdep.c
+++ b/sys/platform/pc64/x86_64/mp_machdep.c
@@ -64,8 +64,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/pc64/x86_64/nexus.c b/sys/platform/pc64/x86_64/nexus.c
index 8cdcfa5..d396b61 100644 (file)
--- a/sys/platform/pc64/x86_64/nexus.c
+++ b/sys/platform/pc64/x86_64/nexus.c
@@ -58,7 +58,6 @@
 #include <machine/nexusvar.h>
 #include <machine/smp.h>
 #include <machine_base/apic/mpapic.h>
-#include <machine_base/isa/intr_machdep.h>
 
 #define I386_BUS_SPACE_IO       0       /* space is i/o space */
 #define I386_BUS_SPACE_MEM      1       /* space is mem space */

diff --git a/sys/platform/pc64/x86_64/support.s b/sys/platform/pc64/x86_64/support.s
index 83314d0..b74c56b 100644 (file)
--- a/sys/platform/pc64/x86_64/support.s
+++ b/sys/platform/pc64/x86_64/support.s
@@ -34,7 +34,6 @@
 #include "opt_ddb.h"
 
 #include <machine/asmacros.h>
-#include <machine_base/isa/intr_machdep.h>
 #include <machine/pmap.h>
 
 #include "assym.s"

diff --git a/sys/platform/pc64/x86_64/trap.c b/sys/platform/pc64/x86_64/trap.c
index f3bd6b1..6a4eca5 100644 (file)
--- a/sys/platform/pc64/x86_64/trap.c
+++ b/sys/platform/pc64/x86_64/trap.c
@@ -79,7 +79,7 @@
 #include <machine/thread.h>
 #include <machine/vmparam.h>
 #include <machine/md_var.h>
-#include <machine_base/isa/intr_machdep.h>
+#include <machine_base/isa/isa_intr.h>
 
 #include <ddb/ddb.h>