summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorkochi <kochi@NetBSD.org>2003-03-04 17:28:00 +0000
committerkochi <kochi@NetBSD.org>2003-03-04 17:28:00 +0000
commitb1b04fbfdf2c3ca4a0412e0bde44ea8c3a24324c (patch)
tree238032fec09f0446a4b80f61f489d93eeb72ecbf /sys/dev
parent589c0d70ae0cd65c0a4f8703340ec5a801ad90ee (diff)
Update for acpica-unix-20030228.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/acpica/Osd/OsdMisc.c15
-rw-r--r--sys/dev/acpi/acpica/files.acpica39
2 files changed, 33 insertions, 21 deletions
diff --git a/sys/dev/acpi/acpica/Osd/OsdMisc.c b/sys/dev/acpi/acpica/Osd/OsdMisc.c
index 95b96f57c33..472844afade 100644
--- a/sys/dev/acpi/acpica/Osd/OsdMisc.c
+++ b/sys/dev/acpi/acpica/Osd/OsdMisc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdMisc.c,v 1.5 2002/12/23 00:22:05 kanaoka Exp $ */
+/* $NetBSD: OsdMisc.c,v 1.6 2003/03/04 17:28:00 kochi Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdMisc.c,v 1.5 2002/12/23 00:22:05 kanaoka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdMisc.c,v 1.6 2003/03/04 17:28:00 kochi Exp $");
#include "opt_ddb.h"
@@ -129,6 +129,17 @@ AcpiOsTableOverride(ACPI_TABLE_HEADER *ExistingTable,
return (AE_OK);
}
+ACPI_STATUS
+AcpiOsPredefinedOverride(const ACPI_PREDEFINED_NAMES *InitVal,
+ ACPI_STRING *NewVal)
+{
+ if (!InitVal || !NewVal)
+ return (AE_BAD_PARAMETER);
+
+ *NewVal = NULL;
+ return (AE_OK);
+}
+
/*
* acpi_osd_debugger:
*
diff --git a/sys/dev/acpi/acpica/files.acpica b/sys/dev/acpi/acpica/files.acpica
index 2b7f8611766..8264abc991f 100644
--- a/sys/dev/acpi/acpica/files.acpica
+++ b/sys/dev/acpi/acpica/files.acpica
@@ -1,23 +1,13 @@
-# $NetBSD: files.acpica,v 1.4 2003/02/13 14:16:13 kanaoka Exp $
+# $NetBSD: files.acpica,v 1.5 2003/03/04 17:28:01 kochi Exp $
-file dev/acpi/acpica/Osd/OsdEnvironment.c acpi
-file dev/acpi/acpica/Osd/OsdHardware.c acpi
-file dev/acpi/acpica/Osd/OsdInterrupt.c acpi
-file dev/acpi/acpica/Osd/OsdMemory.c acpi
-file dev/acpi/acpica/Osd/OsdMisc.c acpi
-file dev/acpi/acpica/Osd/OsdSchedule.c acpi
-file dev/acpi/acpica/Osd/OsdStream.c acpi
-file dev/acpi/acpica/Osd/OsdSynch.c acpi
-
-# disassembler/
-file dev/acpi/acpica/Subsystem/dmbuffer.c acpi
-file dev/acpi/acpica/Subsystem/dmnames.c acpi
-file dev/acpi/acpica/Subsystem/dmopcode.c acpi
-file dev/acpi/acpica/Subsystem/dmresrc.c acpi
-file dev/acpi/acpica/Subsystem/dmresrcl.c acpi
-file dev/acpi/acpica/Subsystem/dmresrcs.c acpi
-file dev/acpi/acpica/Subsystem/dmutils.c acpi
-file dev/acpi/acpica/Subsystem/dmwalk.c acpi
+file dev/acpi/acpica/Osd/OsdEnvironment.c acpi
+file dev/acpi/acpica/Osd/OsdHardware.c acpi
+file dev/acpi/acpica/Osd/OsdInterrupt.c acpi
+file dev/acpi/acpica/Osd/OsdMemory.c acpi
+file dev/acpi/acpica/Osd/OsdMisc.c acpi
+file dev/acpi/acpica/Osd/OsdSchedule.c acpi
+file dev/acpi/acpica/Osd/OsdStream.c acpi
+file dev/acpi/acpica/Osd/OsdSynch.c acpi
# debugger/
file dev/acpi/acpica/Subsystem/dbcmds.c acpi
@@ -30,6 +20,16 @@ file dev/acpi/acpica/Subsystem/dbstats.c acpi
file dev/acpi/acpica/Subsystem/dbutils.c acpi
file dev/acpi/acpica/Subsystem/dbxface.c acpi
+# disassembler/
+file dev/acpi/acpica/Subsystem/dmbuffer.c acpi
+file dev/acpi/acpica/Subsystem/dmnames.c acpi
+file dev/acpi/acpica/Subsystem/dmopcode.c acpi
+file dev/acpi/acpica/Subsystem/dmresrc.c acpi
+file dev/acpi/acpica/Subsystem/dmresrcl.c acpi
+file dev/acpi/acpica/Subsystem/dmresrcs.c acpi
+file dev/acpi/acpica/Subsystem/dmutils.c acpi
+file dev/acpi/acpica/Subsystem/dmwalk.c acpi
+
# interpreter/dispatcher/
file dev/acpi/acpica/Subsystem/dsfield.c acpi
file dev/acpi/acpica/Subsystem/dsinit.c acpi
@@ -46,6 +46,7 @@ file dev/acpi/acpica/Subsystem/dswstate.c acpi
# events/
file dev/acpi/acpica/Subsystem/evevent.c acpi
file dev/acpi/acpica/Subsystem/evgpe.c acpi
+file dev/acpi/acpica/Subsystem/evgpeblk.c acpi
file dev/acpi/acpica/Subsystem/evmisc.c acpi
file dev/acpi/acpica/Subsystem/evregion.c acpi
file dev/acpi/acpica/Subsystem/evrgnini.c acpi