Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/acpica/dist Apply our local patches.
details: https://anonhg.NetBSD.org/src/rev/8df5597da6cb
branches: trunk
changeset: 762172:8df5597da6cb
user: jruoho <jruoho%NetBSD.org@localhost>
date: Thu Feb 17 07:21:14 2011 +0000
description:
Apply our local patches.
diffstat:
sys/external/bsd/acpica/dist/common/dmtbinfo.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslcompile.c | 4 +-
sys/external/bsd/acpica/dist/compiler/aslutils.c | 4 +-
sys/external/bsd/acpica/dist/debugger/dbcmds.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbdisply.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbexec.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbinput.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbutils.c | 2 +-
sys/external/bsd/acpica/dist/disassembler/dmresrc.c | 8 +-
sys/external/bsd/acpica/dist/disassembler/dmresrcl.c | 6 +-
sys/external/bsd/acpica/dist/dispatcher/dsopcode.c | 2 +-
sys/external/bsd/acpica/dist/events/evrgnini.c | 2 +-
sys/external/bsd/acpica/dist/events/evxface.c | 2 +
sys/external/bsd/acpica/dist/executer/exconfig.c | 4 +-
sys/external/bsd/acpica/dist/executer/exdebug.c | 12 +-
sys/external/bsd/acpica/dist/executer/exdump.c | 14 +-
sys/external/bsd/acpica/dist/include/acdebug.h | 4 +-
sys/external/bsd/acpica/dist/include/acdisasm.h | 12 +-
sys/external/bsd/acpica/dist/include/acglobal.h | 8 +-
sys/external/bsd/acpica/dist/include/acinterp.h | 2 +-
sys/external/bsd/acpica/dist/include/aclocal.h | 8 +-
sys/external/bsd/acpica/dist/include/acmacros.h | 84 ++++++++--------
sys/external/bsd/acpica/dist/include/acnamesp.h | 2 +-
sys/external/bsd/acpica/dist/include/acpiosxf.h | 2 +-
sys/external/bsd/acpica/dist/include/acpixf.h | 12 +-
sys/external/bsd/acpica/dist/include/acresrc.h | 4 +-
sys/external/bsd/acpica/dist/include/actables.h | 2 +-
sys/external/bsd/acpica/dist/include/actbl1.h | 2 +-
sys/external/bsd/acpica/dist/include/actypes.h | 5 +-
sys/external/bsd/acpica/dist/include/acutils.h | 12 +-
sys/external/bsd/acpica/dist/include/platform/acnetbsd.h | 38 ++++++-
sys/external/bsd/acpica/dist/namespace/nsaccess.c | 6 +-
sys/external/bsd/acpica/dist/namespace/nsdump.c | 2 +-
sys/external/bsd/acpica/dist/namespace/nseval.c | 2 +-
sys/external/bsd/acpica/dist/namespace/nsinit.c | 4 +-
sys/external/bsd/acpica/dist/namespace/nsrepair2.c | 6 +-
sys/external/bsd/acpica/dist/namespace/nsxfeval.c | 7 +-
sys/external/bsd/acpica/dist/namespace/nsxfname.c | 9 +-
sys/external/bsd/acpica/dist/parser/psopcode.c | 4 +-
sys/external/bsd/acpica/dist/resources/rsdump.c | 34 +++---
sys/external/bsd/acpica/dist/resources/rsutils.c | 2 +-
sys/external/bsd/acpica/dist/resources/rsxface.c | 10 +-
sys/external/bsd/acpica/dist/tables/tbfadt.c | 4 +-
sys/external/bsd/acpica/dist/tables/tbutils.c | 8 +-
sys/external/bsd/acpica/dist/tables/tbxface.c | 12 +-
sys/external/bsd/acpica/dist/tables/tbxfroot.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utcache.c | 4 +-
sys/external/bsd/acpica/dist/utilities/utdebug.c | 4 +-
sys/external/bsd/acpica/dist/utilities/uteval.c | 9 +-
sys/external/bsd/acpica/dist/utilities/utglobal.c | 18 +-
sys/external/bsd/acpica/dist/utilities/utmisc.c | 2 +-
sys/external/bsd/acpica/dist/utilities/uttrack.c | 4 +-
52 files changed, 226 insertions(+), 194 deletions(-)
diffs (truncated from 1577 to 300 lines):
diff -r a071645e4794 -r 8df5597da6cb sys/external/bsd/acpica/dist/common/dmtbinfo.c
--- a/sys/external/bsd/acpica/dist/common/dmtbinfo.c Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/common/dmtbinfo.c Thu Feb 17 07:21:14 2011 +0000
@@ -1416,7 +1416,7 @@
{ACPI_DMT_FLAG0, ACPI_SRAT0_FLAG_OFFSET (Flags,0), "Enabled", 0},
{ACPI_DMT_UINT8, ACPI_SRAT0_OFFSET (LocalSapicEid), "Local Sapic EID", 0},
{ACPI_DMT_UINT24, ACPI_SRAT0_OFFSET (ProximityDomainHi[0]), "Proximity Domain High(24)", 0},
- {ACPI_DMT_UINT32, ACPI_SRAT0_OFFSET (Reserved), "Reserved", 0},
+ {ACPI_DMT_UINT32, ACPI_SRAT0_OFFSET (ClockDomain), "Clock Domain", 0},
ACPI_DMT_TERMINATOR
};
diff -r a071645e4794 -r 8df5597da6cb sys/external/bsd/acpica/dist/compiler/aslcompile.c
--- a/sys/external/bsd/acpica/dist/compiler/aslcompile.c Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslcompile.c Thu Feb 17 07:21:14 2011 +0000
@@ -217,8 +217,8 @@
/* Version, build date, copyright, compliance */
FlPrintFile (FileId,
- " version %X [%s]\n%s%s\n%s%s\n%s\n",
- (UINT32) ACPI_CA_VERSION, __DATE__,
+ " version %X\n%s%s\n%s%s\n%s\n",
+ (UINT32) ACPI_CA_VERSION,
Prefix, CompilerCopyright,
Prefix, CompilerCompliance,
Prefix);
diff -r a071645e4794 -r 8df5597da6cb sys/external/bsd/acpica/dist/compiler/aslutils.c
--- a/sys/external/bsd/acpica/dist/compiler/aslutils.c Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslutils.c Thu Feb 17 07:21:14 2011 +0000
@@ -521,8 +521,8 @@
{
/* Compiler name and version number */
- FlPrintFile (FileId, "%s version %X [%s]\n",
- CompilerId, (UINT32) ACPI_CA_VERSION, __DATE__);
+ FlPrintFile (FileId, "%s version %X\n",
+ CompilerId, (UINT32) ACPI_CA_VERSION);
}
if (Gbl_FileType == ASL_INPUT_TYPE_ASCII_DATA)
diff -r a071645e4794 -r 8df5597da6cb sys/external/bsd/acpica/dist/debugger/dbcmds.c
--- a/sys/external/bsd/acpica/dist/debugger/dbcmds.c Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/debugger/dbcmds.c Thu Feb 17 07:21:14 2011 +0000
@@ -1786,7 +1786,7 @@
* Perform comparison of original AML to newly created AML. This tests both
* the AML->Resource conversion and the Resource->Aml conversion.
*/
- Status = AcpiDmTestResourceConversion (Node, METHOD_NAME__CRS);
+ Status = AcpiDmTestResourceConversion (Node, __UNCONST(METHOD_NAME__CRS));
/* Execute _SRS with the resource list */
diff -r a071645e4794 -r 8df5597da6cb sys/external/bsd/acpica/dist/debugger/dbdisply.c
--- a/sys/external/bsd/acpica/dist/debugger/dbdisply.c Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/debugger/dbdisply.c Thu Feb 17 07:21:14 2011 +0000
@@ -816,7 +816,7 @@
ACPI_GPE_XRUPT_INFO *GpeXruptInfo;
ACPI_GPE_EVENT_INFO *GpeEventInfo;
ACPI_GPE_REGISTER_INFO *GpeRegisterInfo;
- char *GpeType;
+ const char *GpeType;
UINT32 GpeIndex;
UINT32 Block = 0;
UINT32 i;
diff -r a071645e4794 -r 8df5597da6cb sys/external/bsd/acpica/dist/debugger/dbexec.c
--- a/sys/external/bsd/acpica/dist/debugger/dbexec.c Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/debugger/dbexec.c Thu Feb 17 07:21:14 2011 +0000
@@ -237,7 +237,7 @@
Params[1].Type = ACPI_TYPE_STRING;
Params[1].String.Length = 12;
- Params[1].String.Pointer = "AML Debugger";
+ Params[1].String.Pointer = __UNCONST("AML Debugger");
break;
default:
diff -r a071645e4794 -r 8df5597da6cb sys/external/bsd/acpica/dist/debugger/dbinput.c
--- a/sys/external/bsd/acpica/dist/debugger/dbinput.c Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/debugger/dbinput.c Thu Feb 17 07:21:14 2011 +0000
@@ -799,7 +799,7 @@
break;
case CMD_METHODS:
- Status = AcpiDbDisplayObjects ("METHOD", AcpiGbl_DbArgs[1]);
+ Status = AcpiDbDisplayObjects (__UNCONST("METHOD"), AcpiGbl_DbArgs[1]);
break;
case CMD_NAMESPACE:
diff -r a071645e4794 -r 8df5597da6cb sys/external/bsd/acpica/dist/debugger/dbutils.c
--- a/sys/external/bsd/acpica/dist/debugger/dbutils.c Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/debugger/dbutils.c Thu Feb 17 07:21:14 2011 +0000
@@ -138,7 +138,7 @@
UINT32 Address);
#endif
-static char *Converter = "0123456789ABCDEF";
+static const char *Converter = "0123456789ABCDEF";
/*******************************************************************************
diff -r a071645e4794 -r 8df5597da6cb sys/external/bsd/acpica/dist/disassembler/dmresrc.c
--- a/sys/external/bsd/acpica/dist/disassembler/dmresrc.c Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/disassembler/dmresrc.c Thu Feb 17 07:21:14 2011 +0000
@@ -222,7 +222,7 @@
void
AcpiDmDumpInteger8 (
UINT8 Value,
- char *Name)
+ const char *Name)
{
AcpiOsPrintf ("0x%2.2X, // %s\n", Value, Name);
}
@@ -230,7 +230,7 @@
void
AcpiDmDumpInteger16 (
UINT16 Value,
- char *Name)
+ const char *Name)
{
AcpiOsPrintf ("0x%4.4X, // %s\n", Value, Name);
}
@@ -238,7 +238,7 @@
void
AcpiDmDumpInteger32 (
UINT32 Value,
- char *Name)
+ const char *Name)
{
AcpiOsPrintf ("0x%8.8X, // %s\n", Value, Name);
}
@@ -246,7 +246,7 @@
void
AcpiDmDumpInteger64 (
UINT64 Value,
- char *Name)
+ const char *Name)
{
AcpiOsPrintf ("0x%8.8X%8.8X, // %s\n", ACPI_FORMAT_UINT64 (Value), Name);
}
diff -r a071645e4794 -r 8df5597da6cb sys/external/bsd/acpica/dist/disassembler/dmresrcl.c
--- a/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c Thu Feb 17 07:21:14 2011 +0000
@@ -127,7 +127,7 @@
/* Common names for address and memory descriptors */
-static char *AcpiDmAddressNames[] =
+static const char *AcpiDmAddressNames[] =
{
"Granularity",
"Range Minimum",
@@ -136,7 +136,7 @@
"Length"
};
-static char *AcpiDmMemoryNames[] =
+static const char *AcpiDmMemoryNames[] =
{
"Range Minimum",
"Range Maximum",
@@ -1067,7 +1067,7 @@
void
AcpiDmVendorCommon (
- char *Name,
+ const char *Name,
UINT8 *ByteData,
UINT32 Length,
UINT32 Level)
diff -r a071645e4794 -r 8df5597da6cb sys/external/bsd/acpica/dist/dispatcher/dsopcode.c
--- a/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c Thu Feb 17 07:21:14 2011 +0000
@@ -1564,7 +1564,7 @@
/* Call to the OSL in case OS wants a piece of the action */
Status = AcpiOsSignal (ACPI_SIGNAL_BREAKPOINT,
- "Executed AML Breakpoint opcode");
+ __UNCONST("Executed AML Breakpoint opcode"));
break;
diff -r a071645e4794 -r 8df5597da6cb sys/external/bsd/acpica/dist/events/evrgnini.c
--- a/sys/external/bsd/acpica/dist/events/evrgnini.c Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/events/evrgnini.c Thu Feb 17 07:21:14 2011 +0000
@@ -638,7 +638,7 @@
ACPI_NAMESPACE_NODE *Node;
ACPI_STATUS Status;
ACPI_NAMESPACE_NODE *MethodNode;
- ACPI_NAME *RegNamePtr = (ACPI_NAME *) METHOD_NAME__REG;
+ ACPI_NAME *RegNamePtr = (ACPI_NAME *) __UNCONST(METHOD_NAME__REG);
ACPI_OPERAND_OBJECT *RegionObj2;
diff -r a071645e4794 -r 8df5597da6cb sys/external/bsd/acpica/dist/events/evxface.c
--- a/sys/external/bsd/acpica/dist/events/evxface.c Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/events/evxface.c Thu Feb 17 07:21:14 2011 +0000
@@ -749,6 +749,8 @@
/* Disable the GPE before installing the handler */
+ if (GpeEventInfo->RuntimeCount)
+ GpeEventInfo->RuntimeCount--;
Status = AcpiEvDisableGpe (GpeEventInfo);
if (ACPI_FAILURE (Status))
{
diff -r a071645e4794 -r 8df5597da6cb sys/external/bsd/acpica/dist/executer/exconfig.c
--- a/sys/external/bsd/acpica/dist/executer/exconfig.c Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/executer/exconfig.c Thu Feb 17 07:21:14 2011 +0000
@@ -356,7 +356,7 @@
Status = AcpiGetTableByIndex (TableIndex, &Table);
if (ACPI_SUCCESS (Status))
{
- ACPI_INFO ((AE_INFO, "Dynamic OEM Table Load:"));
+ ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Dynamic OEM Table Load:"));
AcpiTbPrintTableHeader (0, Table);
}
@@ -652,7 +652,7 @@
return_ACPI_STATUS (Status);
}
- ACPI_INFO ((AE_INFO, "Dynamic OEM Table Load:"));
+ ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Dynamic OEM Table Load:"));
AcpiTbPrintTableHeader (0, TableDesc.Pointer);
/* Remove the reference by added by AcpiExStore above */
diff -r a071645e4794 -r 8df5597da6cb sys/external/bsd/acpica/dist/executer/exdebug.c
--- a/sys/external/bsd/acpica/dist/executer/exdebug.c Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/executer/exdebug.c Thu Feb 17 07:21:14 2011 +0000
@@ -140,10 +140,9 @@
*
* This function is not compiled if ACPI_NO_ERROR_MESSAGES is set.
*
- * This function is only enabled if AcpiGbl_EnableAmlDebugObject is set, or
- * if ACPI_LV_DEBUG_OBJECT is set in the AcpiDbgLevel. Thus, in the normal
- * operational case, stores to the debug object are ignored but can be easily
- * enabled if necessary.
+ * This function is only enabled if AcpiGbl_EnableAmlDebugObject is set.
+ * Thus, in the normal operational case, stores to the debug object are
+ * ignored but can be easily enabled if necessary.
*
******************************************************************************/
@@ -159,10 +158,9 @@
ACPI_FUNCTION_TRACE_PTR (ExDoDebugObject, SourceDesc);
- /* Output must be enabled via the DebugObject global or the DbgLevel */
+ /* Output must be enabled via the DebugObject global */
- if (!AcpiGbl_EnableAmlDebugObject &&
- !(AcpiDbgLevel & ACPI_LV_DEBUG_OBJECT))
+ if (!AcpiGbl_EnableAmlDebugObject)
{
return_VOID;
}
diff -r a071645e4794 -r 8df5597da6cb sys/external/bsd/acpica/dist/executer/exdump.c
--- a/sys/external/bsd/acpica/dist/executer/exdump.c Thu Feb 17 07:16:14 2011 +0000
+++ b/sys/external/bsd/acpica/dist/executer/exdump.c Thu Feb 17 07:21:14 2011 +0000
@@ -134,12 +134,12 @@
static void
AcpiExOutString (
- char *Title,
- char *Value);
+ const char *Title,
+ const char *Value);
static void
AcpiExOutPointer (
- char *Title,
+ const char *Title,
void *Value);
static void
@@ -441,7 +441,7 @@
while (Count)
{
Target = ACPI_ADD_PTR (UINT8, ObjDesc, Info->Offset);
- Name = Info->Name;
+ Name = __UNCONST(Info->Name);
switch (Info->Opcode)
{
@@ -902,15 +902,15 @@
static void
AcpiExOutString (
- char *Title,
- char *Value)
+ const char *Title,
+ const char *Value)
{
AcpiOsPrintf ("%20s : %s\n", Title, Value);
}
static void
AcpiExOutPointer (
- char *Title,
+ const char *Title,
Home |
Main Index |
Thread Index |
Old Index