diff options
| author | iwasaki <iwasaki@FreeBSD.org> | 2002-11-27 18:09:20 +0000 |
|---|---|---|
| committer | iwasaki <iwasaki@FreeBSD.org> | 2002-11-27 18:09:20 +0000 |
| commit | 05cb8cd7b7d41fa96a64a0f8b120806eb4fb0933 (patch) | |
| tree | 4bace62f2c1b2923ceef90efb5b5547a7086ee61 /sys/dev/acpica | |
| parent | 10fb1b40ac2c40a3ce01db48e82a02380186cda2 (diff) | |
| download | FreeBSD-src-05cb8cd7b7d41fa96a64a0f8b120806eb4fb0933.zip FreeBSD-src-05cb8cd7b7d41fa96a64a0f8b120806eb4fb0933.tar.gz | |
Resolve conflicts arising from the ACPI CA 20021118 import.
Diffstat (limited to 'sys/dev/acpica')
| -rw-r--r-- | sys/dev/acpica/Osd/OsdSynch.c | 6 | ||||
| -rw-r--r-- | sys/dev/acpica/acpi_ec.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/acpica/Osd/OsdSynch.c b/sys/dev/acpica/Osd/OsdSynch.c index 9c80485..718e3c7 100644 --- a/sys/dev/acpica/Osd/OsdSynch.c +++ b/sys/dev/acpica/Osd/OsdSynch.c @@ -144,7 +144,7 @@ AcpiOsDeleteSemaphore (ACPI_HANDLE Handle) * use getmicrotime() to correctly adjust the timeout after being woken up. */ ACPI_STATUS -AcpiOsWaitSemaphore(ACPI_HANDLE Handle, UINT32 Units, UINT32 Timeout) +AcpiOsWaitSemaphore(ACPI_HANDLE Handle, UINT32 Units, UINT16 Timeout) { #ifndef ACPI_NO_SEMAPHORES struct acpi_semaphore *as = (struct acpi_semaphore *)Handle; @@ -179,8 +179,8 @@ AcpiOsWaitSemaphore(ACPI_HANDLE Handle, UINT32 Units, UINT32 Timeout) } #endif - /* a timeout of WAIT_FOREVER means "forever" */ - if (Timeout == WAIT_FOREVER) { + /* a timeout of ACPI_WAIT_FOREVER means "forever" */ + if (Timeout == ACPI_WAIT_FOREVER) { tmo = 0; timeouttv.tv_sec = ((0xffff/1000) + 1); /* cf. ACPI spec */ timeouttv.tv_usec = 0; diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c index f41cebf..680d3f4 100644 --- a/sys/dev/acpica/acpi_ec.c +++ b/sys/dev/acpica/acpi_ec.c @@ -254,8 +254,8 @@ EcLock(struct acpi_ec_softc *sc) { ACPI_STATUS status; - /* XXX WAIT_FOREVER is probably a bad idea, what is a better time? */ - if (ACPI_SUCCESS(status = AcpiAcquireGlobalLock(WAIT_FOREVER, &sc->ec_lockhandle))) + /* XXX ACPI_WAIT_FOREVER is probably a bad idea, what is a better time? */ + if (ACPI_SUCCESS(status = AcpiAcquireGlobalLock(ACPI_WAIT_FOREVER, &sc->ec_lockhandle))) (sc)->ec_locked = 1; return(status); |
