lots of cast-qual fallout

This commit is contained in:
drochner 2005-05-31 21:08:37 +00:00
parent 0ba4110751
commit 3f6e0487d2
18 changed files with 74 additions and 75 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: acpi.c,v 1.70 2005/05/29 20:56:02 christos Exp $ */
/* $NetBSD: acpi.c,v 1.71 2005/05/31 21:08:37 drochner Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.70 2005/05/29 20:56:02 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.71 2005/05/31 21:08:37 drochner Exp $");
#include "opt_acpi.h"
@ -825,7 +825,7 @@ acpi_eval_string(ACPI_HANDLE handle, const char *path, char **stringp)
rv = AcpiEvaluateObjectTyped(handle, path, NULL, &buf, ACPI_TYPE_STRING);
if (ACPI_SUCCESS(rv)) {
ACPI_OBJECT *param = buf.Pointer;
char *ptr = param->String.Pointer;
const char *ptr = param->String.Pointer;
size_t len = param->String.Length;
if ((*stringp = AcpiOsAllocate(len)) == NULL)
rv = AE_NO_MEMORY;

View File

@ -122,7 +122,7 @@
typedef struct CommandInfo
{
char *Name; /* Command Name */
const char *Name; /* Command Name */
UINT8 MinArgs; /* Minimum arguments required */
} COMMAND_INFO;
@ -130,7 +130,7 @@ typedef struct CommandInfo
typedef struct ArgumentInfo
{
char *Name; /* Argument Name */
const char *Name; /* Argument Name */
} ARGUMENT_INFO;
@ -216,7 +216,7 @@ AcpiDbSetMethodData (
ACPI_STATUS
AcpiDbDisplayObjects (
char *ObjTypeArg,
const char *ObjTypeArg,
char *DisplayCountArg);
ACPI_STATUS
@ -325,7 +325,7 @@ AcpiDbCreateExecutionThreads (
*/
ACPI_OBJECT_TYPE
AcpiDbMatchArgument (
char *UserArgument,
const char *UserArgument,
ARGUMENT_INFO *Arguments);
void

View File

@ -517,10 +517,10 @@ void
AcpiExDumpOperands (
ACPI_OPERAND_OBJECT **Operands,
ACPI_INTERPRETER_MODE InterpreterMode,
char *Ident,
const char *Ident,
UINT32 NumLevels,
char *Note,
char *ModuleName,
const char *Note,
const char *ModuleName,
UINT32 LineNumber);
void

View File

@ -168,7 +168,7 @@ typedef UINT32 ACPI_MUTEX_HANDLE;
/* Names for the mutexes used in the subsystem */
static char *AcpiGbl_MutexNames[] =
static const char *AcpiGbl_MutexNames[] =
{
"ACPI_MTX_Execute",
"ACPI_MTX_Interpreter",
@ -691,7 +691,7 @@ ACPI_STATUS (*ACPI_EXECUTE_OP) (
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 */
@ -1029,8 +1029,8 @@ typedef struct acpi_integrity_info
typedef struct acpi_debug_print_info
{
UINT32 ComponentId;
char *ProcName;
char *ModuleName;
const char *ProcName;
const char *ModuleName;
} ACPI_DEBUG_PRINT_INFO;
@ -1094,7 +1094,7 @@ typedef struct acpi_memory_list
UINT32 CurrentTotalSize;
UINT32 CacheRequests;
UINT32 CacheHits;
char *ListName;
const char *ListName;
#endif
} ACPI_MEMORY_LIST;

View File

@ -556,7 +556,7 @@
*/
#ifdef ACPI_DEBUG_OUTPUT
#define ACPI_MODULE_NAME(name) static char ACPI_UNUSED_VAR *_THIS_MODULE = name;
#define ACPI_MODULE_NAME(name) static const char ACPI_UNUSED_VAR *_THIS_MODULE = name;
/*
* Function entry tracing.
@ -571,11 +571,11 @@
#define ACPI_FUNCTION_TRACE(a) ACPI_FUNCTION_NAME(a) \
AcpiUtTrace(__LINE__,&_DebugInfo)
#define ACPI_FUNCTION_TRACE_PTR(a,b) ACPI_FUNCTION_NAME(a) \
AcpiUtTracePtr(__LINE__,&_DebugInfo,(void *)b)
AcpiUtTracePtr(__LINE__,&_DebugInfo, b)
#define ACPI_FUNCTION_TRACE_U32(a,b) ACPI_FUNCTION_NAME(a) \
AcpiUtTraceU32(__LINE__,&_DebugInfo,(UINT32)b)
#define ACPI_FUNCTION_TRACE_STR(a,b) ACPI_FUNCTION_NAME(a) \
AcpiUtTraceStr(__LINE__,&_DebugInfo,(char *)b)
AcpiUtTraceStr(__LINE__,&_DebugInfo, b)
#define ACPI_FUNCTION_ENTRY() AcpiUtTrackStackPtr()

View File

@ -268,14 +268,14 @@ AcpiNsDumpEntry (
void
AcpiNsDumpPathname (
ACPI_HANDLE Handle,
char *Msg,
const char *Msg,
UINT32 Level,
UINT32 Component);
void
AcpiNsPrintPathname (
UINT32 NumSegments,
char *Pathname);
const char *Pathname);
ACPI_STATUS
AcpiNsDumpOneObject (

View File

@ -771,7 +771,7 @@ typedef union acpi_object
{
ACPI_OBJECT_TYPE Type;
UINT32 Length; /* # of bytes in string, excluding trailing null */
char *Pointer; /* points to the string value */
const char *Pointer; /* points to the string value */
} String;
struct

View File

@ -155,7 +155,7 @@ AcpiUtInitGlobals (
#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
char *
const char *
AcpiUtGetMutexName (
UINT32 MutexId);
@ -386,7 +386,7 @@ void
AcpiUtTracePtr (
UINT32 LineNumber,
ACPI_DEBUG_PRINT_INFO *DbgInfo,
void *Pointer);
const void *Pointer);
void
AcpiUtTraceU32 (
@ -398,7 +398,7 @@ void
AcpiUtTraceStr (
UINT32 LineNumber,
ACPI_DEBUG_PRINT_INFO *DbgInfo,
char *String);
const char *String);
void
AcpiUtExit (
@ -453,7 +453,7 @@ AcpiUtDebugPrint (
UINT32 RequestedDebugLevel,
UINT32 LineNumber,
ACPI_DEBUG_PRINT_INFO *DbgInfo,
char *Format,
const char *Format,
...) ACPI_PRINTF_LIKE_FUNC;
void ACPI_INTERNAL_VAR_XFACE
@ -461,7 +461,7 @@ AcpiUtDebugPrintRaw (
UINT32 RequestedDebugLevel,
UINT32 LineNumber,
ACPI_DEBUG_PRINT_INFO *DbgInfo,
char *Format,
const char *Format,
...) ACPI_PRINTF_LIKE_FUNC;
@ -732,7 +732,7 @@ void
AcpiUtDisplayInitPathname (
UINT8 Type,
ACPI_NAMESPACE_NODE *ObjHandle,
char *Path);
const char *Path);
#endif

View File

@ -116,7 +116,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dbcmds.c,v 1.13 2005/05/02 14:52:09 kochi Exp $");
__KERNEL_RCSID(0, "$NetBSD: dbcmds.c,v 1.14 2005/05/31 21:08:38 drochner Exp $");
#include "acpi.h"
#include "acdispat.h"
@ -1016,7 +1016,7 @@ AcpiDbWalkForSpecificObjects (
ACPI_STATUS
AcpiDbDisplayObjects (
char *ObjTypeArg,
const char *ObjTypeArg,
char *DisplayCountArg)
{
ACPI_OBJECT_TYPE Type;

View File

@ -116,7 +116,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dbutils.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
__KERNEL_RCSID(0, "$NetBSD: dbutils.c,v 1.12 2005/05/31 21:08:38 drochner Exp $");
#include "acpi.h"
#include "acparser.h"
@ -160,7 +160,7 @@ AcpiDbDumpBuffer (
ACPI_OBJECT_TYPE
AcpiDbMatchArgument (
char *UserArgument,
const char *UserArgument,
ARGUMENT_INFO *Arguments)
{
UINT32 i;

View File

@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dmopcode.c,v 1.6 2005/05/02 14:52:09 kochi Exp $");
__KERNEL_RCSID(0, "$NetBSD: dmopcode.c,v 1.7 2005/05/31 21:08:38 drochner Exp $");
#include "acpi.h"
#include "acparser.h"
@ -349,8 +349,7 @@ AcpiDmMatchKeyword (
}
else
{
AcpiOsPrintf ("%s", (char *)
AcpiGbl_MatchOps[(ACPI_SIZE) Op->Common.Value.Integer]);
AcpiOsPrintf ("%s", AcpiGbl_MatchOps[(ACPI_SIZE) Op->Common.Value.Integer]);
}
}

View File

@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: exdump.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
__KERNEL_RCSID(0, "$NetBSD: exdump.c,v 1.12 2005/05/31 21:08:38 drochner Exp $");
#define __EXDUMP_C__
@ -137,22 +137,22 @@ __KERNEL_RCSID(0, "$NetBSD: exdump.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
static void
AcpiExOutString (
char *Title,
char *Value);
const char *Title,
const char *Value);
static void
AcpiExOutPointer (
char *Title,
void *Value);
const char *Title,
const void *Value);
static void
AcpiExOutInteger (
char *Title,
const char *Title,
UINT32 Value);
static void
AcpiExOutAddress (
char *Title,
const char *Title,
ACPI_PHYSICAL_ADDRESS Value);
@ -527,10 +527,10 @@ void
AcpiExDumpOperands (
ACPI_OPERAND_OBJECT **Operands,
ACPI_INTERPRETER_MODE InterpreterMode,
char *Ident,
const char *Ident,
UINT32 NumLevels,
char *Note,
char *ModuleName,
const char *Note,
const char *ModuleName,
UINT32 LineNumber)
{
ACPI_NATIVE_UINT i;
@ -587,23 +587,23 @@ AcpiExDumpOperands (
static void
AcpiExOutString (
char *Title,
char *Value)
const char *Title,
const char *Value)
{
AcpiOsPrintf ("%20s : %s\n", Title, Value);
}
static void
AcpiExOutPointer (
char *Title,
void *Value)
const char *Title,
const void *Value)
{
AcpiOsPrintf ("%20s : %p\n", Title, Value);
}
static void
AcpiExOutInteger (
char *Title,
const char *Title,
UINT32 Value)
{
AcpiOsPrintf ("%20s : %X\n", Title, Value);
@ -611,7 +611,7 @@ AcpiExOutInteger (
static void
AcpiExOutAddress (
char *Title,
const char *Title,
ACPI_PHYSICAL_ADDRESS Value)
{

View File

@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nsdump.c,v 1.13 2005/05/02 14:52:09 kochi Exp $");
__KERNEL_RCSID(0, "$NetBSD: nsdump.c,v 1.14 2005/05/31 21:08:38 drochner Exp $");
#define __NSDUMP_C__
@ -161,7 +161,7 @@ AcpiNsDumpOneDevice (
void
AcpiNsPrintPathname (
UINT32 NumSegments,
char *Pathname)
const char *Pathname)
{
ACPI_FUNCTION_NAME ("NsPrintPathname");
@ -210,7 +210,7 @@ AcpiNsPrintPathname (
void
AcpiNsDumpPathname (
ACPI_HANDLE Handle,
char *Msg,
const char *Msg,
UINT32 Level,
UINT32 Component)
{

View File

@ -116,7 +116,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tbinstal.c,v 1.11 2005/05/02 14:52:10 kochi Exp $");
__KERNEL_RCSID(0, "$NetBSD: tbinstal.c,v 1.12 2005/05/31 21:08:38 drochner Exp $");
#define __TBINSTAL_C__
@ -184,7 +184,7 @@ AcpiTbMatchSignature (
ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
"Table [%4.4s] is an ACPI table consumed by the core subsystem\n",
(char *) AcpiGbl_TableData[i].Signature));
AcpiGbl_TableData[i].Signature));
return_ACPI_STATUS (AE_OK);
}

View File

@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: utalloc.c,v 1.12 2005/05/29 20:56:02 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: utalloc.c,v 1.13 2005/05/31 21:08:38 drochner Exp $");
#define __UTALLOC_C__
@ -140,7 +140,7 @@ AcpiUtTrackAllocation (
ACPI_SIZE Size,
UINT8 AllocType,
UINT32 Component,
char *Module,
const char *Module,
UINT32 Line);
static ACPI_STATUS
@ -148,7 +148,7 @@ AcpiUtRemoveAllocation (
UINT32 ListId,
ACPI_DEBUG_MEM_BLOCK *Address,
UINT32 Component,
char *Module,
const char *Module,
UINT32 Line);
#endif /* ACPI_DBG_TRACK_ALLOCATIONS */
@ -618,7 +618,7 @@ void *
AcpiUtAllocateAndTrack (
ACPI_SIZE Size,
UINT32 Component,
char *Module,
const char *Module,
UINT32 Line)
{
ACPI_DEBUG_MEM_BLOCK *Allocation;
@ -666,7 +666,7 @@ void *
AcpiUtCallocateAndTrack (
ACPI_SIZE Size,
UINT32 Component,
char *Module,
const char *Module,
UINT32 Line)
{
ACPI_DEBUG_MEM_BLOCK *Allocation;
@ -718,7 +718,7 @@ void
AcpiUtFreeAndTrack (
void *Allocation,
UINT32 Component,
char *Module,
const char *Module,
UINT32 Line)
{
ACPI_DEBUG_MEM_BLOCK *DebugBlock;
@ -830,7 +830,7 @@ AcpiUtTrackAllocation (
ACPI_SIZE Size,
UINT8 AllocType,
UINT32 Component,
char *Module,
const char *Module,
UINT32 Line)
{
ACPI_MEMORY_LIST *MemList;
@ -921,7 +921,7 @@ AcpiUtRemoveAllocation (
UINT32 ListId,
ACPI_DEBUG_MEM_BLOCK *Allocation,
UINT32 Component,
char *Module,
const char *Module,
UINT32 Line)
{
ACPI_MEMORY_LIST *MemList;
@ -1057,7 +1057,7 @@ AcpiUtDumpAllocationInfo (
void
AcpiUtDumpAllocations (
UINT32 Component,
char *Module)
const char *Module)
{
ACPI_DEBUG_MEM_BLOCK *Element;
ACPI_DESCRIPTOR *Descriptor;

View File

@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: utdebug.c,v 1.11 2005/05/02 14:52:10 kochi Exp $");
__KERNEL_RCSID(0, "$NetBSD: utdebug.c,v 1.12 2005/05/31 21:08:38 drochner Exp $");
#define __UTDEBUG_C__
@ -128,8 +128,8 @@ __KERNEL_RCSID(0, "$NetBSD: utdebug.c,v 1.11 2005/05/02 14:52:10 kochi Exp $");
#ifdef ACPI_DEBUG_OUTPUT
static UINT32 AcpiGbl_PrevThreadId = 0xFFFFFFFF;
static char *AcpiGbl_FnEntryStr = "----Entry";
static char *AcpiGbl_FnExitStr = "----Exit-";
static const char *AcpiGbl_FnEntryStr = "----Entry";
static const char *AcpiGbl_FnExitStr = "----Exit-";
/*******************************************************************************
@ -213,7 +213,7 @@ AcpiUtDebugPrint (
UINT32 RequestedDebugLevel,
UINT32 LineNumber,
ACPI_DEBUG_PRINT_INFO *DbgInfo,
char *Format,
const char *Format,
...)
{
UINT32 ThreadId;
@ -290,7 +290,7 @@ AcpiUtDebugPrintRaw (
UINT32 RequestedDebugLevel,
UINT32 LineNumber,
ACPI_DEBUG_PRINT_INFO *DbgInfo,
char *Format,
const char *Format,
...)
{
va_list args;
@ -360,7 +360,7 @@ void
AcpiUtTracePtr (
UINT32 LineNumber,
ACPI_DEBUG_PRINT_INFO *DbgInfo,
void *Pointer)
const void *Pointer)
{
AcpiGbl_NestingLevel++;
AcpiUtTrackStackPtr ();
@ -392,7 +392,7 @@ void
AcpiUtTraceStr (
UINT32 LineNumber,
ACPI_DEBUG_PRINT_INFO *DbgInfo,
char *String)
const char *String)
{
AcpiGbl_NestingLevel++;

View File

@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: utglobal.c,v 1.13 2005/05/29 20:56:02 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: utglobal.c,v 1.14 2005/05/31 21:08:38 drochner Exp $");
#define __UTGLOBAL_C__
#define DEFINE_ACPI_GLOBALS
@ -780,7 +780,7 @@ AcpiUtGetDescriptorName (
*
******************************************************************************/
char *
const char *
AcpiUtGetMutexName (
UINT32 MutexId)
{

View File

@ -116,7 +116,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: utmisc.c,v 1.12 2005/05/29 20:56:02 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: utmisc.c,v 1.13 2005/05/31 21:08:38 drochner Exp $");
#define __UTMISC_C__
@ -367,7 +367,7 @@ void
AcpiUtDisplayInitPathname (
UINT8 Type,
ACPI_NAMESPACE_NODE *ObjHandle,
char *Path)
const char *Path)
{
ACPI_STATUS Status;
ACPI_BUFFER Buffer;