From 5db2f26edd92ab4befeb61802687554b3ee6769a Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Thu, 3 Jan 2013 21:27:34 +0100 Subject: [PATCH] kernel: Move sys/dev/acpica5 to sys/dev/acpica. The 5 used to indicate that it was imported from FreeBSD 5 but that doesn't matter anymore. In-discussion-with: sephe --- include/Makefile | 2 +- sys/conf/acpi.mk | 7 ++----- sys/conf/kmod.mk | 2 +- sys/dev/Makefile | 2 +- sys/dev/{acpica5 => acpica}/Makefile | 0 sys/dev/{acpica5 => acpica}/Makefile.inc | 2 -- sys/dev/{acpica5 => acpica}/Osd/OsdCache.c | 2 -- sys/dev/{acpica5 => acpica}/Osd/OsdDebug.c | 1 - sys/dev/{acpica5 => acpica}/Osd/OsdHardware.c | 0 sys/dev/{acpica5 => acpica}/Osd/OsdInterrupt.c | 5 ++--- sys/dev/{acpica5 => acpica}/Osd/OsdMemory.c | 1 - sys/dev/{acpica5 => acpica}/Osd/OsdSchedule.c | 2 +- sys/dev/{acpica5 => acpica}/Osd/OsdStream.c | 1 - sys/dev/{acpica5 => acpica}/Osd/OsdSynch.c | 1 - sys/dev/{acpica5 => acpica}/Osd/OsdTable.c | 1 - sys/dev/{acpica5 => acpica}/acdragonfly.h | 0 sys/dev/{acpica5 => acpica}/acpi.c | 4 ++-- sys/dev/{acpica5 => acpica}/acpi_acad.c | 4 ++-- sys/dev/{acpica5 => acpica}/acpi_asus/Makefile | 0 sys/dev/{acpica5 => acpica}/acpi_asus/acpi_asus.c | 0 sys/dev/{acpica5 => acpica}/acpi_battery.c | 4 ++-- sys/dev/{acpica5 => acpica}/acpi_button.c | 2 +- sys/dev/{acpica5 => acpica}/acpi_cmbat.c | 4 ++-- sys/dev/{acpica5 => acpica}/acpi_cpu.c | 0 sys/dev/{acpica5 => acpica}/acpi_cpu.h | 0 sys/dev/{acpica5 => acpica}/acpi_cpu_cstate.c | 0 sys/dev/{acpica5 => acpica}/acpi_cpu_pstate.c | 0 sys/dev/{acpica5 => acpica}/acpi_cpu_pstate.h | 0 sys/dev/{acpica5 => acpica}/acpi_ec.c | 2 +- sys/dev/{acpica5 => acpica}/acpi_fujitsu/Makefile | 0 sys/dev/{acpica5 => acpica}/acpi_fujitsu/acpi_fujitsu.c | 2 +- sys/dev/{acpica5 => acpica}/acpi_hp/Makefile | 0 sys/dev/{acpica5 => acpica}/acpi_hp/acpi_hp.c | 2 +- sys/dev/{acpica5 => acpica}/acpi_hpet.c | 0 sys/dev/{acpica5 => acpica}/acpi_hpet.h | 0 sys/dev/{acpica5 => acpica}/acpi_if.m | 0 sys/dev/{acpica5 => acpica}/acpi_isab.c | 2 +- sys/dev/{acpica5 => acpica}/acpi_lid.c | 2 +- sys/dev/{acpica5 => acpica}/acpi_package.c | 2 +- sys/dev/{acpica5 => acpica}/acpi_panasonic/Makefile | 0 .../{acpica5 => acpica}/acpi_panasonic/acpi_panasonic.c | 2 +- sys/dev/{acpica5 => acpica}/acpi_pci.c | 0 sys/dev/{acpica5 => acpica}/acpi_pci_link.c | 6 +++--- sys/dev/{acpica5 => acpica}/acpi_pcib.c | 4 ++-- sys/dev/{acpica5 => acpica}/acpi_pcib_acpi.c | 4 ++-- sys/dev/{acpica5 => acpica}/acpi_pcib_pci.c | 4 ++-- sys/dev/{acpica5 => acpica}/acpi_pcibvar.h | 0 sys/dev/{acpica5 => acpica}/acpi_powerres.c | 2 +- sys/dev/{acpica5 => acpica}/acpi_resource.c | 2 +- sys/dev/{acpica5 => acpica}/acpi_sci_var.h | 0 sys/dev/{acpica5 => acpica}/acpi_smbat.c | 0 sys/dev/{acpica5 => acpica}/acpi_smbus.h | 0 sys/dev/{acpica5 => acpica}/acpi_sony/Makefile | 0 sys/dev/{acpica5 => acpica}/acpi_sony/acpi_sony.c | 2 +- sys/dev/{acpica5 => acpica}/acpi_thermal.c | 2 +- sys/dev/{acpica5 => acpica}/acpi_thinkpad/Makefile | 0 sys/dev/{acpica5 => acpica}/acpi_thinkpad/acpi_thinkpad.c | 1 - sys/dev/{acpica5 => acpica}/acpi_timer.c | 0 sys/dev/{acpica5 => acpica}/acpi_toshiba/Makefile | 0 sys/dev/{acpica5 => acpica}/acpi_toshiba/acpi_toshiba.c | 2 +- sys/dev/{acpica5 => acpica}/acpi_video/Makefile | 0 sys/dev/{acpica5 => acpica}/acpi_video/acpi_video.c | 1 - sys/dev/{acpica5 => acpica}/acpi_wmi/Makefile | 0 sys/dev/{acpica5 => acpica}/acpi_wmi/acpi_wmi.c | 2 +- sys/dev/{acpica5 => acpica}/acpi_wmi_if.m | 0 sys/dev/{acpica5 => acpica}/acpiio.h | 0 sys/dev/{acpica5 => acpica}/acpivar.h | 0 sys/dev/{acpica5 => acpica}/aibs/Makefile | 0 sys/dev/{acpica5 => acpica}/aibs/atk0110.c | 2 +- sys/platform/pc32/Makefile.inc | 2 +- sys/platform/pc32/{acpica5 => acpica}/Makefile | 1 - .../{pc64/acpica5 => pc32/acpica}/OsdEnvironment.c | 1 - sys/platform/pc32/{acpica5 => acpica}/acpi_cpu_machdep.c | 0 sys/platform/pc32/{acpica5 => acpica}/acpi_fadt.c | 0 sys/platform/pc32/{acpica5 => acpica}/acpi_machdep.c | 4 ++-- sys/platform/pc32/{acpica5 => acpica}/acpi_madt.c | 0 .../pc32/{acpica5 => acpica}/acpi_pstate_machdep.c | 0 sys/platform/pc32/{acpica5 => acpica}/acpi_sdt.c | 0 sys/platform/pc32/{acpica5 => acpica}/acpi_sdt.h | 0 sys/platform/pc32/{acpica5 => acpica}/acpi_sdt_var.h | 0 sys/platform/pc32/{acpica5 => acpica}/acpi_wakecode.S | 1 - sys/platform/pc32/{acpica5 => acpica}/acpi_wakeup.c | 2 +- sys/platform/{pc64/acpica5 => pc32/acpica}/genwakecode.sh | 1 - sys/platform/pc32/apic/ioapic_abi.c | 2 +- sys/platform/pc32/conf/files | 6 +++--- sys/platform/pc64/Makefile.inc | 2 +- sys/platform/pc64/{acpica5 => acpica}/Makefile | 1 - .../{pc32/acpica5 => pc64/acpica}/OsdEnvironment.c | 1 - sys/platform/pc64/{acpica5 => acpica}/acpi_cpu_machdep.c | 0 sys/platform/pc64/{acpica5 => acpica}/acpi_fadt.c | 0 sys/platform/pc64/{acpica5 => acpica}/acpi_machdep.c | 4 ++-- sys/platform/pc64/{acpica5 => acpica}/acpi_madt.c | 0 .../pc64/{acpica5 => acpica}/acpi_pstate_machdep.c | 0 sys/platform/pc64/{acpica5 => acpica}/acpi_sdt.c | 0 sys/platform/pc64/{acpica5 => acpica}/acpi_sdt.h | 0 sys/platform/pc64/{acpica5 => acpica}/acpi_sdt_var.h | 0 sys/platform/pc64/{acpica5 => acpica}/acpi_wakecode.S | 1 - sys/platform/pc64/{acpica5 => acpica}/acpi_wakeup.c | 2 +- sys/platform/{pc32/acpica5 => pc64/acpica}/genwakecode.sh | 1 - sys/platform/pc64/apic/ioapic_abi.c | 2 +- sys/platform/pc64/conf/files | 6 +++--- 101 files changed, 56 insertions(+), 79 deletions(-) rename sys/dev/{acpica5 => acpica}/Makefile (100%) rename sys/dev/{acpica5 => acpica}/Makefile.inc (76%) rename sys/dev/{acpica5 => acpica}/Osd/OsdCache.c (97%) rename sys/dev/{acpica5 => acpica}/Osd/OsdDebug.c (97%) rename sys/dev/{acpica5 => acpica}/Osd/OsdHardware.c (100%) rename sys/dev/{acpica5 => acpica}/Osd/OsdInterrupt.c (96%) rename sys/dev/{acpica5 => acpica}/Osd/OsdMemory.c (98%) rename sys/dev/{acpica5 => acpica}/Osd/OsdSchedule.c (99%) rename sys/dev/{acpica5 => acpica}/Osd/OsdStream.c (95%) rename sys/dev/{acpica5 => acpica}/Osd/OsdSynch.c (99%) rename sys/dev/{acpica5 => acpica}/Osd/OsdTable.c (96%) rename sys/dev/{acpica5 => acpica}/acdragonfly.h (100%) rename sys/dev/{acpica5 => acpica}/acpi.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_acad.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_asus/Makefile (100%) rename sys/dev/{acpica5 => acpica}/acpi_asus/acpi_asus.c (100%) rename sys/dev/{acpica5 => acpica}/acpi_battery.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_button.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_cmbat.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_cpu.c (100%) rename sys/dev/{acpica5 => acpica}/acpi_cpu.h (100%) rename sys/dev/{acpica5 => acpica}/acpi_cpu_cstate.c (100%) rename sys/dev/{acpica5 => acpica}/acpi_cpu_pstate.c (100%) rename sys/dev/{acpica5 => acpica}/acpi_cpu_pstate.h (100%) rename sys/dev/{acpica5 => acpica}/acpi_ec.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_fujitsu/Makefile (100%) rename sys/dev/{acpica5 => acpica}/acpi_fujitsu/acpi_fujitsu.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_hp/Makefile (100%) rename sys/dev/{acpica5 => acpica}/acpi_hp/acpi_hp.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_hpet.c (100%) rename sys/dev/{acpica5 => acpica}/acpi_hpet.h (100%) rename sys/dev/{acpica5 => acpica}/acpi_if.m (100%) rename sys/dev/{acpica5 => acpica}/acpi_isab.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_lid.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_package.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_panasonic/Makefile (100%) rename sys/dev/{acpica5 => acpica}/acpi_panasonic/acpi_panasonic.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_pci.c (100%) rename sys/dev/{acpica5 => acpica}/acpi_pci_link.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_pcib.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_pcib_acpi.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_pcib_pci.c (98%) rename sys/dev/{acpica5 => acpica}/acpi_pcibvar.h (100%) rename sys/dev/{acpica5 => acpica}/acpi_powerres.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_resource.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_sci_var.h (100%) rename sys/dev/{acpica5 => acpica}/acpi_smbat.c (100%) rename sys/dev/{acpica5 => acpica}/acpi_smbus.h (100%) rename sys/dev/{acpica5 => acpica}/acpi_sony/Makefile (100%) rename sys/dev/{acpica5 => acpica}/acpi_sony/acpi_sony.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_thermal.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_thinkpad/Makefile (100%) rename sys/dev/{acpica5 => acpica}/acpi_thinkpad/acpi_thinkpad.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_timer.c (100%) rename sys/dev/{acpica5 => acpica}/acpi_toshiba/Makefile (100%) rename sys/dev/{acpica5 => acpica}/acpi_toshiba/acpi_toshiba.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_video/Makefile (100%) rename sys/dev/{acpica5 => acpica}/acpi_video/acpi_video.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_wmi/Makefile (100%) rename sys/dev/{acpica5 => acpica}/acpi_wmi/acpi_wmi.c (99%) rename sys/dev/{acpica5 => acpica}/acpi_wmi_if.m (100%) rename sys/dev/{acpica5 => acpica}/acpiio.h (100%) rename sys/dev/{acpica5 => acpica}/acpivar.h (100%) rename sys/dev/{acpica5 => acpica}/aibs/Makefile (100%) rename sys/dev/{acpica5 => acpica}/aibs/atk0110.c (99%) rename sys/platform/pc32/{acpica5 => acpica}/Makefile (86%) rename sys/platform/{pc64/acpica5 => pc32/acpica}/OsdEnvironment.c (95%) rename sys/platform/pc32/{acpica5 => acpica}/acpi_cpu_machdep.c (100%) rename sys/platform/pc32/{acpica5 => acpica}/acpi_fadt.c (100%) rename sys/platform/pc32/{acpica5 => acpica}/acpi_machdep.c (99%) rename sys/platform/pc32/{acpica5 => acpica}/acpi_madt.c (100%) rename sys/platform/pc32/{acpica5 => acpica}/acpi_pstate_machdep.c (100%) rename sys/platform/pc32/{acpica5 => acpica}/acpi_sdt.c (100%) rename sys/platform/pc32/{acpica5 => acpica}/acpi_sdt.h (100%) rename sys/platform/pc32/{acpica5 => acpica}/acpi_sdt_var.h (100%) rename sys/platform/pc32/{acpica5 => acpica}/acpi_wakecode.S (98%) rename sys/platform/pc32/{acpica5 => acpica}/acpi_wakeup.c (99%) rename sys/platform/{pc64/acpica5 => pc32/acpica}/genwakecode.sh (80%) rename sys/platform/pc64/{acpica5 => acpica}/Makefile (86%) rename sys/platform/{pc32/acpica5 => pc64/acpica}/OsdEnvironment.c (95%) rename sys/platform/pc64/{acpica5 => acpica}/acpi_cpu_machdep.c (100%) rename sys/platform/pc64/{acpica5 => acpica}/acpi_fadt.c (100%) rename sys/platform/pc64/{acpica5 => acpica}/acpi_machdep.c (99%) rename sys/platform/pc64/{acpica5 => acpica}/acpi_madt.c (100%) rename sys/platform/pc64/{acpica5 => acpica}/acpi_pstate_machdep.c (100%) rename sys/platform/pc64/{acpica5 => acpica}/acpi_sdt.c (100%) rename sys/platform/pc64/{acpica5 => acpica}/acpi_sdt.h (100%) rename sys/platform/pc64/{acpica5 => acpica}/acpi_sdt_var.h (100%) rename sys/platform/pc64/{acpica5 => acpica}/acpi_wakecode.S (98%) rename sys/platform/pc64/{acpica5 => acpica}/acpi_wakeup.c (98%) rename sys/platform/{pc32/acpica5 => pc64/acpica}/genwakecode.sh (80%) diff --git a/include/Makefile b/include/Makefile index d99b455f16..675ec5c08d 100644 --- a/include/Makefile +++ b/include/Makefile @@ -181,7 +181,7 @@ copies: mtree_setup ${DESTDIR}/usr/include/crypto; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 opencrypto/*.h \ ${DESTDIR}/usr/include/crypto - cd ${.CURDIR}/../sys/dev/acpica5; \ + cd ${.CURDIR}/../sys/dev/acpica; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 acpiio.h \ ${DESTDIR}/usr/include/dev/acpica .if exists(${.CURDIR}/../sys/cpu/${MACHINE_ARCH}/include) diff --git a/sys/conf/acpi.mk b/sys/conf/acpi.mk index f5d93c7073..cbbf24be07 100644 --- a/sys/conf/acpi.mk +++ b/sys/conf/acpi.mk @@ -1,9 +1,6 @@ -# $DragonFly: src/sys/conf/acpi.mk,v 1.6 2007/01/19 07:23:42 dillon Exp $ -# - ACPICA_DIR?= contrib/dev/acpica-unix -OSACPI_MI_DIR?= dev/acpica5 -OSACPI_MD_DIR?= platform/${MACHINE_PLATFORM}/acpica5 +OSACPI_MI_DIR?= dev/acpica +OSACPI_MD_DIR?= platform/${MACHINE_PLATFORM}/acpica .if !defined(SYSDIR) && defined(S) SYSDIR= $S diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 51206d3269..0973c50e2f 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -304,7 +304,7 @@ MFILES?= kern/bus_if.m kern/device_if.m bus/iicbus/iicbb_if.m \ bus/pccard/card_if.m bus/pccard/power_if.m bus/pci/pci_if.m \ bus/pci/pcib_if.m \ bus/ppbus/ppbus_if.m bus/smbus/smbus_if.m \ - dev/acpica5/acpi_if.m dev/acpica5/acpi_wmi_if.m dev/disk/nata/ata_if.m \ + dev/acpica/acpi_if.m dev/acpica/acpi_wmi_if.m dev/disk/nata/ata_if.m \ dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \ libiconv/iconv_converter_if.m dev/agp/agp_if.m opencrypto/cryptodev_if.m \ diff --git a/sys/dev/Makefile b/sys/dev/Makefile index afad74d9b8..a32fdfc9f2 100644 --- a/sys/dev/Makefile +++ b/sys/dev/Makefile @@ -1,7 +1,7 @@ .include "../platform/${MACHINE_PLATFORM}/Makefile.inc" SUBDIR= \ - acpica5 \ + acpica \ agp \ crypto \ disk \ diff --git a/sys/dev/acpica5/Makefile b/sys/dev/acpica/Makefile similarity index 100% rename from sys/dev/acpica5/Makefile rename to sys/dev/acpica/Makefile diff --git a/sys/dev/acpica5/Makefile.inc b/sys/dev/acpica/Makefile.inc similarity index 76% rename from sys/dev/acpica5/Makefile.inc rename to sys/dev/acpica/Makefile.inc index fd95ef46f9..53923e0c36 100644 --- a/sys/dev/acpica5/Makefile.inc +++ b/sys/dev/acpica/Makefile.inc @@ -1,5 +1,3 @@ -# $DragonFly: src/sys/dev/acpica5/Makefile.inc,v 1.8 2007/01/17 17:31:19 y0netan1 Exp $ - .include "${SYSDIR}/conf/acpi.mk" CFLAGS+= -I${.OBJDIR} \ diff --git a/sys/dev/acpica5/Osd/OsdCache.c b/sys/dev/acpica/Osd/OsdCache.c similarity index 97% rename from sys/dev/acpica5/Osd/OsdCache.c rename to sys/dev/acpica/Osd/OsdCache.c index 2e083cef01..1929b6e724 100644 --- a/sys/dev/acpica5/Osd/OsdCache.c +++ b/sys/dev/acpica/Osd/OsdCache.c @@ -28,8 +28,6 @@ * 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. - * - * $DragonFly: src/sys/dev/acpica5/Osd/OsdCache.c,v 1.4 2007/03/26 02:34:39 y0netan1 Exp $ */ #include diff --git a/sys/dev/acpica5/Osd/OsdDebug.c b/sys/dev/acpica/Osd/OsdDebug.c similarity index 97% rename from sys/dev/acpica5/Osd/OsdDebug.c rename to sys/dev/acpica/Osd/OsdDebug.c index d5f1451cf5..5b3d79f5b9 100644 --- a/sys/dev/acpica5/Osd/OsdDebug.c +++ b/sys/dev/acpica/Osd/OsdDebug.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/Osd/OsdDebug.c,v 1.9 2004/09/02 04:28:05 njl Exp $ - * $DragonFly: src/sys/dev/acpica5/Osd/OsdDebug.c,v 1.6 2007/01/17 17:31:19 y0netan1 Exp $ */ /* diff --git a/sys/dev/acpica5/Osd/OsdHardware.c b/sys/dev/acpica/Osd/OsdHardware.c similarity index 100% rename from sys/dev/acpica5/Osd/OsdHardware.c rename to sys/dev/acpica/Osd/OsdHardware.c diff --git a/sys/dev/acpica5/Osd/OsdInterrupt.c b/sys/dev/acpica/Osd/OsdInterrupt.c similarity index 96% rename from sys/dev/acpica5/Osd/OsdInterrupt.c rename to sys/dev/acpica/Osd/OsdInterrupt.c index c255e7c657..b83e20b4d7 100644 --- a/sys/dev/acpica5/Osd/OsdInterrupt.c +++ b/sys/dev/acpica/Osd/OsdInterrupt.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.17 2004/04/14 03:41:06 njl Exp $ - * $DragonFly: src/sys/dev/acpica5/Osd/OsdInterrupt.c,v 1.7 2006/10/25 20:55:52 dillon Exp $ */ /* @@ -41,8 +40,8 @@ #include "acpi.h" #include "accommon.h" -#include -#include +#include +#include #define _COMPONENT ACPI_OS_SERVICES ACPI_MODULE_NAME("INTERRUPT") diff --git a/sys/dev/acpica5/Osd/OsdMemory.c b/sys/dev/acpica/Osd/OsdMemory.c similarity index 98% rename from sys/dev/acpica5/Osd/OsdMemory.c rename to sys/dev/acpica/Osd/OsdMemory.c index 6b4096db26..198c31e976 100644 --- a/sys/dev/acpica5/Osd/OsdMemory.c +++ b/sys/dev/acpica/Osd/OsdMemory.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/Osd/OsdMemory.c,v 1.11 2004/04/14 03:39:08 njl Exp $ - * $DragonFly: src/sys/dev/acpica5/Osd/OsdMemory.c,v 1.6 2007/01/17 17:31:19 y0netan1 Exp $ */ /* diff --git a/sys/dev/acpica5/Osd/OsdSchedule.c b/sys/dev/acpica/Osd/OsdSchedule.c similarity index 99% rename from sys/dev/acpica5/Osd/OsdSchedule.c rename to sys/dev/acpica/Osd/OsdSchedule.c index 99523dabc0..80ad8794a4 100644 --- a/sys/dev/acpica5/Osd/OsdSchedule.c +++ b/sys/dev/acpica/Osd/OsdSchedule.c @@ -50,7 +50,7 @@ #include "acpi.h" #include "accommon.h" -#include +#include #define _COMPONENT ACPI_OS_SERVICES ACPI_MODULE_NAME("SCHEDULE") diff --git a/sys/dev/acpica5/Osd/OsdStream.c b/sys/dev/acpica/Osd/OsdStream.c similarity index 95% rename from sys/dev/acpica5/Osd/OsdStream.c rename to sys/dev/acpica/Osd/OsdStream.c index f5dda0af49..f48db83c38 100644 --- a/sys/dev/acpica5/Osd/OsdStream.c +++ b/sys/dev/acpica/Osd/OsdStream.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/Osd/OsdStream.c,v 1.4 2004/04/14 03:39:08 njl Exp $ - * $DragonFly: src/sys/dev/acpica5/Osd/OsdStream.c,v 1.3 2006/12/18 20:41:01 dillon Exp $ */ /* diff --git a/sys/dev/acpica5/Osd/OsdSynch.c b/sys/dev/acpica/Osd/OsdSynch.c similarity index 99% rename from sys/dev/acpica5/Osd/OsdSynch.c rename to sys/dev/acpica/Osd/OsdSynch.c index c2d9ee5781..0a4ccb75bb 100644 --- a/sys/dev/acpica5/Osd/OsdSynch.c +++ b/sys/dev/acpica/Osd/OsdSynch.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/Osd/OsdSynch.c,v 1.21 2004/05/05 20:07:52 njl Exp $ - * $DragonFly: src/sys/dev/acpica5/Osd/OsdSynch.c,v 1.11 2007/01/25 15:12:06 y0netan1 Exp $ */ /* diff --git a/sys/dev/acpica5/Osd/OsdTable.c b/sys/dev/acpica/Osd/OsdTable.c similarity index 96% rename from sys/dev/acpica5/Osd/OsdTable.c rename to sys/dev/acpica/Osd/OsdTable.c index e7483c8db1..65ae373b47 100644 --- a/sys/dev/acpica5/Osd/OsdTable.c +++ b/sys/dev/acpica/Osd/OsdTable.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/Osd/OsdTable.c,v 1.7 2004/04/20 17:13:08 njl Exp $ - * $DragonFly: src/sys/dev/acpica5/Osd/OsdTable.c,v 1.3 2006/12/22 23:26:14 swildner Exp $ */ /* diff --git a/sys/dev/acpica5/acdragonfly.h b/sys/dev/acpica/acdragonfly.h similarity index 100% rename from sys/dev/acpica5/acdragonfly.h rename to sys/dev/acpica/acdragonfly.h diff --git a/sys/dev/acpica5/acpi.c b/sys/dev/acpica/acpi.c similarity index 99% rename from sys/dev/acpica5/acpi.c rename to sys/dev/acpica/acpi.c index 3cc9488ade..0ce2b3f658 100644 --- a/sys/dev/acpica5/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -53,8 +53,8 @@ #include #include "acpi.h" -#include -#include +#include +#include #include "achware.h" #include "acnamesp.h" #include "acglobal.h" diff --git a/sys/dev/acpica5/acpi_acad.c b/sys/dev/acpica/acpi_acad.c similarity index 99% rename from sys/dev/acpica5/acpi_acad.c rename to sys/dev/acpica/acpi_acad.c index ae083b60c8..d22807570b 100644 --- a/sys/dev/acpica5/acpi_acad.c +++ b/sys/dev/acpica/acpi_acad.c @@ -39,8 +39,8 @@ #include "acpi.h" -#include -#include +#include +#include #include #include diff --git a/sys/dev/acpica5/acpi_asus/Makefile b/sys/dev/acpica/acpi_asus/Makefile similarity index 100% rename from sys/dev/acpica5/acpi_asus/Makefile rename to sys/dev/acpica/acpi_asus/Makefile diff --git a/sys/dev/acpica5/acpi_asus/acpi_asus.c b/sys/dev/acpica/acpi_asus/acpi_asus.c similarity index 100% rename from sys/dev/acpica5/acpi_asus/acpi_asus.c rename to sys/dev/acpica/acpi_asus/acpi_asus.c diff --git a/sys/dev/acpica5/acpi_battery.c b/sys/dev/acpica/acpi_battery.c similarity index 99% rename from sys/dev/acpica5/acpi_battery.c rename to sys/dev/acpica/acpi_battery.c index 48034fc028..a23a66409c 100644 --- a/sys/dev/acpica5/acpi_battery.c +++ b/sys/dev/acpica/acpi_battery.c @@ -36,8 +36,8 @@ #include "acpi.h" -#include -#include +#include +#include /* Default seconds before re-sampling the battery state. */ #define ACPI_BATTERY_INFO_EXPIRE 5 diff --git a/sys/dev/acpica5/acpi_button.c b/sys/dev/acpica/acpi_button.c similarity index 99% rename from sys/dev/acpica5/acpi_button.c rename to sys/dev/acpica/acpi_button.c index 978f5446a0..2d23554d9c 100644 --- a/sys/dev/acpica5/acpi_button.c +++ b/sys/dev/acpica/acpi_button.c @@ -37,7 +37,7 @@ #include "acpi.h" #include "accommon.h" -#include +#include /* Hooks for the ACPI CA debugging infrastructure */ #define _COMPONENT ACPI_BUTTON diff --git a/sys/dev/acpica5/acpi_cmbat.c b/sys/dev/acpica/acpi_cmbat.c similarity index 99% rename from sys/dev/acpica5/acpi_cmbat.c rename to sys/dev/acpica/acpi_cmbat.c index 41b0d05fa5..168b23ab3d 100644 --- a/sys/dev/acpica5/acpi_cmbat.c +++ b/sys/dev/acpica/acpi_cmbat.c @@ -39,8 +39,8 @@ #include #include "acpi.h" -#include -#include +#include +#include MALLOC_DEFINE(M_ACPICMBAT, "acpicmbat", "ACPI control method battery data"); diff --git a/sys/dev/acpica5/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c similarity index 100% rename from sys/dev/acpica5/acpi_cpu.c rename to sys/dev/acpica/acpi_cpu.c diff --git a/sys/dev/acpica5/acpi_cpu.h b/sys/dev/acpica/acpi_cpu.h similarity index 100% rename from sys/dev/acpica5/acpi_cpu.h rename to sys/dev/acpica/acpi_cpu.h diff --git a/sys/dev/acpica5/acpi_cpu_cstate.c b/sys/dev/acpica/acpi_cpu_cstate.c similarity index 100% rename from sys/dev/acpica5/acpi_cpu_cstate.c rename to sys/dev/acpica/acpi_cpu_cstate.c diff --git a/sys/dev/acpica5/acpi_cpu_pstate.c b/sys/dev/acpica/acpi_cpu_pstate.c similarity index 100% rename from sys/dev/acpica5/acpi_cpu_pstate.c rename to sys/dev/acpica/acpi_cpu_pstate.c diff --git a/sys/dev/acpica5/acpi_cpu_pstate.h b/sys/dev/acpica/acpi_cpu_pstate.h similarity index 100% rename from sys/dev/acpica5/acpi_cpu_pstate.h rename to sys/dev/acpica/acpi_cpu_pstate.h diff --git a/sys/dev/acpica5/acpi_ec.c b/sys/dev/acpica/acpi_ec.c similarity index 99% rename from sys/dev/acpica5/acpi_ec.c rename to sys/dev/acpica/acpi_ec.c index 50e3fddd4f..aeab9e7a2f 100644 --- a/sys/dev/acpica5/acpi_ec.c +++ b/sys/dev/acpica/acpi_ec.c @@ -38,7 +38,7 @@ #include #include "acpi.h" -#include +#include #include "acutils.h" /* Hooks for the ACPI CA debugging infrastructure */ diff --git a/sys/dev/acpica5/acpi_fujitsu/Makefile b/sys/dev/acpica/acpi_fujitsu/Makefile similarity index 100% rename from sys/dev/acpica5/acpi_fujitsu/Makefile rename to sys/dev/acpica/acpi_fujitsu/Makefile diff --git a/sys/dev/acpica5/acpi_fujitsu/acpi_fujitsu.c b/sys/dev/acpica/acpi_fujitsu/acpi_fujitsu.c similarity index 99% rename from sys/dev/acpica5/acpi_fujitsu/acpi_fujitsu.c rename to sys/dev/acpica/acpi_fujitsu/acpi_fujitsu.c index 711a587d61..23749a6155 100644 --- a/sys/dev/acpica5/acpi_fujitsu/acpi_fujitsu.c +++ b/sys/dev/acpica/acpi_fujitsu/acpi_fujitsu.c @@ -38,7 +38,7 @@ #include "acpi.h" #include "accommon.h" -#include +#include /* Hooks for the ACPI CA debugging infrastructure */ #define _COMPONENT ACPI_OEM diff --git a/sys/dev/acpica5/acpi_hp/Makefile b/sys/dev/acpica/acpi_hp/Makefile similarity index 100% rename from sys/dev/acpica5/acpi_hp/Makefile rename to sys/dev/acpica/acpi_hp/Makefile diff --git a/sys/dev/acpica5/acpi_hp/acpi_hp.c b/sys/dev/acpica/acpi_hp/acpi_hp.c similarity index 99% rename from sys/dev/acpica5/acpi_hp/acpi_hp.c rename to sys/dev/acpica/acpi_hp/acpi_hp.c index 0ba8948d50..c6a86759f9 100644 --- a/sys/dev/acpica5/acpi_hp/acpi_hp.c +++ b/sys/dev/acpica/acpi_hp/acpi_hp.c @@ -56,7 +56,7 @@ #include "acpi.h" #include "accommon.h" -#include +#include #include "acpi_wmi_if.h" #define _COMPONENT ACPI_OEM diff --git a/sys/dev/acpica5/acpi_hpet.c b/sys/dev/acpica/acpi_hpet.c similarity index 100% rename from sys/dev/acpica5/acpi_hpet.c rename to sys/dev/acpica/acpi_hpet.c diff --git a/sys/dev/acpica5/acpi_hpet.h b/sys/dev/acpica/acpi_hpet.h similarity index 100% rename from sys/dev/acpica5/acpi_hpet.h rename to sys/dev/acpica/acpi_hpet.h diff --git a/sys/dev/acpica5/acpi_if.m b/sys/dev/acpica/acpi_if.m similarity index 100% rename from sys/dev/acpica5/acpi_if.m rename to sys/dev/acpica/acpi_if.m diff --git a/sys/dev/acpica5/acpi_isab.c b/sys/dev/acpica/acpi_isab.c similarity index 99% rename from sys/dev/acpica5/acpi_isab.c rename to sys/dev/acpica/acpi_isab.c index 12eea7a900..fd4819809f 100644 --- a/sys/dev/acpica5/acpi_isab.c +++ b/sys/dev/acpica/acpi_isab.c @@ -41,7 +41,7 @@ #include "acpi.h" #include "accommon.h" -#include +#include #include /* Hooks for the ACPI CA debugging infrastructure. */ diff --git a/sys/dev/acpica5/acpi_lid.c b/sys/dev/acpica/acpi_lid.c similarity index 99% rename from sys/dev/acpica5/acpi_lid.c rename to sys/dev/acpica/acpi_lid.c index fd953b0bcc..552445c9f8 100644 --- a/sys/dev/acpica5/acpi_lid.c +++ b/sys/dev/acpica/acpi_lid.c @@ -39,7 +39,7 @@ #include "acpi.h" #include "accommon.h" -#include +#include /* Hooks for the ACPI CA debugging infrastructure */ #define _COMPONENT ACPI_BUTTON diff --git a/sys/dev/acpica5/acpi_package.c b/sys/dev/acpica/acpi_package.c similarity index 99% rename from sys/dev/acpica5/acpi_package.c rename to sys/dev/acpica/acpi_package.c index e8a367ea5c..2f7c77fc91 100644 --- a/sys/dev/acpica5/acpi_package.c +++ b/sys/dev/acpica/acpi_package.c @@ -34,7 +34,7 @@ #include #include "acpi.h" -#include +#include /* * Package manipulation convenience functions diff --git a/sys/dev/acpica5/acpi_panasonic/Makefile b/sys/dev/acpica/acpi_panasonic/Makefile similarity index 100% rename from sys/dev/acpica5/acpi_panasonic/Makefile rename to sys/dev/acpica/acpi_panasonic/Makefile diff --git a/sys/dev/acpica5/acpi_panasonic/acpi_panasonic.c b/sys/dev/acpica/acpi_panasonic/acpi_panasonic.c similarity index 99% rename from sys/dev/acpica5/acpi_panasonic/acpi_panasonic.c rename to sys/dev/acpica/acpi_panasonic/acpi_panasonic.c index 1134aa38b1..7853323b27 100644 --- a/sys/dev/acpica5/acpi_panasonic/acpi_panasonic.c +++ b/sys/dev/acpica/acpi_panasonic/acpi_panasonic.c @@ -37,7 +37,7 @@ #include "acpi.h" -#include +#include #define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("Panasonic") diff --git a/sys/dev/acpica5/acpi_pci.c b/sys/dev/acpica/acpi_pci.c similarity index 100% rename from sys/dev/acpica5/acpi_pci.c rename to sys/dev/acpica/acpi_pci.c diff --git a/sys/dev/acpica5/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c similarity index 99% rename from sys/dev/acpica5/acpi_pci_link.c rename to sys/dev/acpica/acpi_pci_link.c index 5b18f6b539..83235c2798 100644 --- a/sys/dev/acpica5/acpi_pci_link.c +++ b/sys/dev/acpica/acpi_pci_link.c @@ -35,9 +35,9 @@ #include #include "acpi.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/sys/dev/acpica5/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c similarity index 99% rename from sys/dev/acpica5/acpi_pcib.c rename to sys/dev/acpica/acpi_pcib.c index e3a13b7777..abf6372bf6 100644 --- a/sys/dev/acpica5/acpi_pcib.c +++ b/sys/dev/acpica/acpi_pcib.c @@ -36,8 +36,8 @@ #include #include "acpi.h" -#include -#include +#include +#include #include #include diff --git a/sys/dev/acpica5/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c similarity index 99% rename from sys/dev/acpica5/acpi_pcib_acpi.c rename to sys/dev/acpica/acpi_pcib_acpi.c index a70c35e3b5..3935586c5b 100644 --- a/sys/dev/acpica5/acpi_pcib_acpi.c +++ b/sys/dev/acpica/acpi_pcib_acpi.c @@ -37,14 +37,14 @@ #include #include "acpi.h" -#include +#include #include #include #include #include "pcib_if.h" -#include +#include /* Hooks for the ACPI CA debugging infrastructure. */ #define _COMPONENT ACPI_BUS diff --git a/sys/dev/acpica5/acpi_pcib_pci.c b/sys/dev/acpica/acpi_pcib_pci.c similarity index 98% rename from sys/dev/acpica5/acpi_pcib_pci.c rename to sys/dev/acpica/acpi_pcib_pci.c index f91a7704de..f15f262255 100644 --- a/sys/dev/acpica5/acpi_pcib_pci.c +++ b/sys/dev/acpica/acpi_pcib_pci.c @@ -37,8 +37,8 @@ #include #include "acpi.h" -#include -#include +#include +#include #include #include diff --git a/sys/dev/acpica5/acpi_pcibvar.h b/sys/dev/acpica/acpi_pcibvar.h similarity index 100% rename from sys/dev/acpica5/acpi_pcibvar.h rename to sys/dev/acpica/acpi_pcibvar.h diff --git a/sys/dev/acpica5/acpi_powerres.c b/sys/dev/acpica/acpi_powerres.c similarity index 99% rename from sys/dev/acpica5/acpi_powerres.c rename to sys/dev/acpica/acpi_powerres.c index 76bf64cf88..cb4a7673b1 100644 --- a/sys/dev/acpica5/acpi_powerres.c +++ b/sys/dev/acpica/acpi_powerres.c @@ -33,7 +33,7 @@ #include #include "acpi.h" -#include +#include /* * ACPI power resource management. diff --git a/sys/dev/acpica5/acpi_resource.c b/sys/dev/acpica/acpi_resource.c similarity index 99% rename from sys/dev/acpica5/acpi_resource.c rename to sys/dev/acpica/acpi_resource.c index 2c47797ded..e3bc5697ce 100644 --- a/sys/dev/acpica5/acpi_resource.c +++ b/sys/dev/acpica/acpi_resource.c @@ -39,7 +39,7 @@ #include #include "acpi.h" -#include +#include /* Hooks for the ACPI CA debugging infrastructure */ #define _COMPONENT ACPI_BUS diff --git a/sys/dev/acpica5/acpi_sci_var.h b/sys/dev/acpica/acpi_sci_var.h similarity index 100% rename from sys/dev/acpica5/acpi_sci_var.h rename to sys/dev/acpica/acpi_sci_var.h diff --git a/sys/dev/acpica5/acpi_smbat.c b/sys/dev/acpica/acpi_smbat.c similarity index 100% rename from sys/dev/acpica5/acpi_smbat.c rename to sys/dev/acpica/acpi_smbat.c diff --git a/sys/dev/acpica5/acpi_smbus.h b/sys/dev/acpica/acpi_smbus.h similarity index 100% rename from sys/dev/acpica5/acpi_smbus.h rename to sys/dev/acpica/acpi_smbus.h diff --git a/sys/dev/acpica5/acpi_sony/Makefile b/sys/dev/acpica/acpi_sony/Makefile similarity index 100% rename from sys/dev/acpica5/acpi_sony/Makefile rename to sys/dev/acpica/acpi_sony/Makefile diff --git a/sys/dev/acpica5/acpi_sony/acpi_sony.c b/sys/dev/acpica/acpi_sony/acpi_sony.c similarity index 99% rename from sys/dev/acpica5/acpi_sony/acpi_sony.c rename to sys/dev/acpica/acpi_sony/acpi_sony.c index df2bf8d2d5..165184f9f1 100644 --- a/sys/dev/acpica5/acpi_sony/acpi_sony.c +++ b/sys/dev/acpica/acpi_sony/acpi_sony.c @@ -35,7 +35,7 @@ #include "acpi_if.h" #include -#include +#include #include #define _COMPONENT ACPI_OEM diff --git a/sys/dev/acpica5/acpi_thermal.c b/sys/dev/acpica/acpi_thermal.c similarity index 99% rename from sys/dev/acpica5/acpi_thermal.c rename to sys/dev/acpica/acpi_thermal.c index c5c202f211..ef64c8b7ed 100644 --- a/sys/dev/acpica5/acpi_thermal.c +++ b/sys/dev/acpica/acpi_thermal.c @@ -46,7 +46,7 @@ #include "acpi.h" #include "accommon.h" -#include +#include /* Hooks for the ACPI CA debugging infrastructure */ #define _COMPONENT ACPI_THERMAL diff --git a/sys/dev/acpica5/acpi_thinkpad/Makefile b/sys/dev/acpica/acpi_thinkpad/Makefile similarity index 100% rename from sys/dev/acpica5/acpi_thinkpad/Makefile rename to sys/dev/acpica/acpi_thinkpad/Makefile diff --git a/sys/dev/acpica5/acpi_thinkpad/acpi_thinkpad.c b/sys/dev/acpica/acpi_thinkpad/acpi_thinkpad.c similarity index 99% rename from sys/dev/acpica5/acpi_thinkpad/acpi_thinkpad.c rename to sys/dev/acpica/acpi_thinkpad/acpi_thinkpad.c index 67d9508318..b84ccba199 100644 --- a/sys/dev/acpica5/acpi_thinkpad/acpi_thinkpad.c +++ b/sys/dev/acpica/acpi_thinkpad/acpi_thinkpad.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpi_support/acpi_ibm.c,v 1.15 2007/10/25 17:30:18 jhb Exp $ - * $DragonFly: src/sys/dev/acpica5/acpi_thinkpad/acpi_thinkpad.c,v 1.2 2008/10/03 00:47:36 hasso Exp $ */ /* diff --git a/sys/dev/acpica5/acpi_timer.c b/sys/dev/acpica/acpi_timer.c similarity index 100% rename from sys/dev/acpica5/acpi_timer.c rename to sys/dev/acpica/acpi_timer.c diff --git a/sys/dev/acpica5/acpi_toshiba/Makefile b/sys/dev/acpica/acpi_toshiba/Makefile similarity index 100% rename from sys/dev/acpica5/acpi_toshiba/Makefile rename to sys/dev/acpica/acpi_toshiba/Makefile diff --git a/sys/dev/acpica5/acpi_toshiba/acpi_toshiba.c b/sys/dev/acpica/acpi_toshiba/acpi_toshiba.c similarity index 99% rename from sys/dev/acpica5/acpi_toshiba/acpi_toshiba.c rename to sys/dev/acpica/acpi_toshiba/acpi_toshiba.c index 5b6c8d4bd2..b4832f86ee 100644 --- a/sys/dev/acpica5/acpi_toshiba/acpi_toshiba.c +++ b/sys/dev/acpica/acpi_toshiba/acpi_toshiba.c @@ -34,7 +34,7 @@ #include "acpi.h" -#include +#include #define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("Toshiba") diff --git a/sys/dev/acpica5/acpi_video/Makefile b/sys/dev/acpica/acpi_video/Makefile similarity index 100% rename from sys/dev/acpica5/acpi_video/Makefile rename to sys/dev/acpica/acpi_video/Makefile diff --git a/sys/dev/acpica5/acpi_video/acpi_video.c b/sys/dev/acpica/acpi_video/acpi_video.c similarity index 99% rename from sys/dev/acpica5/acpi_video/acpi_video.c rename to sys/dev/acpica/acpi_video/acpi_video.c index b28d572c90..ddb04916e7 100644 --- a/sys/dev/acpica5/acpi_video/acpi_video.c +++ b/sys/dev/acpica/acpi_video/acpi_video.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/acpica/acpi_video.c,v 1.13 2006/08/10 13:18:02 bruno Exp $ - * $DragonFly: src/sys/dev/acpica5/acpi_video/acpi_video.c,v 1.2 2008/08/28 11:05:34 sephe Exp $ */ #include diff --git a/sys/dev/acpica5/acpi_wmi/Makefile b/sys/dev/acpica/acpi_wmi/Makefile similarity index 100% rename from sys/dev/acpica5/acpi_wmi/Makefile rename to sys/dev/acpica/acpi_wmi/Makefile diff --git a/sys/dev/acpica5/acpi_wmi/acpi_wmi.c b/sys/dev/acpica/acpi_wmi/acpi_wmi.c similarity index 99% rename from sys/dev/acpica5/acpi_wmi/acpi_wmi.c rename to sys/dev/acpica/acpi_wmi/acpi_wmi.c index 315ed285c1..860706500f 100644 --- a/sys/dev/acpica5/acpi_wmi/acpi_wmi.c +++ b/sys/dev/acpica/acpi_wmi/acpi_wmi.c @@ -50,7 +50,7 @@ #include "acpi.h" #include "accommon.h" -#include +#include #include "acpi_wmi_if.h" static MALLOC_DEFINE(M_ACPIWMI, "acpiwmi", "ACPI-WMI mapping"); diff --git a/sys/dev/acpica5/acpi_wmi_if.m b/sys/dev/acpica/acpi_wmi_if.m similarity index 100% rename from sys/dev/acpica5/acpi_wmi_if.m rename to sys/dev/acpica/acpi_wmi_if.m diff --git a/sys/dev/acpica5/acpiio.h b/sys/dev/acpica/acpiio.h similarity index 100% rename from sys/dev/acpica5/acpiio.h rename to sys/dev/acpica/acpiio.h diff --git a/sys/dev/acpica5/acpivar.h b/sys/dev/acpica/acpivar.h similarity index 100% rename from sys/dev/acpica5/acpivar.h rename to sys/dev/acpica/acpivar.h diff --git a/sys/dev/acpica5/aibs/Makefile b/sys/dev/acpica/aibs/Makefile similarity index 100% rename from sys/dev/acpica5/aibs/Makefile rename to sys/dev/acpica/aibs/Makefile diff --git a/sys/dev/acpica5/aibs/atk0110.c b/sys/dev/acpica/aibs/atk0110.c similarity index 99% rename from sys/dev/acpica5/aibs/atk0110.c rename to sys/dev/acpica/aibs/atk0110.c index ac31dddf2a..959ab68c08 100644 --- a/sys/dev/acpica5/aibs/atk0110.c +++ b/sys/dev/acpica/aibs/atk0110.c @@ -223,7 +223,7 @@ aibs_attach_sif(struct aibs_softc *sc, enum sensor_type st) for (i = 0, o++; i < n; i++, o++) { ACPI_OBJECT *oi; - /* acpica5 automatically evaluates the referenced package */ + /* acpica automatically evaluates the referenced package */ if (o[0].Type != ACPI_TYPE_PACKAGE) { device_printf(sc->sc_dev, "%s: %i: not a package: %i type\n", diff --git a/sys/platform/pc32/Makefile.inc b/sys/platform/pc32/Makefile.inc index 5639b12284..a14364817b 100644 --- a/sys/platform/pc32/Makefile.inc +++ b/sys/platform/pc32/Makefile.inc @@ -1,7 +1,7 @@ # Used by the device build to check for device support # -DEV_SUPPORT= acpica5 agp bridge crypto disk drm misc netif \ +DEV_SUPPORT= acpica agp bridge crypto disk drm misc netif \ pccard powermng raid serial sound usbmisc video SYSCONS_APM_SUPPORT=1 diff --git a/sys/platform/pc32/acpica5/Makefile b/sys/platform/pc32/acpica/Makefile similarity index 86% rename from sys/platform/pc32/acpica5/Makefile rename to sys/platform/pc32/acpica/Makefile index 5a4f5c61a8..60e6bbec30 100644 --- a/sys/platform/pc32/acpica5/Makefile +++ b/sys/platform/pc32/acpica/Makefile @@ -1,5 +1,4 @@ # $FreeBSD: src/sys/i386/acpica/Makefile,v 1.6 2004/04/13 13:43:11 des Exp $ -# $DragonFly: src/sys/platform/pc32/acpica5/Makefile,v 1.2 2004/06/27 08:52:45 dillon Exp $ # # Correct path for kernel builds diff --git a/sys/platform/pc64/acpica5/OsdEnvironment.c b/sys/platform/pc32/acpica/OsdEnvironment.c similarity index 95% rename from sys/platform/pc64/acpica5/OsdEnvironment.c rename to sys/platform/pc32/acpica/OsdEnvironment.c index a4a8159bfb..f2939f3482 100644 --- a/sys/platform/pc64/acpica5/OsdEnvironment.c +++ b/sys/platform/pc32/acpica/OsdEnvironment.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/acpica/OsdEnvironment.c,v 1.10 2004/05/06 02:18:58 njl Exp $ - * $DragonFly: src/sys/platform/pc32/acpica5/OsdEnvironment.c,v 1.3 2007/01/17 17:31:19 y0netan1 Exp $ */ /* diff --git a/sys/platform/pc32/acpica5/acpi_cpu_machdep.c b/sys/platform/pc32/acpica/acpi_cpu_machdep.c similarity index 100% rename from sys/platform/pc32/acpica5/acpi_cpu_machdep.c rename to sys/platform/pc32/acpica/acpi_cpu_machdep.c diff --git a/sys/platform/pc32/acpica5/acpi_fadt.c b/sys/platform/pc32/acpica/acpi_fadt.c similarity index 100% rename from sys/platform/pc32/acpica5/acpi_fadt.c rename to sys/platform/pc32/acpica/acpi_fadt.c diff --git a/sys/platform/pc32/acpica5/acpi_machdep.c b/sys/platform/pc32/acpica/acpi_machdep.c similarity index 99% rename from sys/platform/pc32/acpica5/acpi_machdep.c rename to sys/platform/pc32/acpica/acpi_machdep.c index cd6e060482..fa8a21e7bb 100644 --- a/sys/platform/pc32/acpica5/acpi_machdep.c +++ b/sys/platform/pc32/acpica/acpi_machdep.c @@ -36,8 +36,8 @@ #include #include "acpi.h" -#include -#include +#include +#include static device_t acpi_dev; diff --git a/sys/platform/pc32/acpica5/acpi_madt.c b/sys/platform/pc32/acpica/acpi_madt.c similarity index 100% rename from sys/platform/pc32/acpica5/acpi_madt.c rename to sys/platform/pc32/acpica/acpi_madt.c diff --git a/sys/platform/pc32/acpica5/acpi_pstate_machdep.c b/sys/platform/pc32/acpica/acpi_pstate_machdep.c similarity index 100% rename from sys/platform/pc32/acpica5/acpi_pstate_machdep.c rename to sys/platform/pc32/acpica/acpi_pstate_machdep.c diff --git a/sys/platform/pc32/acpica5/acpi_sdt.c b/sys/platform/pc32/acpica/acpi_sdt.c similarity index 100% rename from sys/platform/pc32/acpica5/acpi_sdt.c rename to sys/platform/pc32/acpica/acpi_sdt.c diff --git a/sys/platform/pc32/acpica5/acpi_sdt.h b/sys/platform/pc32/acpica/acpi_sdt.h similarity index 100% rename from sys/platform/pc32/acpica5/acpi_sdt.h rename to sys/platform/pc32/acpica/acpi_sdt.h diff --git a/sys/platform/pc32/acpica5/acpi_sdt_var.h b/sys/platform/pc32/acpica/acpi_sdt_var.h similarity index 100% rename from sys/platform/pc32/acpica5/acpi_sdt_var.h rename to sys/platform/pc32/acpica/acpi_sdt_var.h diff --git a/sys/platform/pc32/acpica5/acpi_wakecode.S b/sys/platform/pc32/acpica/acpi_wakecode.S similarity index 98% rename from sys/platform/pc32/acpica5/acpi_wakecode.S rename to sys/platform/pc32/acpica/acpi_wakecode.S index 0e03d81c81..e5e39ee16c 100644 --- a/sys/platform/pc32/acpica5/acpi_wakecode.S +++ b/sys/platform/pc32/acpica/acpi_wakecode.S @@ -25,7 +25,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/acpica/acpi_wakecode.S,v 1.9 2004/01/01 22:57:22 njl Exp $ - * $DragonFly: src/sys/platform/pc32/acpica5/acpi_wakecode.S,v 1.1 2004/02/21 06:48:05 dillon Exp $ */ #define LOCORE diff --git a/sys/platform/pc32/acpica5/acpi_wakeup.c b/sys/platform/pc32/acpica/acpi_wakeup.c similarity index 99% rename from sys/platform/pc32/acpica5/acpi_wakeup.c rename to sys/platform/pc32/acpica/acpi_wakeup.c index 4048e9e77e..3b6af07304 100644 --- a/sys/platform/pc32/acpica5/acpi_wakeup.c +++ b/sys/platform/pc32/acpica/acpi_wakeup.c @@ -46,7 +46,7 @@ #include #include "acpi.h" -#include +#include #include "acpi_wakecode.h" diff --git a/sys/platform/pc64/acpica5/genwakecode.sh b/sys/platform/pc32/acpica/genwakecode.sh similarity index 80% rename from sys/platform/pc64/acpica5/genwakecode.sh rename to sys/platform/pc32/acpica/genwakecode.sh index 0e4499e0fd..5090f4a824 100644 --- a/sys/platform/pc64/acpica5/genwakecode.sh +++ b/sys/platform/pc32/acpica/genwakecode.sh @@ -1,6 +1,5 @@ #!/bin/sh # $FreeBSD: src/sys/i386/acpica/genwakecode.sh,v 1.1 2002/05/01 21:52:34 peter Exp $ -# $DragonFly: src/sys/platform/pc32/acpica5/genwakecode.sh,v 1.1 2004/02/21 06:48:05 dillon Exp $ # echo "/* generated from `pwd`/acpi_wakecode.o */" echo 'static char wakecode[] = {'; diff --git a/sys/platform/pc32/apic/ioapic_abi.c b/sys/platform/pc32/apic/ioapic_abi.c index 071f0f2010..d03f98c336 100644 --- a/sys/platform/pc32/apic/ioapic_abi.c +++ b/sys/platform/pc32/apic/ioapic_abi.c @@ -62,7 +62,7 @@ #include #include -#include +#include #define IOAPIC_HWI_VECTORS IDT_HWI_VECTORS diff --git a/sys/platform/pc32/conf/files b/sys/platform/pc32/conf/files index d86293c18a..83d3d49861 100644 --- a/sys/platform/pc32/conf/files +++ b/sys/platform/pc32/conf/files @@ -254,9 +254,9 @@ platform/pc32/i386/vm86.c standard platform/pc32/i386/vm_machdep.c standard platform/pc32/i386/cpufreq_machdep.c standard platform/pc32/i386/msi.c standard -platform/pc32/acpica5/acpi_sdt.c standard -platform/pc32/acpica5/acpi_fadt.c standard -platform/pc32/acpica5/acpi_madt.c standard +platform/pc32/acpica/acpi_sdt.c standard +platform/pc32/acpica/acpi_fadt.c standard +platform/pc32/acpica/acpi_madt.c standard platform/pc32/isa/clock.c standard nowerror dev/serial/cy/cy.c optional cy dev/serial/cy/cy_pci.c optional cy pci diff --git a/sys/platform/pc64/Makefile.inc b/sys/platform/pc64/Makefile.inc index 27b8eaf7ad..7267292ce3 100644 --- a/sys/platform/pc64/Makefile.inc +++ b/sys/platform/pc64/Makefile.inc @@ -1,7 +1,7 @@ # Used by the device build to check for device support # -DEV_SUPPORT= acpica5 agp bridge crypto disk drm misc netif \ +DEV_SUPPORT= acpica agp bridge crypto disk drm misc netif \ pccard powermng raid serial sound usbmisc video #SYSCONS_APM_SUPPORT=1 diff --git a/sys/platform/pc64/acpica5/Makefile b/sys/platform/pc64/acpica/Makefile similarity index 86% rename from sys/platform/pc64/acpica5/Makefile rename to sys/platform/pc64/acpica/Makefile index 9ecdafc1fa..395793e51a 100644 --- a/sys/platform/pc64/acpica5/Makefile +++ b/sys/platform/pc64/acpica/Makefile @@ -1,5 +1,4 @@ # $FreeBSD: src/sys/i386/acpica/Makefile,v 1.6 2004/04/13 13:43:11 des Exp $ -# $DragonFly: src/sys/platform/pc32/acpica5/Makefile,v 1.2 2004/06/27 08:52:45 dillon Exp $ # # Correct path for kernel builds diff --git a/sys/platform/pc32/acpica5/OsdEnvironment.c b/sys/platform/pc64/acpica/OsdEnvironment.c similarity index 95% rename from sys/platform/pc32/acpica5/OsdEnvironment.c rename to sys/platform/pc64/acpica/OsdEnvironment.c index a4a8159bfb..f2939f3482 100644 --- a/sys/platform/pc32/acpica5/OsdEnvironment.c +++ b/sys/platform/pc64/acpica/OsdEnvironment.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/acpica/OsdEnvironment.c,v 1.10 2004/05/06 02:18:58 njl Exp $ - * $DragonFly: src/sys/platform/pc32/acpica5/OsdEnvironment.c,v 1.3 2007/01/17 17:31:19 y0netan1 Exp $ */ /* diff --git a/sys/platform/pc64/acpica5/acpi_cpu_machdep.c b/sys/platform/pc64/acpica/acpi_cpu_machdep.c similarity index 100% rename from sys/platform/pc64/acpica5/acpi_cpu_machdep.c rename to sys/platform/pc64/acpica/acpi_cpu_machdep.c diff --git a/sys/platform/pc64/acpica5/acpi_fadt.c b/sys/platform/pc64/acpica/acpi_fadt.c similarity index 100% rename from sys/platform/pc64/acpica5/acpi_fadt.c rename to sys/platform/pc64/acpica/acpi_fadt.c diff --git a/sys/platform/pc64/acpica5/acpi_machdep.c b/sys/platform/pc64/acpica/acpi_machdep.c similarity index 99% rename from sys/platform/pc64/acpica5/acpi_machdep.c rename to sys/platform/pc64/acpica/acpi_machdep.c index 701b93c4b1..32266e0107 100644 --- a/sys/platform/pc64/acpica5/acpi_machdep.c +++ b/sys/platform/pc64/acpica/acpi_machdep.c @@ -36,8 +36,8 @@ #include #include "acpi.h" -#include -#include +#include +#include static device_t acpi_dev; diff --git a/sys/platform/pc64/acpica5/acpi_madt.c b/sys/platform/pc64/acpica/acpi_madt.c similarity index 100% rename from sys/platform/pc64/acpica5/acpi_madt.c rename to sys/platform/pc64/acpica/acpi_madt.c diff --git a/sys/platform/pc64/acpica5/acpi_pstate_machdep.c b/sys/platform/pc64/acpica/acpi_pstate_machdep.c similarity index 100% rename from sys/platform/pc64/acpica5/acpi_pstate_machdep.c rename to sys/platform/pc64/acpica/acpi_pstate_machdep.c diff --git a/sys/platform/pc64/acpica5/acpi_sdt.c b/sys/platform/pc64/acpica/acpi_sdt.c similarity index 100% rename from sys/platform/pc64/acpica5/acpi_sdt.c rename to sys/platform/pc64/acpica/acpi_sdt.c diff --git a/sys/platform/pc64/acpica5/acpi_sdt.h b/sys/platform/pc64/acpica/acpi_sdt.h similarity index 100% rename from sys/platform/pc64/acpica5/acpi_sdt.h rename to sys/platform/pc64/acpica/acpi_sdt.h diff --git a/sys/platform/pc64/acpica5/acpi_sdt_var.h b/sys/platform/pc64/acpica/acpi_sdt_var.h similarity index 100% rename from sys/platform/pc64/acpica5/acpi_sdt_var.h rename to sys/platform/pc64/acpica/acpi_sdt_var.h diff --git a/sys/platform/pc64/acpica5/acpi_wakecode.S b/sys/platform/pc64/acpica/acpi_wakecode.S similarity index 98% rename from sys/platform/pc64/acpica5/acpi_wakecode.S rename to sys/platform/pc64/acpica/acpi_wakecode.S index fbb6202b76..0ecc8240c5 100644 --- a/sys/platform/pc64/acpica5/acpi_wakecode.S +++ b/sys/platform/pc64/acpica/acpi_wakecode.S @@ -25,7 +25,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/acpica/acpi_wakecode.S,v 1.9 2004/01/01 22:57:22 njl Exp $ - * $DragonFly: src/sys/platform/pc32/acpica5/acpi_wakecode.S,v 1.1 2004/02/21 06:48:05 dillon Exp $ */ #define LOCORE diff --git a/sys/platform/pc64/acpica5/acpi_wakeup.c b/sys/platform/pc64/acpica/acpi_wakeup.c similarity index 98% rename from sys/platform/pc64/acpica5/acpi_wakeup.c rename to sys/platform/pc64/acpica/acpi_wakeup.c index b97683a472..6ec3d5acd5 100644 --- a/sys/platform/pc64/acpica5/acpi_wakeup.c +++ b/sys/platform/pc64/acpica/acpi_wakeup.c @@ -45,7 +45,7 @@ #include #include "acpi.h" -#include +#include int acpi_sleep_machdep(struct acpi_softc *sc, int state) diff --git a/sys/platform/pc32/acpica5/genwakecode.sh b/sys/platform/pc64/acpica/genwakecode.sh similarity index 80% rename from sys/platform/pc32/acpica5/genwakecode.sh rename to sys/platform/pc64/acpica/genwakecode.sh index 0e4499e0fd..5090f4a824 100644 --- a/sys/platform/pc32/acpica5/genwakecode.sh +++ b/sys/platform/pc64/acpica/genwakecode.sh @@ -1,6 +1,5 @@ #!/bin/sh # $FreeBSD: src/sys/i386/acpica/genwakecode.sh,v 1.1 2002/05/01 21:52:34 peter Exp $ -# $DragonFly: src/sys/platform/pc32/acpica5/genwakecode.sh,v 1.1 2004/02/21 06:48:05 dillon Exp $ # echo "/* generated from `pwd`/acpi_wakecode.o */" echo 'static char wakecode[] = {'; diff --git a/sys/platform/pc64/apic/ioapic_abi.c b/sys/platform/pc64/apic/ioapic_abi.c index 9d8b79b282..5b57224ed8 100644 --- a/sys/platform/pc64/apic/ioapic_abi.c +++ b/sys/platform/pc64/apic/ioapic_abi.c @@ -62,7 +62,7 @@ #include #include -#include +#include #define IOAPIC_HWI_VECTORS IDT_HWI_VECTORS diff --git a/sys/platform/pc64/conf/files b/sys/platform/pc64/conf/files index 507d4cb89f..850b2a0bea 100644 --- a/sys/platform/pc64/conf/files +++ b/sys/platform/pc64/conf/files @@ -236,9 +236,9 @@ platform/pc64/x86_64/ipl_funcs.c standard kern/syscalls.c standard platform/pc64/x86_64/mp_machdep.c standard platform/pc64/x86_64/mptable.c standard -platform/pc64/acpica5/acpi_sdt.c standard -platform/pc64/acpica5/acpi_fadt.c standard -platform/pc64/acpica5/acpi_madt.c standard +platform/pc64/acpica/acpi_sdt.c standard +platform/pc64/acpica/acpi_fadt.c standard +platform/pc64/acpica/acpi_madt.c standard dev/misc/atkbd/atkbd_isa.c optional atkbd dev/misc/atkbdc_layer/atkbdc_isa.c optional atkbdc dev/misc/ppc/ppc.c optional ppc -- 2.41.0