kernel: Move sys/dev/acpica5 to sys/dev/acpica.
authorSascha Wildner <saw@online.de>
Thu, 3 Jan 2013 20:27:34 +0000 (21:27 +0100)
committerSascha Wildner <saw@online.de>
Thu, 3 Jan 2013 20:27:34 +0000 (21:27 +0100)
The 5 used to indicate that it was imported from FreeBSD 5 but that
doesn't matter anymore.

In-discussion-with: sephe

101 files changed:
include/Makefile
sys/conf/acpi.mk
sys/conf/kmod.mk
sys/dev/Makefile
sys/dev/acpica/Makefile [moved from sys/dev/acpica5/Makefile with 100% similarity]
sys/dev/acpica/Makefile.inc [moved from sys/dev/acpica5/Makefile.inc with 76% similarity]
sys/dev/acpica/Osd/OsdCache.c [moved from sys/dev/acpica5/Osd/OsdCache.c with 97% similarity]
sys/dev/acpica/Osd/OsdDebug.c [moved from sys/dev/acpica5/Osd/OsdDebug.c with 97% similarity]
sys/dev/acpica/Osd/OsdHardware.c [moved from sys/dev/acpica5/Osd/OsdHardware.c with 100% similarity]
sys/dev/acpica/Osd/OsdInterrupt.c [moved from sys/dev/acpica5/Osd/OsdInterrupt.c with 96% similarity]
sys/dev/acpica/Osd/OsdMemory.c [moved from sys/dev/acpica5/Osd/OsdMemory.c with 98% similarity]
sys/dev/acpica/Osd/OsdSchedule.c [moved from sys/dev/acpica5/Osd/OsdSchedule.c with 99% similarity]
sys/dev/acpica/Osd/OsdStream.c [moved from sys/dev/acpica5/Osd/OsdStream.c with 95% similarity]
sys/dev/acpica/Osd/OsdSynch.c [moved from sys/dev/acpica5/Osd/OsdSynch.c with 99% similarity]
sys/dev/acpica/Osd/OsdTable.c [moved from sys/dev/acpica5/Osd/OsdTable.c with 96% similarity]
sys/dev/acpica/acdragonfly.h [moved from sys/dev/acpica5/acdragonfly.h with 100% similarity]
sys/dev/acpica/acpi.c [moved from sys/dev/acpica5/acpi.c with 99% similarity]
sys/dev/acpica/acpi_acad.c [moved from sys/dev/acpica5/acpi_acad.c with 99% similarity]
sys/dev/acpica/acpi_asus/Makefile [moved from sys/dev/acpica5/acpi_asus/Makefile with 100% similarity]
sys/dev/acpica/acpi_asus/acpi_asus.c [moved from sys/dev/acpica5/acpi_asus/acpi_asus.c with 100% similarity]
sys/dev/acpica/acpi_battery.c [moved from sys/dev/acpica5/acpi_battery.c with 99% similarity]
sys/dev/acpica/acpi_button.c [moved from sys/dev/acpica5/acpi_button.c with 99% similarity]
sys/dev/acpica/acpi_cmbat.c [moved from sys/dev/acpica5/acpi_cmbat.c with 99% similarity]
sys/dev/acpica/acpi_cpu.c [moved from sys/dev/acpica5/acpi_cpu.c with 100% similarity]
sys/dev/acpica/acpi_cpu.h [moved from sys/dev/acpica5/acpi_cpu.h with 100% similarity]
sys/dev/acpica/acpi_cpu_cstate.c [moved from sys/dev/acpica5/acpi_cpu_cstate.c with 100% similarity]
sys/dev/acpica/acpi_cpu_pstate.c [moved from sys/dev/acpica5/acpi_cpu_pstate.c with 100% similarity]
sys/dev/acpica/acpi_cpu_pstate.h [moved from sys/dev/acpica5/acpi_cpu_pstate.h with 100% similarity]
sys/dev/acpica/acpi_ec.c [moved from sys/dev/acpica5/acpi_ec.c with 99% similarity]
sys/dev/acpica/acpi_fujitsu/Makefile [moved from sys/dev/acpica5/acpi_fujitsu/Makefile with 100% similarity]
sys/dev/acpica/acpi_fujitsu/acpi_fujitsu.c [moved from sys/dev/acpica5/acpi_fujitsu/acpi_fujitsu.c with 99% similarity]
sys/dev/acpica/acpi_hp/Makefile [moved from sys/dev/acpica5/acpi_hp/Makefile with 100% similarity]
sys/dev/acpica/acpi_hp/acpi_hp.c [moved from sys/dev/acpica5/acpi_hp/acpi_hp.c with 99% similarity]
sys/dev/acpica/acpi_hpet.c [moved from sys/dev/acpica5/acpi_hpet.c with 100% similarity]
sys/dev/acpica/acpi_hpet.h [moved from sys/dev/acpica5/acpi_hpet.h with 100% similarity]
sys/dev/acpica/acpi_if.m [moved from sys/dev/acpica5/acpi_if.m with 100% similarity]
sys/dev/acpica/acpi_isab.c [moved from sys/dev/acpica5/acpi_isab.c with 99% similarity]
sys/dev/acpica/acpi_lid.c [moved from sys/dev/acpica5/acpi_lid.c with 99% similarity]
sys/dev/acpica/acpi_package.c [moved from sys/dev/acpica5/acpi_package.c with 99% similarity]
sys/dev/acpica/acpi_panasonic/Makefile [moved from sys/dev/acpica5/acpi_panasonic/Makefile with 100% similarity]
sys/dev/acpica/acpi_panasonic/acpi_panasonic.c [moved from sys/dev/acpica5/acpi_panasonic/acpi_panasonic.c with 99% similarity]
sys/dev/acpica/acpi_pci.c [moved from sys/dev/acpica5/acpi_pci.c with 100% similarity]
sys/dev/acpica/acpi_pci_link.c [moved from sys/dev/acpica5/acpi_pci_link.c with 99% similarity]
sys/dev/acpica/acpi_pcib.c [moved from sys/dev/acpica5/acpi_pcib.c with 99% similarity]
sys/dev/acpica/acpi_pcib_acpi.c [moved from sys/dev/acpica5/acpi_pcib_acpi.c with 99% similarity]
sys/dev/acpica/acpi_pcib_pci.c [moved from sys/dev/acpica5/acpi_pcib_pci.c with 98% similarity]
sys/dev/acpica/acpi_pcibvar.h [moved from sys/dev/acpica5/acpi_pcibvar.h with 100% similarity]
sys/dev/acpica/acpi_powerres.c [moved from sys/dev/acpica5/acpi_powerres.c with 99% similarity]
sys/dev/acpica/acpi_resource.c [moved from sys/dev/acpica5/acpi_resource.c with 99% similarity]
sys/dev/acpica/acpi_sci_var.h [moved from sys/dev/acpica5/acpi_sci_var.h with 100% similarity]
sys/dev/acpica/acpi_smbat.c [moved from sys/dev/acpica5/acpi_smbat.c with 100% similarity]
sys/dev/acpica/acpi_smbus.h [moved from sys/dev/acpica5/acpi_smbus.h with 100% similarity]
sys/dev/acpica/acpi_sony/Makefile [moved from sys/dev/acpica5/acpi_sony/Makefile with 100% similarity]
sys/dev/acpica/acpi_sony/acpi_sony.c [moved from sys/dev/acpica5/acpi_sony/acpi_sony.c with 99% similarity]
sys/dev/acpica/acpi_thermal.c [moved from sys/dev/acpica5/acpi_thermal.c with 99% similarity]
sys/dev/acpica/acpi_thinkpad/Makefile [moved from sys/dev/acpica5/acpi_thinkpad/Makefile with 100% similarity]
sys/dev/acpica/acpi_thinkpad/acpi_thinkpad.c [moved from sys/dev/acpica5/acpi_thinkpad/acpi_thinkpad.c with 99% similarity]
sys/dev/acpica/acpi_timer.c [moved from sys/dev/acpica5/acpi_timer.c with 100% similarity]
sys/dev/acpica/acpi_toshiba/Makefile [moved from sys/dev/acpica5/acpi_toshiba/Makefile with 100% similarity]
sys/dev/acpica/acpi_toshiba/acpi_toshiba.c [moved from sys/dev/acpica5/acpi_toshiba/acpi_toshiba.c with 99% similarity]
sys/dev/acpica/acpi_video/Makefile [moved from sys/dev/acpica5/acpi_video/Makefile with 100% similarity]
sys/dev/acpica/acpi_video/acpi_video.c [moved from sys/dev/acpica5/acpi_video/acpi_video.c with 99% similarity]
sys/dev/acpica/acpi_wmi/Makefile [moved from sys/dev/acpica5/acpi_wmi/Makefile with 100% similarity]
sys/dev/acpica/acpi_wmi/acpi_wmi.c [moved from sys/dev/acpica5/acpi_wmi/acpi_wmi.c with 99% similarity]
sys/dev/acpica/acpi_wmi_if.m [moved from sys/dev/acpica5/acpi_wmi_if.m with 100% similarity]
sys/dev/acpica/acpiio.h [moved from sys/dev/acpica5/acpiio.h with 100% similarity]
sys/dev/acpica/acpivar.h [moved from sys/dev/acpica5/acpivar.h with 100% similarity]
sys/dev/acpica/aibs/Makefile [moved from sys/dev/acpica5/aibs/Makefile with 100% similarity]
sys/dev/acpica/aibs/atk0110.c [moved from sys/dev/acpica5/aibs/atk0110.c with 99% similarity]
sys/platform/pc32/Makefile.inc
sys/platform/pc32/acpica/Makefile [moved from sys/platform/pc32/acpica5/Makefile with 86% similarity]
sys/platform/pc32/acpica/OsdEnvironment.c [moved from sys/platform/pc32/acpica5/OsdEnvironment.c with 95% similarity]
sys/platform/pc32/acpica/acpi_cpu_machdep.c [moved from sys/platform/pc32/acpica5/acpi_cpu_machdep.c with 100% similarity]
sys/platform/pc32/acpica/acpi_fadt.c [moved from sys/platform/pc32/acpica5/acpi_fadt.c with 100% similarity]
sys/platform/pc32/acpica/acpi_machdep.c [moved from sys/platform/pc32/acpica5/acpi_machdep.c with 99% similarity]
sys/platform/pc32/acpica/acpi_madt.c [moved from sys/platform/pc32/acpica5/acpi_madt.c with 100% similarity]
sys/platform/pc32/acpica/acpi_pstate_machdep.c [moved from sys/platform/pc32/acpica5/acpi_pstate_machdep.c with 100% similarity]
sys/platform/pc32/acpica/acpi_sdt.c [moved from sys/platform/pc32/acpica5/acpi_sdt.c with 100% similarity]
sys/platform/pc32/acpica/acpi_sdt.h [moved from sys/platform/pc32/acpica5/acpi_sdt.h with 100% similarity]
sys/platform/pc32/acpica/acpi_sdt_var.h [moved from sys/platform/pc32/acpica5/acpi_sdt_var.h with 100% similarity]
sys/platform/pc32/acpica/acpi_wakecode.S [moved from sys/platform/pc32/acpica5/acpi_wakecode.S with 98% similarity]
sys/platform/pc32/acpica/acpi_wakeup.c [moved from sys/platform/pc32/acpica5/acpi_wakeup.c with 99% similarity]
sys/platform/pc32/acpica/genwakecode.sh [moved from sys/platform/pc32/acpica5/genwakecode.sh with 80% similarity]
sys/platform/pc32/apic/ioapic_abi.c
sys/platform/pc32/conf/files
sys/platform/pc64/Makefile.inc
sys/platform/pc64/acpica/Makefile [moved from sys/platform/pc64/acpica5/Makefile with 86% similarity]
sys/platform/pc64/acpica/OsdEnvironment.c [moved from sys/platform/pc64/acpica5/OsdEnvironment.c with 95% similarity]
sys/platform/pc64/acpica/acpi_cpu_machdep.c [moved from sys/platform/pc64/acpica5/acpi_cpu_machdep.c with 100% similarity]
sys/platform/pc64/acpica/acpi_fadt.c [moved from sys/platform/pc64/acpica5/acpi_fadt.c with 100% similarity]
sys/platform/pc64/acpica/acpi_machdep.c [moved from sys/platform/pc64/acpica5/acpi_machdep.c with 99% similarity]
sys/platform/pc64/acpica/acpi_madt.c [moved from sys/platform/pc64/acpica5/acpi_madt.c with 100% similarity]
sys/platform/pc64/acpica/acpi_pstate_machdep.c [moved from sys/platform/pc64/acpica5/acpi_pstate_machdep.c with 100% similarity]
sys/platform/pc64/acpica/acpi_sdt.c [moved from sys/platform/pc64/acpica5/acpi_sdt.c with 100% similarity]
sys/platform/pc64/acpica/acpi_sdt.h [moved from sys/platform/pc64/acpica5/acpi_sdt.h with 100% similarity]
sys/platform/pc64/acpica/acpi_sdt_var.h [moved from sys/platform/pc64/acpica5/acpi_sdt_var.h with 100% similarity]
sys/platform/pc64/acpica/acpi_wakecode.S [moved from sys/platform/pc64/acpica5/acpi_wakecode.S with 98% similarity]
sys/platform/pc64/acpica/acpi_wakeup.c [moved from sys/platform/pc64/acpica5/acpi_wakeup.c with 98% similarity]
sys/platform/pc64/acpica/genwakecode.sh [moved from sys/platform/pc64/acpica5/genwakecode.sh with 80% similarity]
sys/platform/pc64/apic/ioapic_abi.c
sys/platform/pc64/conf/files

index d99b455..675ec5c 100644 (file)
@@ -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)
index f5d93c7..cbbf24b 100644 (file)
@@ -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
index 51206d3..0973c50 100644 (file)
@@ -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 \
index afad74d..a32fdfc 100644 (file)
@@ -1,7 +1,7 @@
 .include "../platform/${MACHINE_PLATFORM}/Makefile.inc"
 
 SUBDIR=        \
-       acpica5 \
+       acpica \
        agp \
        crypto \
        disk \
similarity index 76%
rename from sys/dev/acpica5/Makefile.inc
rename to sys/dev/acpica/Makefile.inc
index fd95ef4..53923e0 100644 (file)
@@ -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}                    \
similarity index 97%
rename from sys/dev/acpica5/Osd/OsdCache.c
rename to sys/dev/acpica/Osd/OsdCache.c
index 2e083ce..1929b6e 100644 (file)
@@ -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 <sys/objcache.h>
similarity index 97%
rename from sys/dev/acpica5/Osd/OsdDebug.c
rename to sys/dev/acpica/Osd/OsdDebug.c
index d5f1451..5b3d79f 100644 (file)
@@ -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 $
  */
 
 /*
similarity index 96%
rename from sys/dev/acpica5/Osd/OsdInterrupt.c
rename to sys/dev/acpica/Osd/OsdInterrupt.c
index c255e7c..b83e20b 100644 (file)
@@ -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 <dev/acpica5/acpivar.h>
-#include <dev/acpica5/acpi_sci_var.h>
+#include <dev/acpica/acpivar.h>
+#include <dev/acpica/acpi_sci_var.h>
 
 #define _COMPONENT     ACPI_OS_SERVICES
 ACPI_MODULE_NAME("INTERRUPT")
similarity index 98%
rename from sys/dev/acpica5/Osd/OsdMemory.c
rename to sys/dev/acpica/Osd/OsdMemory.c
index 6b4096d..198c31e 100644 (file)
@@ -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 $
  */
 
 /*
similarity index 99%
rename from sys/dev/acpica5/Osd/OsdSchedule.c
rename to sys/dev/acpica/Osd/OsdSchedule.c
index 99523da..80ad879 100644 (file)
@@ -50,7 +50,7 @@
 
 #include "acpi.h"
 #include "accommon.h"
-#include <dev/acpica5/acpivar.h>
+#include <dev/acpica/acpivar.h>
 
 #define _COMPONENT     ACPI_OS_SERVICES
 ACPI_MODULE_NAME("SCHEDULE")
similarity index 95%
rename from sys/dev/acpica5/Osd/OsdStream.c
rename to sys/dev/acpica/Osd/OsdStream.c
index f5dda0a..f48db83 100644 (file)
@@ -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 $
  */
 
 /*
similarity index 99%
rename from sys/dev/acpica5/Osd/OsdSynch.c
rename to sys/dev/acpica/Osd/OsdSynch.c
index c2d9ee5..0a4ccb7 100644 (file)
@@ -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 $
  */
 
 /*
similarity index 96%
rename from sys/dev/acpica5/Osd/OsdTable.c
rename to sys/dev/acpica/Osd/OsdTable.c
index e7483c8..65ae373 100644 (file)
@@ -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 $
  */
 
 /*
similarity index 99%
rename from sys/dev/acpica5/acpi.c
rename to sys/dev/acpica/acpi.c
index 3cc9488..0ce2b3f 100644 (file)
@@ -53,8 +53,8 @@
 #include <bus/isa/pnpvar.h>
 
 #include "acpi.h"
-#include <dev/acpica5/acpivar.h>
-#include <dev/acpica5/acpiio.h>
+#include <dev/acpica/acpivar.h>
+#include <dev/acpica/acpiio.h>
 #include "achware.h"
 #include "acnamesp.h"
 #include "acglobal.h"
similarity index 99%
rename from sys/dev/acpica5/acpi_acad.c
rename to sys/dev/acpica/acpi_acad.c
index ae083b6..d228075 100644 (file)
@@ -39,8 +39,8 @@
 
 #include "acpi.h"
 
-#include <dev/acpica5/acpivar.h>
-#include <dev/acpica5/acpiio.h>
+#include <dev/acpica/acpivar.h>
+#include <dev/acpica/acpiio.h>
 #include <bus/isa/isavar.h>
 #include <bus/isa/pnpvar.h>
  
similarity index 99%
rename from sys/dev/acpica5/acpi_battery.c
rename to sys/dev/acpica/acpi_battery.c
index 48034fc..a23a664 100644 (file)
@@ -36,8 +36,8 @@
 
 #include "acpi.h"
 
-#include <dev/acpica5/acpivar.h>
-#include <dev/acpica5/acpiio.h>
+#include <dev/acpica/acpivar.h>
+#include <dev/acpica/acpiio.h>
 
 /* Default seconds before re-sampling the battery state. */
 #define        ACPI_BATTERY_INFO_EXPIRE        5
similarity index 99%
rename from sys/dev/acpica5/acpi_button.c
rename to sys/dev/acpica/acpi_button.c
index 978f544..2d23554 100644 (file)
@@ -37,7 +37,7 @@
 #include "acpi.h"
 #include "accommon.h"
 
-#include <dev/acpica5/acpivar.h>
+#include <dev/acpica/acpivar.h>
 
 /* Hooks for the ACPI CA debugging infrastructure */
 #define _COMPONENT     ACPI_BUTTON
similarity index 99%
rename from sys/dev/acpica5/acpi_cmbat.c
rename to sys/dev/acpica/acpi_cmbat.c
index 41b0d05..168b23a 100644 (file)
@@ -39,8 +39,8 @@
 #include <sys/malloc.h>
 
 #include "acpi.h"
-#include <dev/acpica5/acpivar.h>
-#include <dev/acpica5/acpiio.h>
+#include <dev/acpica/acpivar.h>
+#include <dev/acpica/acpiio.h>
 
 MALLOC_DEFINE(M_ACPICMBAT, "acpicmbat", "ACPI control method battery data");
 
similarity index 99%
rename from sys/dev/acpica5/acpi_ec.c
rename to sys/dev/acpica/acpi_ec.c
index 50e3fdd..aeab9e7 100644 (file)
@@ -38,7 +38,7 @@
 #include <sys/rman.h>
 
 #include "acpi.h"
-#include <dev/acpica5/acpivar.h>
+#include <dev/acpica/acpivar.h>
 #include "acutils.h"
 
 /* Hooks for the ACPI CA debugging infrastructure */
similarity index 99%
rename from sys/dev/acpica5/acpi_fujitsu/acpi_fujitsu.c
rename to sys/dev/acpica/acpi_fujitsu/acpi_fujitsu.c
index 711a587..23749a6 100644 (file)
@@ -38,7 +38,7 @@
 #include "acpi.h"
 #include "accommon.h"
 
-#include <dev/acpica5/acpivar.h>
+#include <dev/acpica/acpivar.h>
 
 /* Hooks for the ACPI CA debugging infrastructure */
 #define _COMPONENT     ACPI_OEM
similarity index 99%
rename from sys/dev/acpica5/acpi_hp/acpi_hp.c
rename to sys/dev/acpica/acpi_hp/acpi_hp.c
index 0ba8948..c6a8675 100644 (file)
@@ -56,7 +56,7 @@
 
 #include "acpi.h"
 #include "accommon.h"
-#include <dev/acpica5/acpivar.h>
+#include <dev/acpica/acpivar.h>
 #include "acpi_wmi_if.h"
 
 #define _COMPONENT     ACPI_OEM
similarity index 99%
rename from sys/dev/acpica5/acpi_isab.c
rename to sys/dev/acpica/acpi_isab.c
index 12eea7a..fd48198 100644 (file)
@@ -41,7 +41,7 @@
 #include "acpi.h"
 #include "accommon.h"
 
-#include <dev/acpica5/acpivar.h>
+#include <dev/acpica/acpivar.h>
 #include <bus/isa/isavar.h>
 
 /* Hooks for the ACPI CA debugging infrastructure. */
similarity index 99%
rename from sys/dev/acpica5/acpi_lid.c
rename to sys/dev/acpica/acpi_lid.c
index fd953b0..552445c 100644 (file)
@@ -39,7 +39,7 @@
 #include "acpi.h"
 #include "accommon.h"
 
-#include <dev/acpica5/acpivar.h>
+#include <dev/acpica/acpivar.h>
 
 /* Hooks for the ACPI CA debugging infrastructure */
 #define _COMPONENT     ACPI_BUTTON
similarity index 99%
rename from sys/dev/acpica5/acpi_package.c
rename to sys/dev/acpica/acpi_package.c
index e8a367e..2f7c77f 100644 (file)
@@ -34,7 +34,7 @@
 #include <sys/rman.h>
 
 #include "acpi.h"
-#include <dev/acpica5/acpivar.h>
+#include <dev/acpica/acpivar.h>
 
 /*
  * Package manipulation convenience functions
@@ -37,7 +37,7 @@
 
 #include "acpi.h"
 
-#include <dev/acpica5/acpivar.h>
+#include <dev/acpica/acpivar.h>
 
 #define _COMPONENT     ACPI_OEM
 ACPI_MODULE_NAME("Panasonic")
similarity index 99%
rename from sys/dev/acpica5/acpi_pci_link.c
rename to sys/dev/acpica/acpi_pci_link.c
index 5b18f6b..83235c2 100644 (file)
@@ -35,9 +35,9 @@
 #include <sys/module.h>
 
 #include "acpi.h"
-#include <dev/acpica5/acpivar.h>
-#include <dev/acpica5/acpi_pcibvar.h>
-#include <dev/acpica5/acpi_sci_var.h>
+#include <dev/acpica/acpivar.h>
+#include <dev/acpica/acpi_pcibvar.h>
+#include <dev/acpica/acpi_sci_var.h>
 
 #include <bus/pci/i386/pci_cfgreg.h>
 #include <bus/pci/pcireg.h>
similarity index 99%
rename from sys/dev/acpica5/acpi_pcib.c
rename to sys/dev/acpica/acpi_pcib.c
index e3a13b7..abf6372 100644 (file)
@@ -36,8 +36,8 @@
 #include <machine/smp.h>
 
 #include "acpi.h"
-#include <dev/acpica5/acpivar.h>
-#include <dev/acpica5/acpi_pcibvar.h>
+#include <dev/acpica/acpivar.h>
+#include <dev/acpica/acpi_pcibvar.h>
 
 #include <bus/pci/pcivar.h>
 #include <bus/pci/pcireg.h>
similarity index 99%
rename from sys/dev/acpica5/acpi_pcib_acpi.c
rename to sys/dev/acpica/acpi_pcib_acpi.c
index a70c35e..3935586 100644 (file)
 #include <sys/sysctl.h>
 
 #include "acpi.h"
-#include <dev/acpica5/acpivar.h>
+#include <dev/acpica/acpivar.h>
 
 #include <bus/pci/pci_cfgreg.h>
 #include <bus/pci/pcivar.h>
 #include <bus/pci/pcib_private.h>
 #include "pcib_if.h"
 
-#include <dev/acpica5/acpi_pcibvar.h>
+#include <dev/acpica/acpi_pcibvar.h>
 
 /* Hooks for the ACPI CA debugging infrastructure. */
 #define _COMPONENT     ACPI_BUS
similarity index 98%
rename from sys/dev/acpica5/acpi_pcib_pci.c
rename to sys/dev/acpica/acpi_pcib_pci.c
index f91a770..f15f262 100644 (file)
@@ -37,8 +37,8 @@
 #include <sys/rman.h>
 
 #include "acpi.h"
-#include <dev/acpica5/acpivar.h>
-#include <dev/acpica5/acpi_pcibvar.h>
+#include <dev/acpica/acpivar.h>
+#include <dev/acpica/acpi_pcibvar.h>
 
 #include <bus/pci/pcivar.h>
 #include <bus/pci/pcireg.h>
similarity index 99%
rename from sys/dev/acpica5/acpi_powerres.c
rename to sys/dev/acpica/acpi_powerres.c
index 76bf64c..cb4a767 100644 (file)
@@ -33,7 +33,7 @@
 #include <sys/bus.h>
 
 #include "acpi.h"
-#include <dev/acpica5/acpivar.h>
+#include <dev/acpica/acpivar.h>
 
 /*
  * ACPI power resource management.
similarity index 99%
rename from sys/dev/acpica5/acpi_resource.c
rename to sys/dev/acpica/acpi_resource.c
index 2c47797..e3bc569 100644 (file)
@@ -39,7 +39,7 @@
 #include <sys/rman.h>
 
 #include "acpi.h"
-#include <dev/acpica5/acpivar.h>
+#include <dev/acpica/acpivar.h>
 
 /* Hooks for the ACPI CA debugging infrastructure */
 #define _COMPONENT     ACPI_BUS
similarity index 99%
rename from sys/dev/acpica5/acpi_sony/acpi_sony.c
rename to sys/dev/acpica/acpi_sony/acpi_sony.c
index df2bf8d..165184f 100644 (file)
@@ -35,7 +35,7 @@
 
 #include "acpi_if.h"
 #include <sys/module.h>
-#include <dev/acpica5/acpivar.h>
+#include <dev/acpica/acpivar.h>
 #include <sys/sysctl.h>
 
 #define _COMPONENT     ACPI_OEM
similarity index 99%
rename from sys/dev/acpica5/acpi_thermal.c
rename to sys/dev/acpica/acpi_thermal.c
index c5c202f..ef64c8b 100644 (file)
@@ -46,7 +46,7 @@
 #include "acpi.h"
 #include "accommon.h"
 
-#include <dev/acpica5/acpivar.h>
+#include <dev/acpica/acpivar.h>
 
 /* Hooks for the ACPI CA debugging infrastructure */
 #define _COMPONENT     ACPI_THERMAL
similarity index 99%
rename from sys/dev/acpica5/acpi_thinkpad/acpi_thinkpad.c
rename to sys/dev/acpica/acpi_thinkpad/acpi_thinkpad.c
index 67d9508..b84ccba 100644 (file)
@@ -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 $
  */
 
 /*
similarity index 99%
rename from sys/dev/acpica5/acpi_toshiba/acpi_toshiba.c
rename to sys/dev/acpica/acpi_toshiba/acpi_toshiba.c
index 5b6c8d4..b4832f8 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "acpi.h"
 
-#include <dev/acpica5/acpivar.h>
+#include <dev/acpica/acpivar.h>
 
 #define _COMPONENT     ACPI_OEM
 ACPI_MODULE_NAME("Toshiba")
similarity index 99%
rename from sys/dev/acpica5/acpi_video/acpi_video.c
rename to sys/dev/acpica/acpi_video/acpi_video.c
index b28d572..ddb0491 100644 (file)
@@ -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 <sys/param.h>
similarity index 99%
rename from sys/dev/acpica5/acpi_wmi/acpi_wmi.c
rename to sys/dev/acpica/acpi_wmi/acpi_wmi.c
index 315ed28..8607065 100644 (file)
@@ -50,7 +50,7 @@
 
 #include "acpi.h"
 #include "accommon.h"
-#include <dev/acpica5/acpivar.h>
+#include <dev/acpica/acpivar.h>
 #include "acpi_wmi_if.h"
 
 static MALLOC_DEFINE(M_ACPIWMI, "acpiwmi", "ACPI-WMI mapping");
similarity index 99%
rename from sys/dev/acpica5/aibs/atk0110.c
rename to sys/dev/acpica/aibs/atk0110.c
index ac31ddd..959ab68 100644 (file)
@@ -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",
index 5639b12..a143648 100644 (file)
@@ -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
similarity index 86%
rename from sys/platform/pc32/acpica5/Makefile
rename to sys/platform/pc32/acpica/Makefile
index 5a4f5c6..60e6bbe 100644 (file)
@@ -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
similarity index 95%
rename from sys/platform/pc32/acpica5/OsdEnvironment.c
rename to sys/platform/pc32/acpica/OsdEnvironment.c
index a4a8159..f2939f3 100644 (file)
@@ -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 $
  */
 
 /*
similarity index 99%
rename from sys/platform/pc32/acpica5/acpi_machdep.c
rename to sys/platform/pc32/acpica/acpi_machdep.c
index cd6e060..fa8a21e 100644 (file)
@@ -36,8 +36,8 @@
 #include <sys/uio.h>
 
 #include "acpi.h"
-#include <dev/acpica5/acpivar.h>
-#include <dev/acpica5/acpiio.h>
+#include <dev/acpica/acpivar.h>
+#include <dev/acpica/acpiio.h>
 
 static device_t        acpi_dev;
 
similarity index 98%
rename from sys/platform/pc32/acpica5/acpi_wakecode.S
rename to sys/platform/pc32/acpica/acpi_wakecode.S
index 0e03d81..e5e39ee 100644 (file)
@@ -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
similarity index 99%
rename from sys/platform/pc32/acpica5/acpi_wakeup.c
rename to sys/platform/pc32/acpica/acpi_wakeup.c
index 4048e9e..3b6af07 100644 (file)
@@ -46,7 +46,7 @@
 #include <machine_base/icu/icu_var.h>
 
 #include "acpi.h"
-#include <dev/acpica5/acpivar.h>
+#include <dev/acpica/acpivar.h>
 
 #include "acpi_wakecode.h"
 
similarity index 80%
rename from sys/platform/pc32/acpica5/genwakecode.sh
rename to sys/platform/pc32/acpica/genwakecode.sh
index 0e4499e..5090f4a 100644 (file)
@@ -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[] = {';
index 071f0f2..d03f98c 100644 (file)
@@ -62,7 +62,7 @@
 #include <machine_base/apic/ioapic_ipl.h>
 #include <machine_base/apic/apicreg.h>
 
-#include <dev/acpica5/acpi_sci_var.h>
+#include <dev/acpica/acpi_sci_var.h>
 
 #define IOAPIC_HWI_VECTORS     IDT_HWI_VECTORS
 
index d86293c..83d3d49 100644 (file)
@@ -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
index 27b8eaf..7267292 100644 (file)
@@ -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
similarity index 86%
rename from sys/platform/pc64/acpica5/Makefile
rename to sys/platform/pc64/acpica/Makefile
index 9ecdafc..395793e 100644 (file)
@@ -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
similarity index 95%
rename from sys/platform/pc64/acpica5/OsdEnvironment.c
rename to sys/platform/pc64/acpica/OsdEnvironment.c
index a4a8159..f2939f3 100644 (file)
@@ -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 $
  */
 
 /*
similarity index 99%
rename from sys/platform/pc64/acpica5/acpi_machdep.c
rename to sys/platform/pc64/acpica/acpi_machdep.c
index 701b93c..32266e0 100644 (file)
@@ -36,8 +36,8 @@
 #include <sys/uio.h>
 
 #include "acpi.h"
-#include <dev/acpica5/acpivar.h>
-#include <dev/acpica5/acpiio.h>
+#include <dev/acpica/acpivar.h>
+#include <dev/acpica/acpiio.h>
 
 static device_t        acpi_dev;
 
similarity index 98%
rename from sys/platform/pc64/acpica5/acpi_wakecode.S
rename to sys/platform/pc64/acpica/acpi_wakecode.S
index fbb6202..0ecc824 100644 (file)
@@ -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
similarity index 98%
rename from sys/platform/pc64/acpica5/acpi_wakeup.c
rename to sys/platform/pc64/acpica/acpi_wakeup.c
index b97683a..6ec3d5a 100644 (file)
@@ -45,7 +45,7 @@
 #include <machine_base/icu/icu_var.h>
 
 #include "acpi.h"
-#include <dev/acpica5/acpivar.h>
+#include <dev/acpica/acpivar.h>
 
 int
 acpi_sleep_machdep(struct acpi_softc *sc, int state)
similarity index 80%
rename from sys/platform/pc64/acpica5/genwakecode.sh
rename to sys/platform/pc64/acpica/genwakecode.sh
index 0e4499e..5090f4a 100644 (file)
@@ -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[] = {';
index 9d8b79b..5b57224 100644 (file)
@@ -62,7 +62,7 @@
 #include <machine_base/apic/ioapic_ipl.h>
 #include <machine_base/apic/apicreg.h>
 
-#include <dev/acpica5/acpi_sci_var.h>
+#include <dev/acpica/acpi_sci_var.h>
 
 #define IOAPIC_HWI_VECTORS     IDT_HWI_VECTORS
 
index 507d4cb..850b2a0 100644 (file)
@@ -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