x86_64: apic/mpapic.h -> apic/lapic.h
authorSepherosa Ziehau <sephe@dragonflybsd.org>
Wed, 4 May 2011 08:36:53 +0000 (16:36 +0800)
committerSepherosa Ziehau <sephe@dragonflybsd.org>
Wed, 4 May 2011 08:36:53 +0000 (16:36 +0800)
sys/platform/pc64/acpica5/acpi_fadt.c
sys/platform/pc64/acpica5/acpi_madt.c
sys/platform/pc64/acpica5/acpi_sdt.c
sys/platform/pc64/apic/ioapic.c
sys/platform/pc64/apic/lapic.c
sys/platform/pc64/apic/lapic.h [moved from sys/platform/pc64/apic/mpapic.h with 82% similarity]
sys/platform/pc64/include/smp.h
sys/platform/pc64/x86_64/mp_machdep.c
sys/platform/pc64/x86_64/nexus.c

index 2907196..c69cb88 100644 (file)
@@ -43,7 +43,6 @@
 #include <machine/smp.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
-#include <machine_base/apic/mpapic.h>
 
 #include "acpi_sdt.h"
 #include "acpi_sdt_var.h"
index ef6b924..18e9d30 100644 (file)
@@ -41,7 +41,7 @@
 #include <machine/smp.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
-#include <machine_base/apic/mpapic.h>
+#include <machine_base/apic/lapic.h>
 
 #include "acpi_sdt.h"
 #include "acpi_sdt_var.h"
index 64c2b9e..133737b 100644 (file)
@@ -41,7 +41,6 @@
 #include <machine/smp.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
-#include <machine_base/apic/mpapic.h>
 
 #include "acpi_sdt.h"
 #include "acpi_sdt_var.h"
index 4336aec..c78a0e1 100644 (file)
@@ -34,7 +34,7 @@
 #include <machine/smp.h>
 #include <machine/md_var.h>
 #include <machine/pmap.h>
-#include <machine_base/apic/mpapic.h>
+#include <machine_base/apic/lapic.h>
 #include <machine_base/apic/ioapic_abi.h>
 #include <machine/segments.h>
 #include <sys/thread2.h>
index b56d40e..d2af754 100644 (file)
@@ -34,7 +34,7 @@
 #include <machine/smp.h>
 #include <machine/md_var.h>
 #include <machine/pmap.h>
-#include <machine_base/apic/mpapic.h>
+#include <machine_base/apic/lapic.h>
 #include <machine_base/apic/ioapic_abi.h>
 #include <machine/segments.h>
 #include <sys/thread2.h>
similarity index 82%
rename from sys/platform/pc64/apic/mpapic.h
rename to sys/platform/pc64/apic/lapic.h
index ff0f952..79021d1 100644 (file)
  * $DragonFly: src/sys/platform/pc64/apic/mpapic.h,v 1.1 2008/08/29 17:07:12 dillon Exp $
  */
 
-#ifndef _MACHINE_MPAPIC_H_
-#define _MACHINE_MPAPIC_H_
+#ifndef _ARCH_APIC_LAPIC_H_
+#define _ARCH_APIC_LAPIC_H_
 
 #include "apicreg.h"
 
-#include <machine_base/icu/icu.h>
-
-/*
- * Size of APIC ID list.
- * Also used a MAX size of various other arrays.
- */
-#define NAPICID                256
-
-/* these don't really belong in here... */
-enum busTypes {
-    CBUS = 1,
-    CBUSII = 2,
-    EISA = 3,
-    MCA = 4,
-    ISA = 6,
-    PCI = 13,
-    XPRESS = 18,
-    MAX_BUSTYPE = 18,
-    UNKNOWN_BUSTYPE = 0xff
-};
-
-
 /*
  * the physical/logical APIC ID management macros
  */
@@ -78,4 +56,4 @@ all_but_self_ipi(int vector)
 void   lapic_map(vm_offset_t /* XXX should be vm_paddr_t */);
 int    lapic_unused_apic_id(int);
 
-#endif /* _MACHINE_MPAPIC_H */
+#endif /* _ARCH_APIC_LAPIC_H_ */
index 5ec1199..8db40b5 100644 (file)
@@ -23,6 +23,12 @@ void initializecpu(void);
 
 #endif /* LOCORE */
 
+/*
+ * Size of APIC ID list.
+ * Also used a MAX size of various other arrays.
+ */
+#define NAPICID                256
+
 #if defined(SMP)
 
 #ifndef LOCORE
index 191123e..8a2a2c5 100644 (file)
@@ -54,7 +54,7 @@
 #include <machine_base/apic/apicreg.h>
 #include <machine/atomic.h>
 #include <machine/cpufunc.h>
-#include <machine_base/apic/mpapic.h>
+#include <machine_base/apic/lapic.h>
 #include <machine/psl.h>
 #include <machine/segments.h>
 #include <machine/tss.h>
index b9b8c68..9314d64 100644 (file)
@@ -58,7 +58,6 @@
 
 #include <machine/nexusvar.h>
 #include <machine/smp.h>
-#include <machine_base/apic/mpapic.h>
 
 #define I386_BUS_SPACE_IO       0       /* space is i/o space */
 #define I386_BUS_SPACE_MEM      1       /* space is mem space */