Module Name: src
Committed By: jruoho
Date: Thu Feb 17 12:08:15 UTC 2011
Modified Files:
src/sys/external/bsd/acpica/conf: files.acpica
src/sys/external/bsd/acpica/dist/debugger: dbdisply.c
src/sys/external/bsd/acpica/dist/include: acutils.h
src/sys/external/bsd/acpica/dist/utilities: utdebug.c utdecode.c
Log Message:
Fix ACPI_DEBUG build.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/acpica/conf/files.acpica
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/acpica/dist/debugger/dbdisply.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/acpica/dist/include/acutils.h
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/acpica/dist/utilities/utdebug.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/acpica/dist/utilities/utdecode.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/conf/files.acpica
diff -u src/sys/external/bsd/acpica/conf/files.acpica:1.2 src/sys/external/bsd/acpica/conf/files.acpica:1.3
--- src/sys/external/bsd/acpica/conf/files.acpica:1.2 Thu Feb 17 10:13:35 2011
+++ src/sys/external/bsd/acpica/conf/files.acpica Thu Feb 17 12:08:14 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpica,v 1.2 2011/02/17 10:13:35 jruoho Exp $
+# $NetBSD: files.acpica,v 1.3 2011/02/17 12:08:14 jruoho Exp $
define acpica
makeoptions acpi CPPFLAGS+="-I$S/external/bsd/acpica/dist/include"
@@ -10,6 +10,8 @@
file external/bsd/acpica/dist/debugger/dbfileio.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/debugger/dbhistry.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/debugger/dbinput.c acpica & acpi_debug & ddb
+file external/bsd/acpica/dist/debugger/dbmethod.c acpica & acpi_debug & ddb
+file external/bsd/acpica/dist/debugger/dbnames.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/debugger/dbstats.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/debugger/dbutils.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/debugger/dbxface.c acpica & acpi_debug & ddb
Index: src/sys/external/bsd/acpica/dist/debugger/dbdisply.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbdisply.c:1.3 src/sys/external/bsd/acpica/dist/debugger/dbdisply.c:1.4
--- src/sys/external/bsd/acpica/dist/debugger/dbdisply.c:1.3 Thu Feb 17 10:09:40 2011
+++ src/sys/external/bsd/acpica/dist/debugger/dbdisply.c Thu Feb 17 12:08:14 2011
@@ -925,7 +925,7 @@
typedef struct acpi_handler_info
{
void *Handler;
- char *Name;
+ const char *Name;
} ACPI_HANDLER_INFO;
Index: src/sys/external/bsd/acpica/dist/include/acutils.h
diff -u src/sys/external/bsd/acpica/dist/include/acutils.h:1.4 src/sys/external/bsd/acpica/dist/include/acutils.h:1.5
--- src/sys/external/bsd/acpica/dist/include/acutils.h:1.4 Thu Feb 17 11:21:40 2011
+++ src/sys/external/bsd/acpica/dist/include/acutils.h Thu Feb 17 12:08:14 2011
@@ -133,7 +133,7 @@
#endif
-const char *
+char *
AcpiUtGetTypeName (
ACPI_OBJECT_TYPE Type);
@@ -375,7 +375,7 @@
const char *FunctionName,
const char *ModuleName,
UINT32 ComponentId,
- char *String);
+ const char *String);
void
AcpiUtExit (
Index: src/sys/external/bsd/acpica/dist/utilities/utdebug.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utdebug.c:1.3 src/sys/external/bsd/acpica/dist/utilities/utdebug.c:1.4
--- src/sys/external/bsd/acpica/dist/utilities/utdebug.c:1.3 Thu Feb 17 10:09:43 2011
+++ src/sys/external/bsd/acpica/dist/utilities/utdebug.c Thu Feb 17 12:08:15 2011
@@ -374,7 +374,7 @@
const char *FunctionName,
const char *ModuleName,
UINT32 ComponentId,
- char *String)
+ const char *String)
{
AcpiGbl_NestingLevel++;
Index: src/sys/external/bsd/acpica/dist/utilities/utdecode.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utdecode.c:1.2 src/sys/external/bsd/acpica/dist/utilities/utdecode.c:1.3
--- src/sys/external/bsd/acpica/dist/utilities/utdecode.c:1.2 Thu Feb 17 11:21:40 2011
+++ src/sys/external/bsd/acpica/dist/utilities/utdecode.c Thu Feb 17 12:08:15 2011
@@ -312,7 +312,7 @@
};
-const char *
+char *
AcpiUtGetTypeName (
ACPI_OBJECT_TYPE Type)
{
@@ -522,7 +522,7 @@
/* Names for internal mutex objects, used for debug output */
-static char *AcpiGbl_MutexNames[ACPI_NUM_MUTEX] =
+static const char *AcpiGbl_MutexNames[ACPI_NUM_MUTEX] =
{
"ACPI_MTX_Interpreter",
"ACPI_MTX_Namespace",
