summaryrefslogtreecommitdiff
path: root/sys/dev/acpi
diff options
context:
space:
mode:
authorkochi <kochi@NetBSD.org>2006-01-29 03:11:26 +0000
committerkochi <kochi@NetBSD.org>2006-01-29 03:11:26 +0000
commit5d63813b95ed71be2bdb43a4e54b9cbc4f832733 (patch)
treecb4357409318ab23d6412ff2880a266b906252c4 /sys/dev/acpi
parent86bf0f2eb2eddd9b3088b6c1e54eb8fd797931b3 (diff)
Merge ACPI-CA 20060113
Diffstat (limited to 'sys/dev/acpi')
-rw-r--r--sys/dev/acpi/acpica/Osd/OsdSynch.c14
-rw-r--r--sys/dev/acpi/acpica/files.acpica8
2 files changed, 14 insertions, 8 deletions
diff --git a/sys/dev/acpi/acpica/Osd/OsdSynch.c b/sys/dev/acpi/acpica/Osd/OsdSynch.c
index 86c51196ef6..c3938024299 100644
--- a/sys/dev/acpi/acpica/Osd/OsdSynch.c
+++ b/sys/dev/acpi/acpica/Osd/OsdSynch.c
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdSynch.c,v 1.8 2005/12/11 12:21:02 christos Exp $ */
+/* $NetBSD: OsdSynch.c,v 1.9 2006/01/29 03:11:26 kochi Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdSynch.c,v 1.8 2005/12/11 12:21:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdSynch.c,v 1.9 2006/01/29 03:11:26 kochi Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -301,19 +301,19 @@ AcpiOsDeleteLock(ACPI_HANDLE Handle)
*
* Acquire a lock.
*/
-void
-AcpiOsAcquireLock(ACPI_HANDLE Handle, UINT32 Flags)
+ACPI_NATIVE_UINT
+AcpiOsAcquireLock(ACPI_HANDLE Handle)
{
struct acpi_lock *al = (void *) Handle;
ACPI_FUNCTION_TRACE(__FUNCTION__);
if (al == NULL)
- return;
+ return 0;
simple_lock(&al->al_slock);
- return;
+ return 0;
}
/*
@@ -322,7 +322,7 @@ AcpiOsAcquireLock(ACPI_HANDLE Handle, UINT32 Flags)
* Release a lock.
*/
void
-AcpiOsReleaseLock(ACPI_HANDLE Handle, UINT32 Flags)
+AcpiOsReleaseLock(ACPI_HANDLE Handle, ACPI_NATIVE_UINT Flags)
{
struct acpi_lock *al = (void *) Handle;
diff --git a/sys/dev/acpi/acpica/files.acpica b/sys/dev/acpi/acpica/files.acpica
index b79ac7f1123..9acd579c8f2 100644
--- a/sys/dev/acpi/acpica/files.acpica
+++ b/sys/dev/acpi/acpica/files.acpica
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpica,v 1.10 2005/12/11 12:21:02 christos Exp $
+# $NetBSD: files.acpica,v 1.11 2006/01/29 03:11:49 kochi Exp $
file dev/acpi/acpica/Osd/OsdEnvironment.c acpi
file dev/acpi/acpica/Osd/OsdHardware.c acpi
@@ -108,6 +108,7 @@ file dev/acpi/acpica/Subsystem/nsxfobj.c acpi
# interpreter/parser/
file dev/acpi/acpica/Subsystem/psargs.c acpi
+file dev/acpi/acpica/Subsystem/psloop.c acpi
file dev/acpi/acpica/Subsystem/psopcode.c acpi
file dev/acpi/acpica/Subsystem/psparse.c acpi
file dev/acpi/acpica/Subsystem/psscope.c acpi
@@ -121,6 +122,7 @@ file dev/acpi/acpica/Subsystem/rsaddr.c acpi
file dev/acpi/acpica/Subsystem/rscalc.c acpi
file dev/acpi/acpica/Subsystem/rscreate.c acpi
file dev/acpi/acpica/Subsystem/rsdump.c acpi
+file dev/acpi/acpica/Subsystem/rsinfo.c acpi
file dev/acpi/acpica/Subsystem/rsio.c acpi
file dev/acpi/acpica/Subsystem/rsirq.c acpi
file dev/acpi/acpica/Subsystem/rslist.c acpi
@@ -141,6 +143,7 @@ file dev/acpi/acpica/Subsystem/tbxfroot.c acpi
# utilities/
file dev/acpi/acpica/Subsystem/utalloc.c acpi
+file dev/acpi/acpica/Subsystem/utcache.c acpi
file dev/acpi/acpica/Subsystem/utcopy.c acpi
file dev/acpi/acpica/Subsystem/utdebug.c acpi
file dev/acpi/acpica/Subsystem/utdelete.c acpi
@@ -149,6 +152,9 @@ file dev/acpi/acpica/Subsystem/utglobal.c acpi
file dev/acpi/acpica/Subsystem/utinit.c acpi
file dev/acpi/acpica/Subsystem/utmath.c acpi
file dev/acpi/acpica/Subsystem/utmisc.c acpi
+file dev/acpi/acpica/Subsystem/utmutex.c acpi
file dev/acpi/acpica/Subsystem/utobject.c acpi
+file dev/acpi/acpica/Subsystem/utresrc.c acpi
+file dev/acpi/acpica/Subsystem/utstate.c acpi
file dev/acpi/acpica/Subsystem/utxface.c acpi