4c4
< * $Revision: 93 $
---
> * $Revision: 97 $
287,288c287,289
< AcpiGbl_IntegerBitWidth = 32;
< AcpiGbl_IntegerByteWidth = 4;
---
> AcpiGbl_IntegerBitWidth = 32;
> AcpiGbl_IntegerNybbleWidth = 8;
> AcpiGbl_IntegerByteWidth = 4;
292,293c293,295
< AcpiGbl_IntegerBitWidth = 64;
< AcpiGbl_IntegerByteWidth = 8;
---
> AcpiGbl_IntegerBitWidth = 64;
> AcpiGbl_IntegerNybbleWidth = 16;
> AcpiGbl_IntegerByteWidth = 8;
659c661
< for (i = 0; i < NUM_MTX; i++)
---
> for (i = 0; i < NUM_MUTEX; i++)
667a670,672
>
> Status = AcpiOsCreateLock (&AcpiGbl_GpeLock);
>
697c702
< for (i = 0; i < NUM_MTX; i++)
---
> for (i = 0; i < NUM_MUTEX; i++)
701a707
> AcpiOsDeleteLock (AcpiGbl_GpeLock);
728c734
< if (MutexId > MAX_MTX)
---
> if (MutexId > MAX_MUTEX)
733c739
< if (!AcpiGbl_AcpiMutexInfo[MutexId].Mutex)
---
> if (!AcpiGbl_MutexInfo[MutexId].Mutex)
736,738c742,744
< &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;
767c773
< if (MutexId > MAX_MTX)
---
> if (MutexId > MAX_MUTEX)
772c778
< Status = AcpiOsDeleteSemaphore (AcpiGbl_AcpiMutexInfo[MutexId].Mutex);
---
> Status = AcpiOsDeleteSemaphore (AcpiGbl_MutexInfo[MutexId].Mutex);
774,775c780,781
< 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;
805c811
< if (MutexId > MAX_MTX)
---
> if (MutexId > MAX_MUTEX)
818c824
< for (i = MutexId; i < MAX_MTX; i++)
---
> for (i = MutexId; i < MAX_MUTEX; i++)
820c826
< if (AcpiGbl_AcpiMutexInfo[i].OwnerId == ThisThreadId)
---
> if (AcpiGbl_MutexInfo[i].OwnerId == ThisThreadId)
844c850
< Status = AcpiOsWaitSemaphore (AcpiGbl_AcpiMutexInfo[MutexId].Mutex,
---
> Status = AcpiOsWaitSemaphore (AcpiGbl_MutexInfo[MutexId].Mutex,
851,852c857,858
< AcpiGbl_AcpiMutexInfo[MutexId].UseCount++;
< AcpiGbl_AcpiMutexInfo[MutexId].OwnerId = ThisThreadId;
---
> AcpiGbl_MutexInfo[MutexId].UseCount++;
> AcpiGbl_MutexInfo[MutexId].OwnerId = ThisThreadId;
894c900
< if (MutexId > MAX_MTX)
---
> if (MutexId > MAX_MUTEX)
902c908
< if (AcpiGbl_AcpiMutexInfo[MutexId].OwnerId == ACPI_MUTEX_NOT_ACQUIRED)
---
> if (AcpiGbl_MutexInfo[MutexId].OwnerId == ACPI_MUTEX_NOT_ACQUIRED)
917c923
< for (i = MutexId; i < MAX_MTX; i++)
---
> for (i = MutexId; i < MAX_MUTEX; i++)
919c925
< if (AcpiGbl_AcpiMutexInfo[i].OwnerId == ThisThreadId)
---
> if (AcpiGbl_MutexInfo[i].OwnerId == ThisThreadId)
936c942
< AcpiGbl_AcpiMutexInfo[MutexId].OwnerId = ACPI_MUTEX_NOT_ACQUIRED;
---
> AcpiGbl_MutexInfo[MutexId].OwnerId = ACPI_MUTEX_NOT_ACQUIRED;
938c944
< Status = AcpiOsSignalSemaphore (AcpiGbl_AcpiMutexInfo[MutexId].Mutex, 1);
---
> Status = AcpiOsSignalSemaphore (AcpiGbl_MutexInfo[MutexId].Mutex, 1);