From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Wed, 13 Apr 2011 02:58:43 +0000 (+0800)
Subject: elcr: File relocate
X-Git-Tag: v2.11.0~56^2~15
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/7265a4feee0107567b99cf33234328bdb5ed8eca?hp=e4c6fb37675bc9946cc4a4cf75c76f7440b98e1d

elcr: File relocate
---

diff --git a/sys/platform/pc32/conf/files b/sys/platform/pc32/conf/files
index 65f4af3f15..88d04fed11 100644
--- a/sys/platform/pc32/conf/files
+++ b/sys/platform/pc32/conf/files
@@ -189,6 +189,7 @@ platform/pc32/icu/icu.c			standard
 platform/pc32/icu/icu_abi.c		standard
 platform/pc32/icu/icu_ipl.s		standard
 platform/pc32/icu/icu_vector.s		standard
+platform/pc32/icu/elcr.c		standard
 platform/pc32/apic/ioapic_abi.c		optional	smp
 platform/pc32/apic/mpapic.c		optional	smp
 platform/pc32/apic/ioapic_ipl.s		optional	smp
@@ -224,7 +225,6 @@ platform/pc32/acpica5/acpi_fadt.c	standard
 platform/pc32/acpica5/acpi_madt.c	optional	smp
 platform/pc32/isa/asc.c			optional	asc
 platform/pc32/isa/clock.c		standard nowerror
-platform/pc32/isa/elcr.c		standard
 dev/video/ctx/ctx.c			optional	ctx
 dev/serial/cy/cy.c			optional	cy
 dev/netif/elink_layer/elink.c		optional	ep
diff --git a/sys/platform/pc32/i386/machdep.c b/sys/platform/pc32/i386/machdep.c
index a673b5200f..273e976764 100644
--- a/sys/platform/pc32/i386/machdep.c
+++ b/sys/platform/pc32/i386/machdep.c
@@ -112,7 +112,6 @@
 #include <bus/isa/isa_device.h>
 #endif
 #include <machine_base/isa/isa_intr.h>
-#include <machine_base/isa/elcr_var.h>
 #include <bus/isa/rtc.h>
 #include <machine/vm86.h>
 #include <sys/random.h>
@@ -121,6 +120,7 @@
 
 #include <sys/machintr.h>
 #include <machine_base/icu/icu_abi.h>
+#include <machine_base/icu/elcr_var.h>
 #include <machine_base/apic/ioapic_abi.h>
 
 #define PHYSMAP_ENTRIES		10
diff --git a/sys/platform/pc64/isa/elcr.c b/sys/platform/pc32/icu/elcr.c
similarity index 99%
rename from sys/platform/pc64/isa/elcr.c
rename to sys/platform/pc32/icu/elcr.c
index 849d4295ad..5e74cbfcbc 100644
--- a/sys/platform/pc64/isa/elcr.c
+++ b/sys/platform/pc32/icu/elcr.c
@@ -50,7 +50,7 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 
-#include <machine_base/isa/elcr_var.h>
+#include <machine_base/icu/elcr_var.h>
 
 #define	ELCR_PORT	0x4d0
 #define	ELCR_MASK(irq)	(1 << (irq))
diff --git a/sys/platform/pc32/isa/elcr_var.h b/sys/platform/pc32/icu/elcr_var.h
similarity index 100%
rename from sys/platform/pc32/isa/elcr_var.h
rename to sys/platform/pc32/icu/elcr_var.h
diff --git a/sys/platform/pc32/icu/icu_abi.c b/sys/platform/pc32/icu/icu_abi.c
index 6fe5cc803f..d76f93c5a8 100644
--- a/sys/platform/pc32/icu/icu_abi.c
+++ b/sys/platform/pc32/icu/icu_abi.c
@@ -54,10 +54,10 @@
 
 #include <sys/thread2.h>
 
-#include <machine_base/isa/elcr_var.h>
+#include <machine_base/icu/elcr_var.h>
 
-#include "icu.h"
-#include "icu_ipl.h"
+#include <machine_base/icu/icu.h>
+#include <machine_base/icu/icu_ipl.h>
 
 extern inthand_t
 	IDTVEC(icu_intr0),	IDTVEC(icu_intr1),
diff --git a/sys/platform/pc64/conf/files b/sys/platform/pc64/conf/files
index 1cd21acab2..4fb5ac2f21 100644
--- a/sys/platform/pc64/conf/files
+++ b/sys/platform/pc64/conf/files
@@ -181,6 +181,7 @@ platform/pc64/icu/icu.c                 standard
 platform/pc64/icu/icu_abi.c             standard
 platform/pc64/icu/icu_ipl.s             standard
 platform/pc64/icu/icu_vector.s          standard
+platform/pc64/icu/elcr.c		standard
 
 bus/pci/x86_64/legacy.c			optional	pci
 bus/pci/x86_64/pci_bus.c			optional	pci
@@ -210,6 +211,5 @@ dev/serial/sio/sio.c			optional	sio
 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/isa_intr.c		standard
 platform/pc64/x86_64/spinlock.s		standard
diff --git a/sys/platform/pc32/isa/elcr.c b/sys/platform/pc64/icu/elcr.c
similarity index 99%
rename from sys/platform/pc32/isa/elcr.c
rename to sys/platform/pc64/icu/elcr.c
index 849d4295ad..5e74cbfcbc 100644
--- a/sys/platform/pc32/isa/elcr.c
+++ b/sys/platform/pc64/icu/elcr.c
@@ -50,7 +50,7 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 
-#include <machine_base/isa/elcr_var.h>
+#include <machine_base/icu/elcr_var.h>
 
 #define	ELCR_PORT	0x4d0
 #define	ELCR_MASK(irq)	(1 << (irq))
diff --git a/sys/platform/pc64/isa/elcr_var.h b/sys/platform/pc64/icu/elcr_var.h
similarity index 100%
rename from sys/platform/pc64/isa/elcr_var.h
rename to sys/platform/pc64/icu/elcr_var.h
diff --git a/sys/platform/pc64/icu/icu_abi.c b/sys/platform/pc64/icu/icu_abi.c
index 78d01d733c..165b3084d4 100644
--- a/sys/platform/pc64/icu/icu_abi.c
+++ b/sys/platform/pc64/icu/icu_abi.c
@@ -54,10 +54,10 @@
 
 #include <sys/thread2.h>
 
-#include <machine_base/isa/elcr_var.h>
+#include <machine_base/icu/elcr_var.h>
 
-#include "icu.h"
-#include "icu_ipl.h"
+#include <machine_base/icu/icu.h>
+#include <machine_base/icu/icu_ipl.h>
 
 extern inthand_t
 	IDTVEC(icu_intr0),	IDTVEC(icu_intr1),
diff --git a/sys/platform/pc64/x86_64/machdep.c b/sys/platform/pc64/x86_64/machdep.c
index 95f8da2996..c9e08d91e6 100644
--- a/sys/platform/pc64/x86_64/machdep.c
+++ b/sys/platform/pc64/x86_64/machdep.c
@@ -115,7 +115,6 @@
 #include <bus/isa/isa_device.h>
 #endif
 #include <machine_base/isa/isa_intr.h>
-#include <machine_base/isa/elcr_var.h>
 #include <bus/isa/rtc.h>
 #include <sys/random.h>
 #include <sys/ptrace.h>
@@ -123,6 +122,7 @@
 
 #include <sys/machintr.h>
 #include <machine_base/icu/icu_abi.h>
+#include <machine_base/icu/elcr_var.h>
 #include <machine_base/apic/ioapic_abi.h>
 
 #define PHYSMAP_ENTRIES		10