summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/contrib/dev/acpica/acconfig.h4
-rw-r--r--sys/contrib/dev/acpica/acutils.h16
-rw-r--r--sys/contrib/dev/acpica/dbcmds.c22
-rw-r--r--sys/contrib/dev/acpica/dbxface.c9
-rw-r--r--sys/contrib/dev/acpica/tbget.c14
-rw-r--r--sys/contrib/dev/acpica/utglobal.c21
6 files changed, 50 insertions, 36 deletions
diff --git a/sys/contrib/dev/acpica/acconfig.h b/sys/contrib/dev/acpica/acconfig.h
index 7968a63..b746bc1 100644
--- a/sys/contrib/dev/acpica/acconfig.h
+++ b/sys/contrib/dev/acpica/acconfig.h
@@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acconfig.h - Global configuration constants
- * $Revision: 109 $
+ * $Revision: 112 $
*
*****************************************************************************/
@@ -145,7 +145,7 @@
/* Version string */
-#define ACPI_CA_VERSION 0x20020815
+#define ACPI_CA_VERSION 0x20021002
/* Version of ACPI supported */
diff --git a/sys/contrib/dev/acpica/acutils.h b/sys/contrib/dev/acpica/acutils.h
index 689e864..f2470fe 100644
--- a/sys/contrib/dev/acpica/acutils.h
+++ b/sys/contrib/dev/acpica/acutils.h
@@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acutils.h -- prototypes for the common (subsystem-wide) procedures
- * $Revision: 143 $
+ * $Revision: 146 $
*
*****************************************************************************/
@@ -229,7 +229,7 @@ AcpiUtAllocateOwnerId (
#ifndef ACPI_USE_SYSTEM_CLIBRARY
-UINT32
+ACPI_SIZE
AcpiUtStrlen (
const NATIVE_CHAR *String);
@@ -242,15 +242,15 @@ NATIVE_CHAR *
AcpiUtStrncpy (
NATIVE_CHAR *DstString,
const NATIVE_CHAR *SrcString,
- NATIVE_UINT Count);
+ ACPI_SIZE Count);
int
AcpiUtStrncmp (
const NATIVE_CHAR *String1,
const NATIVE_CHAR *String2,
- NATIVE_UINT Count);
+ ACPI_SIZE Count);
-UINT32
+int
AcpiUtStrcmp (
const NATIVE_CHAR *String1,
const NATIVE_CHAR *String2);
@@ -264,7 +264,7 @@ NATIVE_CHAR *
AcpiUtStrncat (
NATIVE_CHAR *DstString,
const NATIVE_CHAR *SrcString,
- NATIVE_UINT Count);
+ ACPI_SIZE Count);
UINT32
AcpiUtStrtoul (
@@ -281,13 +281,13 @@ void *
AcpiUtMemcpy (
void *Dest,
const void *Src,
- NATIVE_UINT Count);
+ ACPI_SIZE Count);
void *
AcpiUtMemset (
void *Dest,
NATIVE_UINT Value,
- NATIVE_UINT Count);
+ ACPI_SIZE Count);
int
AcpiUtToUpper (
diff --git a/sys/contrib/dev/acpica/dbcmds.c b/sys/contrib/dev/acpica/dbcmds.c
index 11bad98..d33cbf3 100644
--- a/sys/contrib/dev/acpica/dbcmds.c
+++ b/sys/contrib/dev/acpica/dbcmds.c
@@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbcmds - debug commands and output routines
- * $Revision: 87 $
+ * $Revision: 88 $
*
******************************************************************************/
@@ -283,7 +283,8 @@ AcpiDbDisplayTableInfo (
if (AcpiGbl_AcpiTables[i].Pointer)
{
AcpiOsPrintf ("%s at %p length %X\n", AcpiGbl_AcpiTableData[i].Name,
- AcpiGbl_AcpiTables[i].Pointer, AcpiGbl_AcpiTables[i].Length);
+ AcpiGbl_AcpiTables[i].Pointer,
+ (UINT32) AcpiGbl_AcpiTables[i].Length);
}
}
}
@@ -785,7 +786,7 @@ AcpiDbWalkForSpecificObjects (
return (AE_OK);
}
- AcpiOsPrintf ("%32s", Buffer.Pointer);
+ AcpiOsPrintf ("%32s", (char *) Buffer.Pointer);
ACPI_MEM_FREE (Buffer.Pointer);
@@ -796,11 +797,14 @@ AcpiDbWalkForSpecificObjects (
switch (ACPI_GET_OBJECT_TYPE (ObjDesc))
{
case ACPI_TYPE_METHOD:
- AcpiOsPrintf (" #Args %d Concurrency %X", ObjDesc->Method.ParamCount, ObjDesc->Method.Concurrency);
+ AcpiOsPrintf (" #Args %d Concurrency %X",
+ ObjDesc->Method.ParamCount, ObjDesc->Method.Concurrency);
break;
case ACPI_TYPE_INTEGER:
- AcpiOsPrintf (" Value %X", ObjDesc->Integer.Value);
+ AcpiOsPrintf (" Value %8.8X%8.8X",
+ ACPI_HIDWORD (ObjDesc->Integer.Value),
+ ACPI_LODWORD (ObjDesc->Integer.Value));
break;
case ACPI_TYPE_STRING:
@@ -808,7 +812,11 @@ AcpiDbWalkForSpecificObjects (
break;
case ACPI_TYPE_REGION:
- AcpiOsPrintf (" SpaceId %X Address %X Length %X", ObjDesc->Region.SpaceId, ObjDesc->Region.Address, ObjDesc->Region.Length);
+ AcpiOsPrintf (" SpaceId %X Length %X Address %8.8X%8.8X",
+ ObjDesc->Region.SpaceId,
+ ObjDesc->Region.Length,
+ ACPI_HIDWORD (ObjDesc->Region.Address),
+ ACPI_LODWORD (ObjDesc->Region.Address));
break;
case ACPI_TYPE_PACKAGE:
@@ -928,7 +936,7 @@ AcpiDbWalkAndMatchName (
}
else
{
- AcpiOsPrintf ("%32s (%p) - %s\n", Buffer.Pointer, ObjHandle,
+ AcpiOsPrintf ("%32s (%p) - %s\n", (char *) Buffer.Pointer, ObjHandle,
AcpiUtGetTypeName (((ACPI_NAMESPACE_NODE *) ObjHandle)->Type));
ACPI_MEM_FREE (Buffer.Pointer);
}
diff --git a/sys/contrib/dev/acpica/dbxface.c b/sys/contrib/dev/acpica/dbxface.c
index c2e3ac8..a1636a4 100644
--- a/sys/contrib/dev/acpica/dbxface.c
+++ b/sys/contrib/dev/acpica/dbxface.c
@@ -1,7 +1,7 @@
/*******************************************************************************
*
* Module Name: dbxface - AML Debugger external interfaces
- * $Revision: 64 $
+ * $Revision: 65 $
*
******************************************************************************/
@@ -294,7 +294,12 @@ AcpiDbSingleStep (
/* Restore everything */
Op->Common.Next = Next;
- AcpiOsPrintf ("\n\n");
+ AcpiOsPrintf ("\n");
+ if ((AcpiGbl_DbOutputToFile) ||
+ (AcpiDbgLevel & ACPI_LV_PARSE))
+ {
+ AcpiOsPrintf ("\n");
+ }
AcpiDbgLevel = OriginalDebugLevel;
}
diff --git a/sys/contrib/dev/acpica/tbget.c b/sys/contrib/dev/acpica/tbget.c
index 6e8178c..428ea3f 100644
--- a/sys/contrib/dev/acpica/tbget.c
+++ b/sys/contrib/dev/acpica/tbget.c
@@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: tbget - ACPI Table get* routines
- * $Revision: 79 $
+ * $Revision: 80 $
*
*****************************************************************************/
@@ -225,8 +225,10 @@ AcpiTbGetTableHeader (
(void **) &Header);
if (ACPI_FAILURE (Status))
{
- ACPI_REPORT_ERROR (("Could not map memory at %p for length %X\n",
- Address->Pointer.Physical, sizeof (ACPI_TABLE_HEADER)));
+ ACPI_REPORT_ERROR (("Could not map memory at %8.8X%8.8X for length %X\n",
+ ACPI_HIDWORD (Address->Pointer.Physical),
+ ACPI_LODWORD (Address->Pointer.Physical),
+ sizeof (ACPI_TABLE_HEADER)));
return_ACPI_STATUS (Status);
}
@@ -447,8 +449,10 @@ AcpiTbGetThisTable (
(void **) &FullTable);
if (ACPI_FAILURE (Status))
{
- ACPI_REPORT_ERROR (("Could not map memory for table [%4.4s] at %p for length %X\n",
- Header->Signature, Address->Pointer.Physical, Header->Length));
+ ACPI_REPORT_ERROR (("Could not map memory for table [%4.4s] at %8.8X%8.8X for length %X\n",
+ Header->Signature,
+ ACPI_HIDWORD (Address->Pointer.Physical),
+ ACPI_LODWORD (Address->Pointer.Physical), Header->Length));
return (Status);
}
diff --git a/sys/contrib/dev/acpica/utglobal.c b/sys/contrib/dev/acpica/utglobal.c
index 5a7b5f8..bcd60b5 100644
--- a/sys/contrib/dev/acpica/utglobal.c
+++ b/sys/contrib/dev/acpica/utglobal.c
@@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: utglobal - Global variables for the ACPI subsystem
- * $Revision: 168 $
+ * $Revision: 171 $
*
*****************************************************************************/
@@ -119,7 +119,6 @@
#include "acpi.h"
#include "acnamesp.h"
-#include "amlcode.h"
#define _COMPONENT ACPI_UTILITIES
ACPI_MODULE_NAME ("utglobal")
@@ -264,10 +263,10 @@ const NATIVE_CHAR *AcpiGbl_DbSleepStates[ACPI_NUM_SLEEP_STATES] = {
/*
- * Names built-in to the interpreter
+ * Predefined ACPI Names (Built-in to the Interpreter)
*
* Initial values are currently supported only for types String and Number.
- * To avoid type punning, both are specified as strings in this table.
+ * Both are specified as strings in this table.
*
* NOTES:
* 1) _SB_ is defined to be a device to allow _SB_/_INI to be run
@@ -276,11 +275,11 @@ const NATIVE_CHAR *AcpiGbl_DbSleepStates[ACPI_NUM_SLEEP_STATES] = {
const ACPI_PREDEFINED_NAMES AcpiGbl_PreDefinedNames[] =
{
- {"_GPE", INTERNAL_TYPE_DEF_ANY, NULL},
- {"_PR_", INTERNAL_TYPE_DEF_ANY, NULL},
+ {"_GPE", INTERNAL_TYPE_SCOPE, NULL},
+ {"_PR_", INTERNAL_TYPE_SCOPE, NULL},
{"_SB_", ACPI_TYPE_DEVICE, NULL},
- {"_SI_", INTERNAL_TYPE_DEF_ANY, NULL},
- {"_TZ_", INTERNAL_TYPE_DEF_ANY, NULL},
+ {"_SI_", INTERNAL_TYPE_SCOPE, NULL},
+ {"_TZ_", INTERNAL_TYPE_SCOPE, NULL},
{"_REV", ACPI_TYPE_INTEGER, "2"},
{"_OS_", ACPI_TYPE_STRING, ACPI_OS_NAME},
{"_GL_", ACPI_TYPE_MUTEX, "0"},
@@ -294,9 +293,7 @@ const ACPI_PREDEFINED_NAMES AcpiGbl_PreDefinedNames[] =
/*
* Properties of the ACPI Object Types, both internal and external.
- *
- * Elements of AcpiNsProperties are bit significant
- * and the table is indexed by values of ACPI_OBJECT_TYPE
+ * The table is indexed by values of ACPI_OBJECT_TYPE
*/
const UINT8 AcpiGbl_NsProperties[] =
@@ -629,7 +626,6 @@ AcpiUtGetObjectTypeName (
/*
* Strings and procedures used for debug only
- *
*/
@@ -862,6 +858,7 @@ AcpiUtInitGlobals (
AcpiGbl_GpeRegisterInfo = NULL;
AcpiGbl_GpeNumberInfo = NULL;
+ AcpiGbl_EventsInitialized = FALSE;
/* Namespace */
OpenPOWER on IntegriCloud