vendor/acpica/20150616

4 files changed, 27 insertions, 14 deletions

diff --git a/source/tools/acpidump/acpidump.h b/source/tools/acpidump/acpidump.h
index c40373459cc88..3dfce10cb9c31 100644
--- a/source/tools/acpidump/acpidump.h
+++ b/source/tools/acpidump/acpidump.h
@@ -67,7 +67,7 @@
 EXTERN BOOLEAN              INIT_GLOBAL (Gbl_SummaryMode, FALSE);
 EXTERN BOOLEAN              INIT_GLOBAL (Gbl_VerboseMode, FALSE);
 EXTERN BOOLEAN              INIT_GLOBAL (Gbl_BinaryMode, FALSE);
-EXTERN BOOLEAN              INIT_GLOBAL (Gbl_DumpCustomizedTables, FALSE);
+EXTERN BOOLEAN              INIT_GLOBAL (Gbl_DumpCustomizedTables, TRUE);
 EXTERN BOOLEAN              INIT_GLOBAL (Gbl_DoNotDumpXsdt, FALSE);
 EXTERN ACPI_FILE            INIT_GLOBAL (Gbl_OutputFile, NULL);
 EXTERN char                 INIT_GLOBAL (*Gbl_OutputFilename, NULL);
diff --git a/source/tools/acpidump/apdump.c b/source/tools/acpidump/apdump.c
index da4c599ee6911..5355de2c5b50b 100644
--- a/source/tools/acpidump/apdump.c
+++ b/source/tools/acpidump/apdump.c
@@ -375,7 +375,7 @@ ApDumpTableByName (
     int                     TableStatus;
 
 
-    if (ACPI_STRLEN (Signature) != ACPI_NAME_SIZE)
+    if (strlen (Signature) != ACPI_NAME_SIZE)
     {
         AcpiLogError (
             "Invalid table signature [%s]: must be exactly 4 characters\n",
@@ -385,18 +385,18 @@ ApDumpTableByName (
 
     /* Table signatures are expected to be uppercase */
 
-    ACPI_STRCPY (LocalSignature, Signature);
+    strcpy (LocalSignature, Signature);
     AcpiUtStrupr (LocalSignature);
 
     /* To be friendly, handle tables whose signatures do not match the name */
 
     if (ACPI_COMPARE_NAME (LocalSignature, "FADT"))
     {
-        ACPI_STRCPY (LocalSignature, ACPI_SIG_FADT);
+        strcpy (LocalSignature, ACPI_SIG_FADT);
     }
     else if (ACPI_COMPARE_NAME (LocalSignature, "MADT"))
     {
-        ACPI_STRCPY (LocalSignature, ACPI_SIG_MADT);
+        strcpy (LocalSignature, ACPI_SIG_MADT);
     }
 
     /* Dump all instances of this signature (to handle multiple SSDTs) */
diff --git a/source/tools/acpidump/apfiles.c b/source/tools/acpidump/apfiles.c
index 1e51ed65bebfd..9c187271371b8 100644
--- a/source/tools/acpidump/apfiles.c
+++ b/source/tools/acpidump/apfiles.c
@@ -159,10 +159,10 @@ ApWriteToBinaryFile (
     {
         ACPI_MOVE_NAME (Filename, Table->Signature);
     }
-    Filename[0] = (char) ACPI_TOLOWER (Filename[0]);
-    Filename[1] = (char) ACPI_TOLOWER (Filename[1]);
-    Filename[2] = (char) ACPI_TOLOWER (Filename[2]);
-    Filename[3] = (char) ACPI_TOLOWER (Filename[3]);
+    Filename[0] = (char) tolower (Filename[0]);
+    Filename[1] = (char) tolower (Filename[1]);
+    Filename[2] = (char) tolower (Filename[2]);
+    Filename[3] = (char) tolower (Filename[3]);
     Filename[ACPI_NAME_SIZE] = 0;
 
     /* Handle multiple SSDTs - create different filenames for each */
@@ -170,10 +170,10 @@ ApWriteToBinaryFile (
     if (Instance > 0)
     {
         AcpiUtSnprintf (InstanceStr, sizeof (InstanceStr), "%u", Instance);
-        ACPI_STRCAT (Filename, InstanceStr);
+        strcat (Filename, InstanceStr);
     }
 
-    ACPI_STRCAT (Filename, ACPI_TABLE_FILE_SUFFIX);
+    strcat (Filename, ACPI_TABLE_FILE_SUFFIX);
 
     if (Gbl_VerboseMode)
     {
diff --git a/source/tools/acpidump/apmain.c b/source/tools/acpidump/apmain.c
index 682a0d537c7f2..efc7a6d0b26a7 100644
--- a/source/tools/acpidump/apmain.c
+++ b/source/tools/acpidump/apmain.c
@@ -92,7 +92,7 @@ UINT32                      CurrentAction = 0;
 
 
 #define AP_UTILITY_NAME             "ACPI Binary Table Dump Utility"
-#define AP_SUPPORTED_OPTIONS        "?a:bcf:hn:o:r:svxz"
+#define AP_SUPPORTED_OPTIONS        "?a:bc:f:hn:o:r:svxz"
 
 
 /******************************************************************************
@@ -111,7 +111,6 @@ ApDisplayUsage (
     ACPI_USAGE_HEADER ("acpidump [options]");
 
     ACPI_OPTION ("-b",                      "Dump tables to binary files");
-    ACPI_OPTION ("-c",                      "Dump customized tables");
     ACPI_OPTION ("-h -?",                   "This help message");
     ACPI_OPTION ("-o <File>",               "Redirect output to file");
     ACPI_OPTION ("-r <Address>",            "Dump tables from specified RSDP");
@@ -122,6 +121,7 @@ ApDisplayUsage (
     ACPI_USAGE_TEXT ("\nTable Options:\n");
 
     ACPI_OPTION ("-a <Address>",            "Get table via a physical address");
+    ACPI_OPTION ("-c <on|off>",             "Turning on/off customized table dumping");
     ACPI_OPTION ("-f <BinaryFile>",         "Get table via a binary file");
     ACPI_OPTION ("-n <Signature>",          "Get table via a name/signature");
     ACPI_OPTION ("-x",                      "Do not use but dump XSDT");
@@ -205,7 +205,20 @@ ApDoOptions (
 
     case 'c':   /* Dump customized tables */
 
-        Gbl_DumpCustomizedTables = TRUE;
+        if (!strcmp (AcpiGbl_Optarg, "on"))
+        {
+            Gbl_DumpCustomizedTables = TRUE;
+        }
+        else if (!strcmp (AcpiGbl_Optarg, "off"))
+        {
+            Gbl_DumpCustomizedTables = FALSE;
+        }
+        else
+        {
+            AcpiLogError ("%s: Cannot handle this switch, please use on|off\n",
+                AcpiGbl_Optarg);
+            return (-1);
+        }
         continue;
 
     case 'h':