[src/trunk]: src/sys/external/bsd/acpica Fix ACPI_DEBUG build.

[jruoho <jruoho%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bce699bf31a1
branches:  trunk
changeset: 762194:bce699bf31a1
user:      jruoho <jruoho%NetBSD.org@localhost>
date:      Thu Feb 17 12:08:14 2011 +0000

description:
Fix ACPI_DEBUG build.

diffstat:

 sys/external/bsd/acpica/conf/files.acpica         |  4 +++-
 sys/external/bsd/acpica/dist/debugger/dbdisply.c  |  2 +-
 sys/external/bsd/acpica/dist/include/acutils.h    |  4 ++--
 sys/external/bsd/acpica/dist/utilities/utdebug.c  |  2 +-
 sys/external/bsd/acpica/dist/utilities/utdecode.c |  4 ++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diffs (84 lines):

diff -r 2d02b467ac4b -r bce699bf31a1 sys/external/bsd/acpica/conf/files.acpica
--- a/sys/external/bsd/acpica/conf/files.acpica Thu Feb 17 11:21:40 2011 +0000
+++ b/sys/external/bsd/acpica/conf/files.acpica Thu Feb 17 12:08:14 2011 +0000
@@ -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
diff -r 2d02b467ac4b -r bce699bf31a1 sys/external/bsd/acpica/dist/debugger/dbdisply.c
--- a/sys/external/bsd/acpica/dist/debugger/dbdisply.c  Thu Feb 17 11:21:40 2011 +0000
+++ b/sys/external/bsd/acpica/dist/debugger/dbdisply.c  Thu Feb 17 12:08:14 2011 +0000
@@ -925,7 +925,7 @@
 typedef struct acpi_handler_info
 {
     void                    *Handler;
-    char                    *Name;
+    const char              *Name;
 
 } ACPI_HANDLER_INFO;
 
diff -r 2d02b467ac4b -r bce699bf31a1 sys/external/bsd/acpica/dist/include/acutils.h
--- a/sys/external/bsd/acpica/dist/include/acutils.h    Thu Feb 17 11:21:40 2011 +0000
+++ b/sys/external/bsd/acpica/dist/include/acutils.h    Thu Feb 17 12:08:14 2011 +0000
@@ -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 (
diff -r 2d02b467ac4b -r bce699bf31a1 sys/external/bsd/acpica/dist/utilities/utdebug.c
--- a/sys/external/bsd/acpica/dist/utilities/utdebug.c  Thu Feb 17 11:21:40 2011 +0000
+++ b/sys/external/bsd/acpica/dist/utilities/utdebug.c  Thu Feb 17 12:08:14 2011 +0000
@@ -374,7 +374,7 @@
     const char              *FunctionName,
     const char              *ModuleName,
     UINT32                  ComponentId,
-    char                    *String)
+    const char              *String)
 {
 
     AcpiGbl_NestingLevel++;
diff -r 2d02b467ac4b -r bce699bf31a1 sys/external/bsd/acpica/dist/utilities/utdecode.c
--- a/sys/external/bsd/acpica/dist/utilities/utdecode.c Thu Feb 17 11:21:40 2011 +0000
+++ b/sys/external/bsd/acpica/dist/utilities/utdecode.c Thu Feb 17 12:08:14 2011 +0000
@@ -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",