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 fix debugging build.
details: https://anonhg.NetBSD.org/src/rev/e5feda9c0a85
branches: trunk
changeset: 325521:e5feda9c0a85
user: christos <christos%NetBSD.org@localhost>
date: Fri Dec 27 20:55:40 2013 +0000
description:
fix debugging build.
diffstat:
sys/external/bsd/acpica/dist/debugger/dbcmds.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbexec.c | 2 ++
sys/external/bsd/acpica/dist/debugger/dbinput.c | 10 +++++-----
sys/external/bsd/acpica/dist/debugger/dbmethod.c | 3 ++-
sys/external/bsd/acpica/dist/debugger/dbnames.c | 2 +-
sys/external/bsd/acpica/dist/include/acdebug.h | 4 ++--
sys/external/bsd/acpica/dist/parser/psopinfo.c | 2 +-
sys/external/bsd/acpica/dist/resources/rsdumpinfo.c | 4 ++--
sys/external/bsd/acpica/dist/utilities/uteval.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utmisc.c | 2 +-
10 files changed, 18 insertions(+), 15 deletions(-)
diffs (170 lines):
diff -r 6a9b76e6c193 -r e5feda9c0a85 sys/external/bsd/acpica/dist/debugger/dbcmds.c
--- a/sys/external/bsd/acpica/dist/debugger/dbcmds.c Fri Dec 27 20:55:03 2013 +0000
+++ b/sys/external/bsd/acpica/dist/debugger/dbcmds.c Fri Dec 27 20:55:40 2013 +0000
@@ -1027,7 +1027,7 @@
* tests both the AML->Resource conversion and the Resource->AML
* conversion.
*/
- (void) AcpiDmTestResourceConversion (Node, METHOD_NAME__CRS);
+ (void) AcpiDmTestResourceConversion (Node, __UNCONST(METHOD_NAME__CRS));
/* Execute _SRS with the resource list */
diff -r 6a9b76e6c193 -r e5feda9c0a85 sys/external/bsd/acpica/dist/debugger/dbexec.c
--- a/sys/external/bsd/acpica/dist/debugger/dbexec.c Fri Dec 27 20:55:03 2013 +0000
+++ b/sys/external/bsd/acpica/dist/debugger/dbexec.c Fri Dec 27 20:55:40 2013 +0000
@@ -319,6 +319,7 @@
*
******************************************************************************/
+#ifdef ACPI_DEBUG_OUTPUT
static UINT32
AcpiDbGetOutstandingAllocations (
void)
@@ -335,6 +336,7 @@
return (Outstanding);
}
+#endif
/*******************************************************************************
diff -r 6a9b76e6c193 -r e5feda9c0a85 sys/external/bsd/acpica/dist/debugger/dbinput.c
--- a/sys/external/bsd/acpica/dist/debugger/dbinput.c Fri Dec 27 20:55:03 2013 +0000
+++ b/sys/external/bsd/acpica/dist/debugger/dbinput.c Fri Dec 27 20:55:40 2013 +0000
@@ -68,7 +68,7 @@
static void
AcpiDbDisplayCommandInfo (
- char *Command,
+ const char *Command,
BOOLEAN DisplayAll);
static void
@@ -77,7 +77,7 @@
static BOOLEAN
AcpiDbMatchCommandHelp (
- char *Command,
+ const char *Command,
const ACPI_DB_COMMAND_HELP *Help);
@@ -335,10 +335,10 @@
static BOOLEAN
AcpiDbMatchCommandHelp (
- char *Command,
+ const char *Command,
const ACPI_DB_COMMAND_HELP *Help)
{
- char *Invocation = Help->Invocation;
+ const char *Invocation = Help->Invocation;
UINT32 LineCount;
@@ -397,7 +397,7 @@
static void
AcpiDbDisplayCommandInfo (
- char *Command,
+ const char *Command,
BOOLEAN DisplayAll)
{
const ACPI_DB_COMMAND_HELP *Next;
diff -r 6a9b76e6c193 -r e5feda9c0a85 sys/external/bsd/acpica/dist/debugger/dbmethod.c
--- a/sys/external/bsd/acpica/dist/debugger/dbmethod.c Fri Dec 27 20:55:03 2013 +0000
+++ b/sys/external/bsd/acpica/dist/debugger/dbmethod.c Fri Dec 27 20:55:40 2013 +0000
@@ -508,7 +508,8 @@
case ACPI_TYPE_STRING:
- ThisParam->String.Pointer = "This is the default argument string";
+ ThisParam->String.Pointer = __UNCONST(
+ "This is the default argument string");
ThisParam->String.Length = ACPI_STRLEN (ThisParam->String.Pointer);
break;
diff -r 6a9b76e6c193 -r e5feda9c0a85 sys/external/bsd/acpica/dist/debugger/dbnames.c
--- a/sys/external/bsd/acpica/dist/debugger/dbnames.c Fri Dec 27 20:55:03 2013 +0000
+++ b/sys/external/bsd/acpica/dist/debugger/dbnames.c Fri Dec 27 20:55:40 2013 +0000
@@ -195,7 +195,7 @@
}
if (AcpiUtSafeStrcat (AcpiGbl_DbScopeBuf, sizeof (AcpiGbl_DbScopeBuf),
- "\\"))
+ __UNCONST("\\")))
{
Status = AE_BUFFER_OVERFLOW;
goto ErrorExit;
diff -r 6a9b76e6c193 -r e5feda9c0a85 sys/external/bsd/acpica/dist/include/acdebug.h
--- a/sys/external/bsd/acpica/dist/include/acdebug.h Fri Dec 27 20:55:03 2013 +0000
+++ b/sys/external/bsd/acpica/dist/include/acdebug.h Fri Dec 27 20:55:40 2013 +0000
@@ -57,8 +57,8 @@
typedef struct acpi_db_command_help
{
UINT8 LineCount; /* Number of help lines */
- char *Invocation; /* Command Invocation */
- char *Description; /* Command Description */
+ const char *Invocation; /* Command Invocation */
+ const char *Description; /* Command Description */
} ACPI_DB_COMMAND_HELP;
diff -r 6a9b76e6c193 -r e5feda9c0a85 sys/external/bsd/acpica/dist/parser/psopinfo.c
--- a/sys/external/bsd/acpica/dist/parser/psopinfo.c Fri Dec 27 20:55:03 2013 +0000
+++ b/sys/external/bsd/acpica/dist/parser/psopinfo.c Fri Dec 27 20:55:40 2013 +0000
@@ -182,7 +182,7 @@
/* Always guaranteed to return a valid pointer */
- return (Op->Name);
+ return __UNCONST(Op->Name);
#else
return __UNCONST("OpcodeName unavailable");
diff -r 6a9b76e6c193 -r e5feda9c0a85 sys/external/bsd/acpica/dist/resources/rsdumpinfo.c
--- a/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c Fri Dec 27 20:55:03 2013 +0000
+++ b/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c Fri Dec 27 20:55:40 2013 +0000
@@ -326,7 +326,7 @@
ACPI_RSDUMP_INFO AcpiRsDumpMemoryFlags[5] =
{
- {ACPI_RSD_LITERAL, ACPI_RSD_TABLE_SIZE (AcpiRsDumpMemoryFlags), "Resource Type", (void *) "Memory Range"},
+ {ACPI_RSD_LITERAL, ACPI_RSD_TABLE_SIZE (AcpiRsDumpMemoryFlags), "Resource Type", (const void *) "Memory Range"},
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.Info.Mem.WriteProtect), "Write Protect", AcpiGbl_RwDecode},
{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Address.Info.Mem.Caching), "Caching", AcpiGbl_MemDecode},
{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Address.Info.Mem.RangeType), "Range Type", AcpiGbl_MtpDecode},
@@ -335,7 +335,7 @@
ACPI_RSDUMP_INFO AcpiRsDumpIoFlags[4] =
{
- {ACPI_RSD_LITERAL, ACPI_RSD_TABLE_SIZE (AcpiRsDumpIoFlags), "Resource Type", (void *) "I/O Range"},
+ {ACPI_RSD_LITERAL, ACPI_RSD_TABLE_SIZE (AcpiRsDumpIoFlags), "Resource Type", (const void *) "I/O Range"},
{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Address.Info.Io.RangeType), "Range Type", AcpiGbl_RngDecode},
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.Info.Io.Translation), "Translation", AcpiGbl_TtpDecode},
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Address.Info.Io.TranslationType), "Translation Type", AcpiGbl_TrsDecode}
diff -r 6a9b76e6c193 -r e5feda9c0a85 sys/external/bsd/acpica/dist/utilities/uteval.c
--- a/sys/external/bsd/acpica/dist/utilities/uteval.c Fri Dec 27 20:55:03 2013 +0000
+++ b/sys/external/bsd/acpica/dist/utilities/uteval.c Fri Dec 27 20:55:40 2013 +0000
@@ -105,7 +105,7 @@
if (Status == AE_NOT_FOUND)
{
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "[%4.4s.%s] was not found\n",
- AcpiUtGetNodeName (PrefixNode), UPath));
+ AcpiUtGetNodeName (PrefixNode), Path));
}
else
{
diff -r 6a9b76e6c193 -r e5feda9c0a85 sys/external/bsd/acpica/dist/utilities/utmisc.c
--- a/sys/external/bsd/acpica/dist/utilities/utmisc.c Fri Dec 27 20:55:03 2013 +0000
+++ b/sys/external/bsd/acpica/dist/utilities/utmisc.c Fri Dec 27 20:55:40 2013 +0000
@@ -399,7 +399,7 @@
AcpiUtDisplayInitPathname (
UINT8 Type,
ACPI_NAMESPACE_NODE *ObjHandle,
- char *Path)
+ const char *Path)
{
ACPI_STATUS Status;
ACPI_BUFFER Buffer;
Home |
Main Index |
Thread Index |
Old Index