From 2b6cd37ed44b94584863b0d3542f8c67d3cb8566 Mon Sep 17 00:00:00 2001
From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Wed, 4 May 2011 16:36:53 +0800
Subject: [PATCH] x86_64: apic/mpapic.h -> apic/lapic.h

---
 sys/platform/pc64/acpica5/acpi_fadt.c        |  1 -
 sys/platform/pc64/acpica5/acpi_madt.c        |  2 +-
 sys/platform/pc64/acpica5/acpi_sdt.c         |  1 -
 sys/platform/pc64/apic/ioapic.c              |  2 +-
 sys/platform/pc64/apic/lapic.c               |  2 +-
 sys/platform/pc64/apic/{mpapic.h => lapic.h} | 28 +++-----------------
 sys/platform/pc64/include/smp.h              |  6 +++++
 sys/platform/pc64/x86_64/mp_machdep.c        |  2 +-
 sys/platform/pc64/x86_64/nexus.c             |  1 -
 9 files changed, 13 insertions(+), 32 deletions(-)
 rename sys/platform/pc64/apic/{mpapic.h => lapic.h} (82%)

diff --git a/sys/platform/pc64/acpica5/acpi_fadt.c b/sys/platform/pc64/acpica5/acpi_fadt.c
index 29071969c0..c69cb885fc 100644
--- a/sys/platform/pc64/acpica5/acpi_fadt.c
+++ b/sys/platform/pc64/acpica5/acpi_fadt.c
@@ -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"
diff --git a/sys/platform/pc64/acpica5/acpi_madt.c b/sys/platform/pc64/acpica5/acpi_madt.c
index ef6b924330..18e9d305c0 100644
--- a/sys/platform/pc64/acpica5/acpi_madt.c
+++ b/sys/platform/pc64/acpica5/acpi_madt.c
@@ -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"
diff --git a/sys/platform/pc64/acpica5/acpi_sdt.c b/sys/platform/pc64/acpica5/acpi_sdt.c
index 64c2b9e88b..133737bf4f 100644
--- a/sys/platform/pc64/acpica5/acpi_sdt.c
+++ b/sys/platform/pc64/acpica5/acpi_sdt.c
@@ -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"
diff --git a/sys/platform/pc64/apic/ioapic.c b/sys/platform/pc64/apic/ioapic.c
index 4336aecefc..c78a0e1d45 100644
--- a/sys/platform/pc64/apic/ioapic.c
+++ b/sys/platform/pc64/apic/ioapic.c
@@ -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>
diff --git a/sys/platform/pc64/apic/lapic.c b/sys/platform/pc64/apic/lapic.c
index b56d40e678..d2af754d08 100644
--- a/sys/platform/pc64/apic/lapic.c
+++ b/sys/platform/pc64/apic/lapic.c
@@ -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>
diff --git a/sys/platform/pc64/apic/mpapic.h b/sys/platform/pc64/apic/lapic.h
similarity index 82%
rename from sys/platform/pc64/apic/mpapic.h
rename to sys/platform/pc64/apic/lapic.h
index ff0f952713..79021d1d61 100644
--- a/sys/platform/pc64/apic/mpapic.h
+++ b/sys/platform/pc64/apic/lapic.h
@@ -27,33 +27,11 @@
  * $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_ */
diff --git a/sys/platform/pc64/include/smp.h b/sys/platform/pc64/include/smp.h
index 5ec1199241..8db40b5394 100644
--- a/sys/platform/pc64/include/smp.h
+++ b/sys/platform/pc64/include/smp.h
@@ -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
diff --git a/sys/platform/pc64/x86_64/mp_machdep.c b/sys/platform/pc64/x86_64/mp_machdep.c
index 191123e988..8a2a2c56f1 100644
--- a/sys/platform/pc64/x86_64/mp_machdep.c
+++ b/sys/platform/pc64/x86_64/mp_machdep.c
@@ -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>
diff --git a/sys/platform/pc64/x86_64/nexus.c b/sys/platform/pc64/x86_64/nexus.c
index b9b8c68cbc..9314d64652 100644
--- 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>
 
 #define I386_BUS_SPACE_IO       0       /* space is i/o space */
 #define I386_BUS_SPACE_MEM      1       /* space is mem space */
-- 
2.41.0