diff options
author | njl <njl@FreeBSD.org> | 2003-07-13 22:44:13 +0000 |
---|---|---|
committer | njl <njl@FreeBSD.org> | 2003-07-13 22:44:13 +0000 |
commit | 148a8cc4ac210f6d3692eb478d20cc64818d274a (patch) | |
tree | dd1a453ab93efa28848b21047ec45d003c6f262e /sys/contrib/dev/acpica/utmisc.c | |
parent | 857b9ae7f340e84e806f355c2a19d9cac1ab3faf (diff) | |
download | FreeBSD-src-148a8cc4ac210f6d3692eb478d20cc64818d274a.zip FreeBSD-src-148a8cc4ac210f6d3692eb478d20cc64818d274a.tar.gz |
ACPICA import from the 0619 dist.
Diffstat (limited to 'sys/contrib/dev/acpica/utmisc.c')
-rw-r--r-- | sys/contrib/dev/acpica/utmisc.c | 62 |
1 files changed, 34 insertions, 28 deletions
diff --git a/sys/contrib/dev/acpica/utmisc.c b/sys/contrib/dev/acpica/utmisc.c index 91b2382..7d927bc 100644 --- a/sys/contrib/dev/acpica/utmisc.c +++ b/sys/contrib/dev/acpica/utmisc.c @@ -1,7 +1,7 @@ /******************************************************************************* * * Module Name: utmisc - common utility procedures - * $Revision: 93 $ + * $Revision: 97 $ * ******************************************************************************/ @@ -284,13 +284,15 @@ AcpiUtSetIntegerWidth ( if (Revision <= 1) { - AcpiGbl_IntegerBitWidth = 32; - AcpiGbl_IntegerByteWidth = 4; + AcpiGbl_IntegerBitWidth = 32; + AcpiGbl_IntegerNybbleWidth = 8; + AcpiGbl_IntegerByteWidth = 4; } else { - AcpiGbl_IntegerBitWidth = 64; - AcpiGbl_IntegerByteWidth = 8; + AcpiGbl_IntegerBitWidth = 64; + AcpiGbl_IntegerNybbleWidth = 16; + AcpiGbl_IntegerByteWidth = 8; } } @@ -656,7 +658,7 @@ AcpiUtMutexInitialize ( /* * Create each of the predefined mutex objects */ - for (i = 0; i < NUM_MTX; i++) + for (i = 0; i < NUM_MUTEX; i++) { Status = AcpiUtCreateMutex (i); if (ACPI_FAILURE (Status)) @@ -665,6 +667,9 @@ AcpiUtMutexInitialize ( } } + + Status = AcpiOsCreateLock (&AcpiGbl_GpeLock); + return_ACPI_STATUS (AE_OK); } @@ -694,11 +699,12 @@ AcpiUtMutexTerminate ( /* * Delete each predefined mutex object */ - for (i = 0; i < NUM_MTX; i++) + for (i = 0; i < NUM_MUTEX; i++) { (void) AcpiUtDeleteMutex (i); } + AcpiOsDeleteLock (AcpiGbl_GpeLock); return_VOID; } @@ -725,17 +731,17 @@ AcpiUtCreateMutex ( ACPI_FUNCTION_TRACE_U32 ("UtCreateMutex", MutexId); - if (MutexId > MAX_MTX) + if (MutexId > MAX_MUTEX) { return_ACPI_STATUS (AE_BAD_PARAMETER); } - if (!AcpiGbl_AcpiMutexInfo[MutexId].Mutex) + if (!AcpiGbl_MutexInfo[MutexId].Mutex) { Status = AcpiOsCreateSemaphore (1, 1, - &AcpiGbl_AcpiMutexInfo[MutexId].Mutex); - AcpiGbl_AcpiMutexInfo[MutexId].OwnerId = ACPI_MUTEX_NOT_ACQUIRED; - AcpiGbl_AcpiMutexInfo[MutexId].UseCount = 0; + &AcpiGbl_MutexInfo[MutexId].Mutex); + AcpiGbl_MutexInfo[MutexId].OwnerId = ACPI_MUTEX_NOT_ACQUIRED; + AcpiGbl_MutexInfo[MutexId].UseCount = 0; } return_ACPI_STATUS (Status); @@ -764,15 +770,15 @@ AcpiUtDeleteMutex ( ACPI_FUNCTION_TRACE_U32 ("UtDeleteMutex", MutexId); - if (MutexId > MAX_MTX) + if (MutexId > MAX_MUTEX) { return_ACPI_STATUS (AE_BAD_PARAMETER); } - Status = AcpiOsDeleteSemaphore (AcpiGbl_AcpiMutexInfo[MutexId].Mutex); + Status = AcpiOsDeleteSemaphore (AcpiGbl_MutexInfo[MutexId].Mutex); - AcpiGbl_AcpiMutexInfo[MutexId].Mutex = NULL; - AcpiGbl_AcpiMutexInfo[MutexId].OwnerId = ACPI_MUTEX_NOT_ACQUIRED; + AcpiGbl_MutexInfo[MutexId].Mutex = NULL; + AcpiGbl_MutexInfo[MutexId].OwnerId = ACPI_MUTEX_NOT_ACQUIRED; return_ACPI_STATUS (Status); } @@ -802,7 +808,7 @@ AcpiUtAcquireMutex ( ACPI_FUNCTION_NAME ("UtAcquireMutex"); - if (MutexId > MAX_MTX) + if (MutexId > MAX_MUTEX) { return (AE_BAD_PARAMETER); } @@ -815,9 +821,9 @@ AcpiUtAcquireMutex ( * the mutex ordering rule. This indicates a coding error somewhere in * the ACPI subsystem code. */ - for (i = MutexId; i < MAX_MTX; i++) + for (i = MutexId; i < MAX_MUTEX; i++) { - if (AcpiGbl_AcpiMutexInfo[i].OwnerId == ThisThreadId) + if (AcpiGbl_MutexInfo[i].OwnerId == ThisThreadId) { if (i == MutexId) { @@ -841,15 +847,15 @@ AcpiUtAcquireMutex ( "Thread %X attempting to acquire Mutex [%s]\n", ThisThreadId, AcpiUtGetMutexName (MutexId))); - Status = AcpiOsWaitSemaphore (AcpiGbl_AcpiMutexInfo[MutexId].Mutex, + Status = AcpiOsWaitSemaphore (AcpiGbl_MutexInfo[MutexId].Mutex, 1, ACPI_WAIT_FOREVER); if (ACPI_SUCCESS (Status)) { ACPI_DEBUG_PRINT ((ACPI_DB_MUTEX, "Thread %X acquired Mutex [%s]\n", ThisThreadId, AcpiUtGetMutexName (MutexId))); - AcpiGbl_AcpiMutexInfo[MutexId].UseCount++; - AcpiGbl_AcpiMutexInfo[MutexId].OwnerId = ThisThreadId; + AcpiGbl_MutexInfo[MutexId].UseCount++; + AcpiGbl_MutexInfo[MutexId].OwnerId = ThisThreadId; } else { @@ -891,7 +897,7 @@ AcpiUtReleaseMutex ( "Thread %X releasing Mutex [%s]\n", ThisThreadId, AcpiUtGetMutexName (MutexId))); - if (MutexId > MAX_MTX) + if (MutexId > MAX_MUTEX) { return (AE_BAD_PARAMETER); } @@ -899,7 +905,7 @@ AcpiUtReleaseMutex ( /* * Mutex must be acquired in order to release it! */ - if (AcpiGbl_AcpiMutexInfo[MutexId].OwnerId == ACPI_MUTEX_NOT_ACQUIRED) + if (AcpiGbl_MutexInfo[MutexId].OwnerId == ACPI_MUTEX_NOT_ACQUIRED) { ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Mutex [%s] is not acquired, cannot release\n", @@ -914,9 +920,9 @@ AcpiUtReleaseMutex ( * ordering rule. This indicates a coding error somewhere in * the ACPI subsystem code. */ - for (i = MutexId; i < MAX_MTX; i++) + for (i = MutexId; i < MAX_MUTEX; i++) { - if (AcpiGbl_AcpiMutexInfo[i].OwnerId == ThisThreadId) + if (AcpiGbl_MutexInfo[i].OwnerId == ThisThreadId) { if (i == MutexId) { @@ -933,9 +939,9 @@ AcpiUtReleaseMutex ( /* Mark unlocked FIRST */ - AcpiGbl_AcpiMutexInfo[MutexId].OwnerId = ACPI_MUTEX_NOT_ACQUIRED; + AcpiGbl_MutexInfo[MutexId].OwnerId = ACPI_MUTEX_NOT_ACQUIRED; - Status = AcpiOsSignalSemaphore (AcpiGbl_AcpiMutexInfo[MutexId].Mutex, 1); + Status = AcpiOsSignalSemaphore (AcpiGbl_MutexInfo[MutexId].Mutex, 1); if (ACPI_FAILURE (Status)) { |