From 243ee924eb677c9938123a673bde65c0a2d0d5fc Mon Sep 17 00:00:00 2001
From: aystarik <aystarik>
Date: Wed, 29 Jun 2005 20:39:31 +0000
Subject: [PATCH] Misc cleanup

date	2005.04.20.20.54.00;	author rmoore1;	state Exp;
---
 source/tools/acpiexec/aecommon.h |  8 --------
 source/tools/acpiexec/aeexec.c   | 10 +++++-----
 source/tools/acpiexec/aemain.c   |  4 ++--
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/source/tools/acpiexec/aecommon.h b/source/tools/acpiexec/aecommon.h
index 2165fc77d..4bbd176f2 100644
--- a/source/tools/acpiexec/aecommon.h
+++ b/source/tools/acpiexec/aecommon.h
@@ -134,14 +134,8 @@
 #include "acinterp.h"
 #include "acapps.h"
 
-
-extern UINT8                    *DsdtPtr;
-extern UINT32                   AcpiDsdtLength;
-extern UINT8                    *AmlStart;
-extern UINT32                   AmlLength;
 extern FILE                     *AcpiGbl_DebugFile;
 
-
 /*
  * Debug Regions
  */
@@ -184,8 +178,6 @@ typedef union ptr_ovl
 #define PTR_OVL_BUILD_PTR(p,b,o)        {p.ovl.base=b;p.ovl.offset=o;}
 
 
-#define PARAM_LIST(pl)                  pl
-
 #define TEST_OUTPUT_LEVEL(lvl)          if ((lvl) & OutputLevel)
 
 #define OSD_PRINT(lvl,fp)               TEST_OUTPUT_LEVEL(lvl) {\
diff --git a/source/tools/acpiexec/aeexec.c b/source/tools/acpiexec/aeexec.c
index 8be1c9fa5..9ac93396b 100644
--- a/source/tools/acpiexec/aeexec.c
+++ b/source/tools/acpiexec/aeexec.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: aeexec - Support routines for AcpiExec utility
- *              $Revision: 1.84 $
+ *              $Revision: 1.85 $
  *
  *****************************************************************************/
 
@@ -475,7 +475,7 @@ AeRegionHandler (
 
     ACPI_DEBUG_PRINT ((ACPI_DB_OPREGION, "Operation Region request on %s at 0x%X\n",
             AcpiUtGetRegionName (RegionObject->Region.SpaceId),
-            Address));
+            (UINT32) Address));
 
     if (RegionObject->Region.SpaceId == ACPI_ADR_SPACE_SMBUS)
     {
@@ -630,8 +630,8 @@ AeRegionHandler (
         ((ACPI_INTEGER)(RegionElement->Address) + RegionElement->Length))
     {
         ACPI_DEBUG_PRINT ((ACPI_DB_WARN, 
-            "Request on [%4.4s] is beyond region limit Req-%lX+%lX, Base=%lX, Len-%lX\n",
-            &((RegionObject->Region.Node)->Name), (UINT32) Address,
+            "Request on [%4.4s] is beyond region limit Req-%X+%X, Base=%X, Len-%X\n",
+            (RegionObject->Region.Node)->Name.Ascii, (UINT32) Address,
             ByteWidth, (UINT32)(RegionElement->Address),
             RegionElement->Length));
 
@@ -793,7 +793,7 @@ AeExceptionHandler (
     Exception = AcpiFormatException (AmlStatus);
     AcpiOsPrintf (
         "**** AcpiExec Exception: %s during execution of method [%4.4s] Opcode [%s] @%X\n",
-        Exception, &Name, AcpiPsGetOpcodeName (Opcode), AmlOffset);
+        Exception, (char *) &Name, AcpiPsGetOpcodeName (Opcode), AmlOffset);
 
     /*
      * Invoke the _ERR method if present
diff --git a/source/tools/acpiexec/aemain.c b/source/tools/acpiexec/aemain.c
index 40a1d8d9d..ed061e5ee 100644
--- a/source/tools/acpiexec/aemain.c
+++ b/source/tools/acpiexec/aemain.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: aemain - Main routine for the AcpiExec utility
- *              $Revision: 1.96 $
+ *              $Revision: 1.97 $
  *
  *****************************************************************************/
 
@@ -340,7 +340,7 @@ main (
     case 'x':
         AcpiDbgLevel = strtoul (AcpiGbl_Optarg, NULL, 0);
         AcpiGbl_DbConsoleDebugLevel = AcpiDbgLevel;
-        printf ("Debug Level: %lX\n", AcpiDbgLevel);
+        printf ("Debug Level: %X\n", AcpiDbgLevel);
         break;
 
     case 'o':