Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/intel-public/acpica/dist Build fixes for NetBSD.
details: https://anonhg.NetBSD.org/src/rev/d4a955ced3ec
branches: trunk
changeset: 746696:d4a955ced3ec
user: jmcneill <jmcneill%NetBSD.org@localhost>
date: Tue Aug 18 16:26:10 2009 +0000
description:
Build fixes for NetBSD.
diffstat:
sys/external/intel-public/acpica/dist/debugger/dbcmds.c | 2 +-
sys/external/intel-public/acpica/dist/debugger/dbexec.c | 2 +-
sys/external/intel-public/acpica/dist/debugger/dbinput.c | 2 +-
sys/external/intel-public/acpica/dist/debugger/dbutils.c | 2 +-
sys/external/intel-public/acpica/dist/disassembler/dmresrc.c | 8 +-
sys/external/intel-public/acpica/dist/disassembler/dmresrcl.c | 6 +-
sys/external/intel-public/acpica/dist/dispatcher/dsopcode.c | 2 +-
sys/external/intel-public/acpica/dist/events/evrgnini.c | 2 +-
sys/external/intel-public/acpica/dist/executer/exdump.c | 14 +-
sys/external/intel-public/acpica/dist/include/acdebug.h | 4 +-
sys/external/intel-public/acpica/dist/include/acdisasm.h | 12 +-
sys/external/intel-public/acpica/dist/include/acinterp.h | 2 +-
sys/external/intel-public/acpica/dist/include/aclocal.h | 8 +-
sys/external/intel-public/acpica/dist/include/acmacros.h | 84 +++++-----
sys/external/intel-public/acpica/dist/include/acnamesp.h | 2 +-
sys/external/intel-public/acpica/dist/include/acpiosxf.h | 2 +-
sys/external/intel-public/acpica/dist/include/acpixf.h | 12 +-
sys/external/intel-public/acpica/dist/include/acresrc.h | 4 +-
sys/external/intel-public/acpica/dist/include/actables.h | 2 +-
sys/external/intel-public/acpica/dist/include/actypes.h | 5 +-
sys/external/intel-public/acpica/dist/include/acutils.h | 10 +-
sys/external/intel-public/acpica/dist/include/platform/acnetbsd.h | 17 +-
sys/external/intel-public/acpica/dist/namespace/nsaccess.c | 6 +-
sys/external/intel-public/acpica/dist/namespace/nsdump.c | 2 +-
sys/external/intel-public/acpica/dist/namespace/nsinit.c | 2 +-
sys/external/intel-public/acpica/dist/namespace/nsxfeval.c | 7 +-
sys/external/intel-public/acpica/dist/namespace/nsxfname.c | 9 +-
sys/external/intel-public/acpica/dist/parser/psopcode.c | 4 +-
sys/external/intel-public/acpica/dist/resources/rsutils.c | 2 +-
sys/external/intel-public/acpica/dist/resources/rsxface.c | 10 +-
sys/external/intel-public/acpica/dist/tables/tbfadt.c | 4 +-
sys/external/intel-public/acpica/dist/tables/tbutils.c | 2 +-
sys/external/intel-public/acpica/dist/tables/tbxface.c | 12 +-
sys/external/intel-public/acpica/dist/utilities/utcache.c | 4 +-
sys/external/intel-public/acpica/dist/utilities/utdebug.c | 4 +-
sys/external/intel-public/acpica/dist/utilities/uteval.c | 9 +-
sys/external/intel-public/acpica/dist/utilities/utglobal.c | 18 +-
sys/external/intel-public/acpica/dist/utilities/utmisc.c | 2 +-
sys/external/intel-public/acpica/dist/utilities/uttrack.c | 4 +-
39 files changed, 158 insertions(+), 147 deletions(-)
diffs (truncated from 1187 to 300 lines):
diff -r b103954e2482 -r d4a955ced3ec sys/external/intel-public/acpica/dist/debugger/dbcmds.c
--- a/sys/external/intel-public/acpica/dist/debugger/dbcmds.c Tue Aug 18 16:23:28 2009 +0000
+++ b/sys/external/intel-public/acpica/dist/debugger/dbcmds.c Tue Aug 18 16:26:10 2009 +0000
@@ -1770,7 +1770,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 b103954e2482 -r d4a955ced3ec sys/external/intel-public/acpica/dist/debugger/dbexec.c
--- a/sys/external/intel-public/acpica/dist/debugger/dbexec.c Tue Aug 18 16:23:28 2009 +0000
+++ b/sys/external/intel-public/acpica/dist/debugger/dbexec.c Tue Aug 18 16:26:10 2009 +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 b103954e2482 -r d4a955ced3ec sys/external/intel-public/acpica/dist/debugger/dbinput.c
--- a/sys/external/intel-public/acpica/dist/debugger/dbinput.c Tue Aug 18 16:23:28 2009 +0000
+++ b/sys/external/intel-public/acpica/dist/debugger/dbinput.c Tue Aug 18 16:26:10 2009 +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 b103954e2482 -r d4a955ced3ec sys/external/intel-public/acpica/dist/debugger/dbutils.c
--- a/sys/external/intel-public/acpica/dist/debugger/dbutils.c Tue Aug 18 16:23:28 2009 +0000
+++ b/sys/external/intel-public/acpica/dist/debugger/dbutils.c Tue Aug 18 16:26:10 2009 +0000
@@ -138,7 +138,7 @@
UINT32 Address);
#endif
-static char *Converter = "0123456789ABCDEF";
+static const char *Converter = "0123456789ABCDEF";
/*******************************************************************************
diff -r b103954e2482 -r d4a955ced3ec sys/external/intel-public/acpica/dist/disassembler/dmresrc.c
--- a/sys/external/intel-public/acpica/dist/disassembler/dmresrc.c Tue Aug 18 16:23:28 2009 +0000
+++ b/sys/external/intel-public/acpica/dist/disassembler/dmresrc.c Tue Aug 18 16:26:10 2009 +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 b103954e2482 -r d4a955ced3ec sys/external/intel-public/acpica/dist/disassembler/dmresrcl.c
--- a/sys/external/intel-public/acpica/dist/disassembler/dmresrcl.c Tue Aug 18 16:23:28 2009 +0000
+++ b/sys/external/intel-public/acpica/dist/disassembler/dmresrcl.c Tue Aug 18 16:26:10 2009 +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 b103954e2482 -r d4a955ced3ec sys/external/intel-public/acpica/dist/dispatcher/dsopcode.c
--- a/sys/external/intel-public/acpica/dist/dispatcher/dsopcode.c Tue Aug 18 16:23:28 2009 +0000
+++ b/sys/external/intel-public/acpica/dist/dispatcher/dsopcode.c Tue Aug 18 16:26:10 2009 +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 b103954e2482 -r d4a955ced3ec sys/external/intel-public/acpica/dist/events/evrgnini.c
--- a/sys/external/intel-public/acpica/dist/events/evrgnini.c Tue Aug 18 16:23:28 2009 +0000
+++ b/sys/external/intel-public/acpica/dist/events/evrgnini.c Tue Aug 18 16:26:10 2009 +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 b103954e2482 -r d4a955ced3ec sys/external/intel-public/acpica/dist/executer/exdump.c
--- a/sys/external/intel-public/acpica/dist/executer/exdump.c Tue Aug 18 16:23:28 2009 +0000
+++ b/sys/external/intel-public/acpica/dist/executer/exdump.c Tue Aug 18 16:26:10 2009 +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,
void *Value)
{
AcpiOsPrintf ("%20s : %p\n", Title, Value);
diff -r b103954e2482 -r d4a955ced3ec sys/external/intel-public/acpica/dist/include/acdebug.h
--- a/sys/external/intel-public/acpica/dist/include/acdebug.h Tue Aug 18 16:23:28 2009 +0000
+++ b/sys/external/intel-public/acpica/dist/include/acdebug.h Tue Aug 18 16:26:10 2009 +0000
@@ -121,7 +121,7 @@
typedef struct CommandInfo
{
- char *Name; /* Command Name */
+ const char *Name; /* Command Name */
UINT8 MinArgs; /* Minimum arguments required */
} COMMAND_INFO;
@@ -129,7 +129,7 @@
typedef struct ArgumentInfo
{
- char *Name; /* Argument Name */
+ const char *Name; /* Argument Name */
} ARGUMENT_INFO;
diff -r b103954e2482 -r d4a955ced3ec sys/external/intel-public/acpica/dist/include/acdisasm.h
--- a/sys/external/intel-public/acpica/dist/include/acdisasm.h Tue Aug 18 16:23:28 2009 +0000
+++ b/sys/external/intel-public/acpica/dist/include/acdisasm.h Tue Aug 18 16:26:10 2009 +0000
@@ -123,7 +123,7 @@
#define BLOCK_PAREN 1
#define BLOCK_BRACE 2
#define BLOCK_COMMA_LIST 4
-#define ACPI_DEFAULT_RESNAME *(UINT32 *) "__RD"
+#define ACPI_DEFAULT_RESNAME *(const UINT32 *) "__RD"
typedef struct acpi_external_list
{
@@ -560,22 +560,22 @@
void
AcpiDmDumpInteger8 (
UINT8 Value,
- char *Name);
+ const char *Name);
void
AcpiDmDumpInteger16 (
UINT16 Value,
- char *Name);
+ const char *Name);
void
AcpiDmDumpInteger32 (
UINT32 Value,
- char *Name);
+ const char *Name);
void
AcpiDmDumpInteger64 (
UINT64 Value,
- char *Name);
+ const char *Name);
void
AcpiDmResourceTemplate (
@@ -670,7 +670,7 @@
void
AcpiDmVendorCommon (
- char *Name,
+ const char *Name,
UINT8 *ByteData,
UINT32 Length,
UINT32 Level);
diff -r b103954e2482 -r d4a955ced3ec sys/external/intel-public/acpica/dist/include/acinterp.h
--- a/sys/external/intel-public/acpica/dist/include/acinterp.h Tue Aug 18 16:23:28 2009 +0000
+++ b/sys/external/intel-public/acpica/dist/include/acinterp.h Tue Aug 18 16:26:10 2009 +0000
@@ -141,7 +141,7 @@
{
UINT8 Opcode;
UINT8 Offset;
- char *Name;
+ const char *Name;
} ACPI_EXDUMP_INFO;
diff -r b103954e2482 -r d4a955ced3ec sys/external/intel-public/acpica/dist/include/aclocal.h
--- a/sys/external/intel-public/acpica/dist/include/aclocal.h Tue Aug 18 16:23:28 2009 +0000
+++ b/sys/external/intel-public/acpica/dist/include/aclocal.h Tue Aug 18 16:26:10 2009 +0000
@@ -170,7 +170,7 @@
/* Debug names for the mutexes above */
-static char *AcpiGbl_MutexNames[ACPI_NUM_MUTEX] =
+static const char *AcpiGbl_MutexNames[ACPI_NUM_MUTEX] =
{
"ACPI_MTX_Interpreter",
"ACPI_MTX_Namespace",
@@ -839,7 +839,7 @@
typedef struct acpi_opcode_info
{
#if defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUG_OUTPUT)
- char *Name; /* Opcode name (disassembler/debug only) */
+ const char *Name; /* Opcode name (disassembler/debug only) */
#endif
UINT32 ParseArgs; /* Grammar/Parse time arguments */
UINT32 RuntimeArgs; /* Interpret time arguments */
@@ -1132,14 +1132,14 @@
typedef struct acpi_interface_info
{
- char *Name;
+ const char *Name;
UINT8 Value;
} ACPI_INTERFACE_INFO;
Home |
Main Index |
Thread Index |
Old Index