diff options
| author | jkim <jkim@FreeBSD.org> | 2005-11-01 22:44:08 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2005-11-01 22:44:08 +0000 |
| commit | e72362d4d062b11a2a0fc3bc7712342d71635382 (patch) | |
| tree | 084b99b6300c8a6f0ce76721d526140a61dee2a7 /sys/dev/acpica/Osd | |
| parent | 2e9142f013ec65013653f4b287fe3efd38e975b3 (diff) | |
| download | FreeBSD-src-e72362d4d062b11a2a0fc3bc7712342d71635382.zip FreeBSD-src-e72362d4d062b11a2a0fc3bc7712342d71635382.tar.gz | |
Catch up with ACPI-CA 20051021 import
Diffstat (limited to 'sys/dev/acpica/Osd')
| -rw-r--r-- | sys/dev/acpica/Osd/OsdSynch.c | 9 | ||||
| -rw-r--r-- | sys/dev/acpica/Osd/OsdTable.c | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/acpica/Osd/OsdSynch.c b/sys/dev/acpica/Osd/OsdSynch.c index f579d4e..659b6fb 100644 --- a/sys/dev/acpica/Osd/OsdSynch.c +++ b/sys/dev/acpica/Osd/OsdSynch.c @@ -351,18 +351,19 @@ AcpiOsDeleteLock (ACPI_HANDLE Handle) * (and thus can't block) but since we have ithreads, we don't worry * about potentially blocking. */ -void -AcpiOsAcquireLock (ACPI_HANDLE Handle, UINT32 Flags) +ACPI_NATIVE_UINT +AcpiOsAcquireLock (ACPI_HANDLE Handle) { struct mtx *m = (struct mtx *)Handle; if (Handle == NULL) - return; + return (0); mtx_lock(m); + return (0); } void -AcpiOsReleaseLock (ACPI_HANDLE Handle, UINT32 Flags) +AcpiOsReleaseLock (ACPI_HANDLE Handle, ACPI_NATIVE_UINT Flags) { struct mtx *m = (struct mtx *)Handle; diff --git a/sys/dev/acpica/Osd/OsdTable.c b/sys/dev/acpica/Osd/OsdTable.c index f938ad8..ce33e51 100644 --- a/sys/dev/acpica/Osd/OsdTable.c +++ b/sys/dev/acpica/Osd/OsdTable.c @@ -104,7 +104,8 @@ AcpiOsTableOverride ( sprintf(fake_ssdt.AslCompilerId, "%.4s", "FBSD"); fake_ssdt.AslCompilerRevision = htole32(1); fake_ssdt.no_op = htole32(0x005c0310); /* Scope(\) */ - fake_ssdt.Checksum -= AcpiTbChecksum(&fake_ssdt, sizeof(fake_ssdt)); + fake_ssdt.Checksum -= AcpiTbGenerateChecksum(&fake_ssdt, + sizeof(fake_ssdt)); } *NewTable = (void *)&fake_ssdt; } |
