Module Name: src
Committed By: christos
Date: Fri Dec 27 20:55:41 UTC 2013
Modified Files:
src/sys/external/bsd/acpica/dist/debugger: dbcmds.c dbexec.c dbinput.c
dbmethod.c dbnames.c
src/sys/external/bsd/acpica/dist/include: acdebug.h
src/sys/external/bsd/acpica/dist/parser: psopinfo.c
src/sys/external/bsd/acpica/dist/resources: rsdumpinfo.c
src/sys/external/bsd/acpica/dist/utilities: uteval.c utmisc.c
Log Message:
fix debugging build.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/acpica/dist/debugger/dbcmds.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/acpica/dist/debugger/dbexec.c \
src/sys/external/bsd/acpica/dist/debugger/dbinput.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/sys/external/bsd/acpica/dist/debugger/dbmethod.c \
src/sys/external/bsd/acpica/dist/debugger/dbnames.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/acpica/dist/include/acdebug.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/acpica/dist/parser/psopinfo.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/acpica/dist/utilities/uteval.c \
src/sys/external/bsd/acpica/dist/utilities/utmisc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/acpica/dist/debugger/dbcmds.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbcmds.c:1.4 src/sys/external/bsd/acpica/dist/debugger/dbcmds.c:1.5
--- src/sys/external/bsd/acpica/dist/debugger/dbcmds.c:1.4 Fri Dec 27 13:50:56 2013
+++ src/sys/external/bsd/acpica/dist/debugger/dbcmds.c Fri Dec 27 15:55:40 2013
@@ -1027,7 +1027,7 @@ GetCrs:
* 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 */
Index: src/sys/external/bsd/acpica/dist/debugger/dbexec.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbexec.c:1.5 src/sys/external/bsd/acpica/dist/debugger/dbexec.c:1.6
--- src/sys/external/bsd/acpica/dist/debugger/dbexec.c:1.5 Fri Dec 27 13:50:56 2013
+++ src/sys/external/bsd/acpica/dist/debugger/dbexec.c Fri Dec 27 15:55:40 2013
@@ -319,6 +319,7 @@ AcpiDbGetCacheInfo (
*
******************************************************************************/
+#ifdef ACPI_DEBUG_OUTPUT
static UINT32
AcpiDbGetOutstandingAllocations (
void)
@@ -335,6 +336,7 @@ AcpiDbGetOutstandingAllocations (
return (Outstanding);
}
+#endif
/*******************************************************************************
Index: src/sys/external/bsd/acpica/dist/debugger/dbinput.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbinput.c:1.5 src/sys/external/bsd/acpica/dist/debugger/dbinput.c:1.6
--- src/sys/external/bsd/acpica/dist/debugger/dbinput.c:1.5 Fri Dec 27 13:50:56 2013
+++ src/sys/external/bsd/acpica/dist/debugger/dbinput.c Fri Dec 27 15:55:40 2013
@@ -68,7 +68,7 @@ AcpiDbSingleThread (
static void
AcpiDbDisplayCommandInfo (
- char *Command,
+ const char *Command,
BOOLEAN DisplayAll);
static void
@@ -77,7 +77,7 @@ AcpiDbDisplayHelp (
static BOOLEAN
AcpiDbMatchCommandHelp (
- char *Command,
+ const char *Command,
const ACPI_DB_COMMAND_HELP *Help);
@@ -335,10 +335,10 @@ static const ACPI_DB_COMMAND_HELP Acpi
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 @@ AcpiDbMatchCommandHelp (
static void
AcpiDbDisplayCommandInfo (
- char *Command,
+ const char *Command,
BOOLEAN DisplayAll)
{
const ACPI_DB_COMMAND_HELP *Next;
Index: src/sys/external/bsd/acpica/dist/debugger/dbmethod.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbmethod.c:1.1.1.2 src/sys/external/bsd/acpica/dist/debugger/dbmethod.c:1.2
--- src/sys/external/bsd/acpica/dist/debugger/dbmethod.c:1.1.1.2 Fri Dec 27 13:46:01 2013
+++ src/sys/external/bsd/acpica/dist/debugger/dbmethod.c Fri Dec 27 15:55:40 2013
@@ -508,7 +508,8 @@ AcpiDbWalkForExecute (
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;
Index: src/sys/external/bsd/acpica/dist/debugger/dbnames.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbnames.c:1.1.1.2 src/sys/external/bsd/acpica/dist/debugger/dbnames.c:1.2
--- src/sys/external/bsd/acpica/dist/debugger/dbnames.c:1.1.1.2 Fri Dec 27 13:46:01 2013
+++ src/sys/external/bsd/acpica/dist/debugger/dbnames.c Fri Dec 27 15:55:40 2013
@@ -195,7 +195,7 @@ AcpiDbSetScope (
}
if (AcpiUtSafeStrcat (AcpiGbl_DbScopeBuf, sizeof (AcpiGbl_DbScopeBuf),
- "\\"))
+ __UNCONST("\\")))
{
Status = AE_BUFFER_OVERFLOW;
goto ErrorExit;
Index: src/sys/external/bsd/acpica/dist/include/acdebug.h
diff -u src/sys/external/bsd/acpica/dist/include/acdebug.h:1.5 src/sys/external/bsd/acpica/dist/include/acdebug.h:1.6
--- src/sys/external/bsd/acpica/dist/include/acdebug.h:1.5 Fri Dec 27 13:50:57 2013
+++ src/sys/external/bsd/acpica/dist/include/acdebug.h Fri Dec 27 15:55:40 2013
@@ -57,8 +57,8 @@ typedef struct acpi_db_command_info
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;
Index: src/sys/external/bsd/acpica/dist/parser/psopinfo.c
diff -u src/sys/external/bsd/acpica/dist/parser/psopinfo.c:1.2 src/sys/external/bsd/acpica/dist/parser/psopinfo.c:1.3
--- src/sys/external/bsd/acpica/dist/parser/psopinfo.c:1.2 Fri Dec 27 13:50:57 2013
+++ src/sys/external/bsd/acpica/dist/parser/psopinfo.c Fri Dec 27 15:55:40 2013
@@ -182,7 +182,7 @@ AcpiPsGetOpcodeName (
/* Always guaranteed to return a valid pointer */
- return (Op->Name);
+ return __UNCONST(Op->Name);
#else
return __UNCONST("OpcodeName unavailable");
Index: src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c
diff -u src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c:1.1.1.1 src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c:1.2
--- src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c:1.1.1.1 Fri Dec 27 13:46:25 2013
+++ src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c Fri Dec 27 15:55:41 2013
@@ -326,7 +326,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpGenera
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 AcpiRsDumpMemory
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}
Index: src/sys/external/bsd/acpica/dist/utilities/uteval.c
diff -u src/sys/external/bsd/acpica/dist/utilities/uteval.c:1.4 src/sys/external/bsd/acpica/dist/utilities/uteval.c:1.5
--- src/sys/external/bsd/acpica/dist/utilities/uteval.c:1.4 Fri Dec 27 13:50:57 2013
+++ src/sys/external/bsd/acpica/dist/utilities/uteval.c Fri Dec 27 15:55:41 2013
@@ -105,7 +105,7 @@ AcpiUtEvaluateObject (
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
{
Index: src/sys/external/bsd/acpica/dist/utilities/utmisc.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utmisc.c:1.4 src/sys/external/bsd/acpica/dist/utilities/utmisc.c:1.5
--- src/sys/external/bsd/acpica/dist/utilities/utmisc.c:1.4 Fri Dec 27 13:50:57 2013
+++ src/sys/external/bsd/acpica/dist/utilities/utmisc.c Fri Dec 27 15:55:41 2013
@@ -399,7 +399,7 @@ void
AcpiUtDisplayInitPathname (
UINT8 Type,
ACPI_NAMESPACE_NODE *ObjHandle,
- char *Path)
+ const char *Path)
{
ACPI_STATUS Status;
ACPI_BUFFER Buffer;
