summaryrefslogtreecommitdiff
path: root/utilities
diff options
context:
space:
mode:
Diffstat (limited to 'utilities')
-rw-r--r--utilities/utalloc.c2
-rw-r--r--utilities/utcache.c2
-rw-r--r--utilities/utclib.c2
-rw-r--r--utilities/utcopy.c2
-rw-r--r--utilities/utdebug.c4
-rw-r--r--utilities/utdelete.c2
-rw-r--r--utilities/uteval.c4
-rw-r--r--utilities/utglobal.c4
-rw-r--r--utilities/utids.c2
-rw-r--r--utilities/utinit.c2
-rw-r--r--utilities/utlock.c2
-rw-r--r--utilities/utmath.c30
-rw-r--r--utilities/utmisc.c12
-rw-r--r--utilities/utmutex.c20
-rw-r--r--utilities/utobject.c2
-rw-r--r--utilities/utresrc.c2
-rw-r--r--utilities/utstate.c2
-rw-r--r--utilities/uttrack.c2
-rw-r--r--utilities/utxface.c2
19 files changed, 44 insertions, 56 deletions
diff --git a/utilities/utalloc.c b/utilities/utalloc.c
index a66b94005c1f..f72959a4d82a 100644
--- a/utilities/utalloc.c
+++ b/utilities/utalloc.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/utilities/utcache.c b/utilities/utcache.c
index aabc0a23052e..2cee9a13ce14 100644
--- a/utilities/utcache.c
+++ b/utilities/utcache.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/utilities/utclib.c b/utilities/utclib.c
index a9b8122fab86..fd7796fee501 100644
--- a/utilities/utclib.c
+++ b/utilities/utclib.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/utilities/utcopy.c b/utilities/utcopy.c
index 5423eff9dec4..fe44083c5983 100644
--- a/utilities/utcopy.c
+++ b/utilities/utcopy.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/utilities/utdebug.c b/utilities/utdebug.c
index 3901b07d197e..0a91716f24cc 100644
--- a/utilities/utdebug.c
+++ b/utilities/utdebug.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -598,7 +598,7 @@ AcpiUtValueExit (
const char *FunctionName,
const char *ModuleName,
UINT32 ComponentId,
- ACPI_INTEGER Value)
+ UINT64 Value)
{
AcpiDebugPrint (ACPI_LV_FUNCTIONS,
diff --git a/utilities/utdelete.c b/utilities/utdelete.c
index bf30aee74e06..31bf40b4e745 100644
--- a/utilities/utdelete.c
+++ b/utilities/utdelete.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/utilities/uteval.c b/utilities/uteval.c
index ecb0cf19a704..c959d44bb594 100644
--- a/utilities/uteval.c
+++ b/utilities/uteval.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -423,7 +423,7 @@ ACPI_STATUS
AcpiUtEvaluateNumericObject (
char *ObjectName,
ACPI_NAMESPACE_NODE *DeviceNode,
- ACPI_INTEGER *Value)
+ UINT64 *Value)
{
ACPI_OPERAND_OBJECT *ObjDesc;
ACPI_STATUS Status;
diff --git a/utilities/utglobal.c b/utilities/utglobal.c
index b49ce352fbc7..236d811714cd 100644
--- a/utilities/utglobal.c
+++ b/utilities/utglobal.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -331,7 +331,7 @@ static const char AcpiGbl_HexToAscii[] =
char
AcpiUtHexToAsciiChar (
- ACPI_INTEGER Integer,
+ UINT64 Integer,
UINT32 Position)
{
diff --git a/utilities/utids.c b/utilities/utids.c
index 766933050083..ee7b19d885c3 100644
--- a/utilities/utids.c
+++ b/utilities/utids.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/utilities/utinit.c b/utilities/utinit.c
index d59904b46a2f..767c5623ef74 100644
--- a/utilities/utinit.c
+++ b/utilities/utinit.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/utilities/utlock.c b/utilities/utlock.c
index dd4e100001af..e17ca3e7d781 100644
--- a/utilities/utlock.c
+++ b/utilities/utlock.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/utilities/utmath.c b/utilities/utmath.c
index b0a40ff2bcfd..54d492f234f3 100644
--- a/utilities/utmath.c
+++ b/utilities/utmath.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -149,9 +149,9 @@
ACPI_STATUS
AcpiUtShortDivide (
- ACPI_INTEGER Dividend,
+ UINT64 Dividend,
UINT32 Divisor,
- ACPI_INTEGER *OutQuotient,
+ UINT64 *OutQuotient,
UINT32 *OutRemainder)
{
UINT64_OVERLAY DividendOvl;
@@ -213,10 +213,10 @@ AcpiUtShortDivide (
ACPI_STATUS
AcpiUtDivide (
- ACPI_INTEGER InDividend,
- ACPI_INTEGER InDivisor,
- ACPI_INTEGER *OutQuotient,
- ACPI_INTEGER *OutRemainder)
+ UINT64 InDividend,
+ UINT64 InDivisor,
+ UINT64 *OutQuotient,
+ UINT64 *OutRemainder)
{
UINT64_OVERLAY Dividend;
UINT64_OVERLAY Divisor;
@@ -293,8 +293,8 @@ AcpiUtDivide (
* The 64-bit remainder must be generated.
*/
Partial1 = Quotient.Part.Lo * Divisor.Part.Hi;
- Partial2.Full = (ACPI_INTEGER) Quotient.Part.Lo * Divisor.Part.Lo;
- Partial3.Full = (ACPI_INTEGER) Partial2.Part.Hi + Partial1;
+ Partial2.Full = (UINT64) Quotient.Part.Lo * Divisor.Part.Lo;
+ Partial3.Full = (UINT64) Partial2.Part.Hi + Partial1;
Remainder.Part.Hi = Partial3.Part.Lo;
Remainder.Part.Lo = Partial2.Part.Lo;
@@ -362,9 +362,9 @@ AcpiUtDivide (
ACPI_STATUS
AcpiUtShortDivide (
- ACPI_INTEGER InDividend,
+ UINT64 InDividend,
UINT32 Divisor,
- ACPI_INTEGER *OutQuotient,
+ UINT64 *OutQuotient,
UINT32 *OutRemainder)
{
@@ -395,10 +395,10 @@ AcpiUtShortDivide (
ACPI_STATUS
AcpiUtDivide (
- ACPI_INTEGER InDividend,
- ACPI_INTEGER InDivisor,
- ACPI_INTEGER *OutQuotient,
- ACPI_INTEGER *OutRemainder)
+ UINT64 InDividend,
+ UINT64 InDivisor,
+ UINT64 *OutQuotient,
+ UINT64 *OutRemainder)
{
ACPI_FUNCTION_TRACE (UtDivide);
diff --git a/utilities/utmisc.c b/utilities/utmisc.c
index bc27cd529388..37b15e2c4c7b 100644
--- a/utilities/utmisc.c
+++ b/utilities/utmisc.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -929,12 +929,12 @@ ACPI_STATUS
AcpiUtStrtoul64 (
char *String,
UINT32 Base,
- ACPI_INTEGER *RetInteger)
+ UINT64 *RetInteger)
{
UINT32 ThisDigit = 0;
- ACPI_INTEGER ReturnValue = 0;
- ACPI_INTEGER Quotient;
- ACPI_INTEGER Dividend;
+ UINT64 ReturnValue = 0;
+ UINT64 Quotient;
+ UINT64 Dividend;
UINT32 ToIntegerOp = (Base == ACPI_ANY_BASE);
UINT32 Mode32 = (AcpiGbl_IntegerByteWidth == 4);
UINT8 ValidDigits = 0;
@@ -1071,7 +1071,7 @@ AcpiUtStrtoul64 (
/* Divide the digit into the correct position */
- (void) AcpiUtShortDivide ((Dividend - (ACPI_INTEGER) ThisDigit),
+ (void) AcpiUtShortDivide ((Dividend - (UINT64) ThisDigit),
Base, &Quotient, NULL);
if (ReturnValue > Quotient)
diff --git a/utilities/utmutex.c b/utilities/utmutex.c
index f6e7cc36522d..9e0ed3b713c7 100644
--- a/utilities/utmutex.c
+++ b/utilities/utmutex.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
@@ -128,7 +128,7 @@ static ACPI_STATUS
AcpiUtCreateMutex (
ACPI_MUTEX_HANDLE MutexId);
-static ACPI_STATUS
+static void
AcpiUtDeleteMutex (
ACPI_MUTEX_HANDLE MutexId);
@@ -216,7 +216,7 @@ AcpiUtMutexTerminate (
for (i = 0; i < ACPI_NUM_MUTEX; i++)
{
- (void) AcpiUtDeleteMutex (i);
+ AcpiUtDeleteMutex (i);
}
/* Delete the spinlocks */
@@ -253,11 +253,6 @@ AcpiUtCreateMutex (
ACPI_FUNCTION_TRACE_U32 (UtCreateMutex, MutexId);
- if (MutexId > ACPI_MAX_MUTEX)
- {
- return_ACPI_STATUS (AE_BAD_PARAMETER);
- }
-
if (!AcpiGbl_MutexInfo[MutexId].Mutex)
{
Status = AcpiOsCreateMutex (&AcpiGbl_MutexInfo[MutexId].Mutex);
@@ -281,7 +276,7 @@ AcpiUtCreateMutex (
*
******************************************************************************/
-static ACPI_STATUS
+static void
AcpiUtDeleteMutex (
ACPI_MUTEX_HANDLE MutexId)
{
@@ -289,17 +284,10 @@ AcpiUtDeleteMutex (
ACPI_FUNCTION_TRACE_U32 (UtDeleteMutex, MutexId);
- if (MutexId > ACPI_MAX_MUTEX)
- {
- return_ACPI_STATUS (AE_BAD_PARAMETER);
- }
-
AcpiOsDeleteMutex (AcpiGbl_MutexInfo[MutexId].Mutex);
AcpiGbl_MutexInfo[MutexId].Mutex = NULL;
AcpiGbl_MutexInfo[MutexId].ThreadId = ACPI_MUTEX_NOT_ACQUIRED;
-
- return_ACPI_STATUS (AE_OK);
}
diff --git a/utilities/utobject.c b/utilities/utobject.c
index 5164744891b8..fabed520c798 100644
--- a/utilities/utobject.c
+++ b/utilities/utobject.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/utilities/utresrc.c b/utilities/utresrc.c
index 2f19d639868c..02bb1dbfe60a 100644
--- a/utilities/utresrc.c
+++ b/utilities/utresrc.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/utilities/utstate.c b/utilities/utstate.c
index 245ca02bfc5e..08218d11c91a 100644
--- a/utilities/utstate.c
+++ b/utilities/utstate.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/utilities/uttrack.c b/utilities/uttrack.c
index d712c1a3e5ab..500ed458248c 100644
--- a/utilities/uttrack.c
+++ b/utilities/uttrack.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License
diff --git a/utilities/utxface.c b/utilities/utxface.c
index ba57f4922b78..f59a08dba485 100644
--- a/utilities/utxface.c
+++ b/utilities/utxface.c
@@ -8,7 +8,7 @@
*
* 1. Copyright Notice
*
- * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
* All rights reserved.
*
* 2. License