fix debugging build.

This commit is contained in:
christos 2013-12-27 20:55:40 +00:00
parent fcb25a8463
commit 8c78eb9844
10 changed files with 18 additions and 15 deletions

View File

@ -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 */

View File

@ -319,6 +319,7 @@ AcpiDbGetCacheInfo (
*
******************************************************************************/
#ifdef ACPI_DEBUG_OUTPUT
static UINT32
AcpiDbGetOutstandingAllocations (
void)
@ -335,6 +336,7 @@ AcpiDbGetOutstandingAllocations (
return (Outstanding);
}
#endif
/*******************************************************************************

View File

@ -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 AcpiGbl_DbCommandHelp[] =
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;

View File

@ -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;

View File

@ -195,7 +195,7 @@ AcpiDbSetScope (
}
if (AcpiUtSafeStrcat (AcpiGbl_DbScopeBuf, sizeof (AcpiGbl_DbScopeBuf),
"\\"))
__UNCONST("\\")))
{
Status = AE_BUFFER_OVERFLOW;
goto ErrorExit;

View File

@ -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;

View File

@ -182,7 +182,7 @@ AcpiPsGetOpcodeName (
/* Always guaranteed to return a valid pointer */
return (Op->Name);
return __UNCONST(Op->Name);
#else
return __UNCONST("OpcodeName unavailable");

View File

@ -326,7 +326,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpGeneralFlags[5] =
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 AcpiRsDumpMemoryFlags[5] =
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}

View File

@ -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
{

View File

@ -399,7 +399,7 @@ void
AcpiUtDisplayInitPathname (
UINT8 Type,
ACPI_NAMESPACE_NODE *ObjHandle,
char *Path)
const char *Path)
{
ACPI_STATUS Status;
ACPI_BUFFER Buffer;