vendor/acpica/20121018

8 files changed, 173 insertions, 87 deletions

diff --git a/source/tools/acpisrc/acpisrc.h b/source/tools/acpisrc/acpisrc.h
index bc3f497e89c1d..1d2e8dc50124c 100644
--- a/source/tools/acpisrc/acpisrc.h
+++ b/source/tools/acpisrc/acpisrc.h
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: acpisrc.h - Include file for AcpiSrc utility
@@ -135,6 +134,7 @@ extern BOOLEAN                  Gbl_Overwrite;
 extern BOOLEAN                  Gbl_WidenDeclarations;
 extern BOOLEAN                  Gbl_IgnoreLoneLineFeeds;
 extern BOOLEAN                  Gbl_HasLoneLineFeeds;
+extern BOOLEAN                  Gbl_Cleanup;
 extern void                     *Gbl_StructDefs;
 
 #define PARAM_LIST(pl)          pl
@@ -367,6 +367,16 @@ AsCheckForDirectory (
     char                    **SourcePath,
     char                    **TargetPath);
 
+void
+AsRemoveExtraLines (
+    char                    *FileBuffer,
+    char                    *Filename);
+
+void
+AsRemoveSpacesAfterPeriod (
+    char                    *FileBuffer,
+    char                    *Filename);
+
 BOOLEAN
 AsMatchExactWord (
     char                    *Word,
@@ -402,5 +412,3 @@ AsInsertCarriageReturns (
 void
 AsConvertToLineFeeds (
     char                    *Buffer);
-
-
diff --git a/source/tools/acpisrc/ascase.c b/source/tools/acpisrc/ascase.c
index 7e115b7aeb653..96e1269eaaf39 100644
--- a/source/tools/acpisrc/ascase.c
+++ b/source/tools/acpisrc/ascase.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: ascase - Source conversion - lower/upper case utilities
@@ -57,7 +56,7 @@ AsUppercaseTokens (
  * FUNCTION:    AsLowerCaseString
  *
  * DESCRIPTION: LowerCase all instances of a target string with a replacement
- *              string.  Returns count of the strings replaced.
+ *              string. Returns count of the strings replaced.
  *
  ******************************************************************************/
 
@@ -86,7 +85,7 @@ AsLowerCaseString (
         SubString1 = strstr (SubBuffer, Target);
         if (!SubString1)
         {
-            return LowerCaseCount;
+            return (LowerCaseCount);
         }
 
         /*
@@ -105,7 +104,7 @@ AsLowerCaseString (
             {
                 /* Didn't find terminator */
 
-                return LowerCaseCount;
+                return (LowerCaseCount);
             }
 
             /* Move buffer to end of escape block and continue */
@@ -142,7 +141,7 @@ AsLowerCaseString (
         }
     }
 
-    return LowerCaseCount;
+    return (LowerCaseCount);
 }
 
 
@@ -465,7 +464,7 @@ AsMixedCaseToUnderscores (
  *
  * FUNCTION:    AsLowerCaseIdentifiers
  *
- * DESCRIPTION: Converts mixed case identifiers to lower case.  Leaves comments,
+ * DESCRIPTION: Converts mixed case identifiers to lower case. Leaves comments,
  *              quoted strings, and all-upper-case macros alone.
  *
  ******************************************************************************/
diff --git a/source/tools/acpisrc/asconvrt.c b/source/tools/acpisrc/asconvrt.c
index 1669f9d20e79a..ff2804d72fce3 100644
--- a/source/tools/acpisrc/asconvrt.c
+++ b/source/tools/acpisrc/asconvrt.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: asconvrt - Source conversion code
@@ -63,6 +62,89 @@ char        *HeaderBegin = "/***************************************************
 
 /******************************************************************************
  *
+ * FUNCTION:    AsRemoveExtraLines
+ *
+ * DESCRIPTION: Remove all extra lines at the start and end of the file.
+ *
+ ******************************************************************************/
+
+void
+AsRemoveExtraLines (
+    char                    *FileBuffer,
+    char                    *Filename)
+{
+    char                    *FileEnd;
+    int                     Length;
+
+
+    /* Remove any extra lines at the start of the file */
+
+    while (*FileBuffer == '\n')
+    {
+        printf ("Removing extra line at start of file: %s\n", Filename);
+        AsRemoveData (FileBuffer, FileBuffer + 1);
+    }
+
+    /* Remove any extra lines at the end of the file */
+
+    Length = strlen (FileBuffer);
+    FileEnd = FileBuffer + (Length - 2);
+
+    while (*FileEnd == '\n')
+    {
+        printf ("Removing extra line at end of file: %s\n", Filename);
+        AsRemoveData (FileEnd, FileEnd + 1);
+        FileEnd--;
+    }
+}
+
+
+/******************************************************************************
+ *
+ * FUNCTION:    AsRemoveSpacesAfterPeriod
+ *
+ * DESCRIPTION: Remove an extra space after a period.
+ *
+ ******************************************************************************/
+
+void
+AsRemoveSpacesAfterPeriod (
+    char                    *FileBuffer,
+    char                    *Filename)
+{
+    int                     ReplaceCount = 0;
+    char                    *Possible;
+
+
+    Possible = FileBuffer;
+    while (Possible)
+    {
+        Possible = strstr (Possible, ".  ");
+        if (Possible)
+        {
+            if ((*(Possible -1) == '.')  ||
+                (*(Possible -1) == '\"') ||
+                (*(Possible -1) == '\n'))
+            {
+                Possible += 3;
+                continue;
+            }
+
+            Possible = AsReplaceData (Possible, 3, ". ", 2);
+            ReplaceCount++;
+        }
+    }
+
+    if (ReplaceCount)
+    {
+        printf ("Removed %d extra blanks after a period: %s\n",
+            ReplaceCount, Filename);
+    }
+}
+
+
+/******************************************************************************
+ *
  * FUNCTION:    AsMatchExactWord
  *
  * DESCRIPTION: Check previous and next characters for whitespace
@@ -146,7 +228,7 @@ AsCheckAndSkipLiterals (
 
         if (!LiteralEnd)
         {
-            return SubBuffer;
+            return (SubBuffer);
         }
 
         while (SubBuffer < LiteralEnd)
@@ -170,7 +252,7 @@ AsCheckAndSkipLiterals (
         LiteralEnd = AsSkipPastChar (SubBuffer, '\"');
         if (!LiteralEnd)
         {
-            return SubBuffer;
+            return (SubBuffer);
         }
     }
 
@@ -178,7 +260,7 @@ AsCheckAndSkipLiterals (
     {
         (*TotalLines) += NewLines;
     }
-    return SubBuffer;
+    return (SubBuffer);
 }
 
 
@@ -278,7 +360,7 @@ AsCheckForBraces (
  *
  * FUNCTION:    AsTrimLines
  *
- * DESCRIPTION: Remove extra blanks from the end of source lines.  Does not
+ * DESCRIPTION: Remove extra blanks from the end of source lines. Does not
  *              check for tabs.
  *
  ******************************************************************************/
@@ -404,7 +486,7 @@ AsReplaceHeader (
  * FUNCTION:    AsReplaceString
  *
  * DESCRIPTION: Replace all instances of a target string with a replacement
- *              string.  Returns count of the strings replaced.
+ *              string. Returns count of the strings replaced.
  *
  ******************************************************************************/
 
@@ -436,7 +518,7 @@ AsReplaceString (
         SubString1 = strstr (SubBuffer, Target);
         if (!SubString1)
         {
-            return ReplaceCount;
+            return (ReplaceCount);
         }
 
         /*
@@ -455,7 +537,7 @@ AsReplaceString (
             {
                 /* Didn't find terminator */
 
-                return ReplaceCount;
+                return (ReplaceCount);
             }
 
             /* Move buffer to end of escape block and continue */
@@ -488,7 +570,7 @@ AsReplaceString (
         }
     }
 
-    return ReplaceCount;
+    return (ReplaceCount);
 }
 
 
@@ -725,7 +807,7 @@ AsBracesOnSameLine (
  *
  * FUNCTION:    AsTabify4
  *
- * DESCRIPTION: Convert the text to tabbed text.  Alignment of text is
+ * DESCRIPTION: Convert the text to tabbed text. Alignment of text is
  *              preserved.
  *
  ******************************************************************************/
@@ -815,7 +897,7 @@ AsTabify4 (
  *
  * FUNCTION:    AsTabify8
  *
- * DESCRIPTION: Convert the text to tabbed text.  Alignment of text is
+ * DESCRIPTION: Convert the text to tabbed text. Alignment of text is
  *              preserved.
  *
  ******************************************************************************/
@@ -863,7 +945,7 @@ AsTabify8 (
 
             /*
              * This mechanism limits the difference in tab counts from
-             * line to line.  It helps avoid the situation where a second
+             * line to line. It helps avoid the situation where a second
              * continuation line (which was indented correctly for tabs=4) would
              * get indented off the screen if we just blindly converted to tabs.
              */
@@ -1015,7 +1097,7 @@ AsTabify8 (
  *
  * FUNCTION:    AsCountLines
  *
- * DESCRIPTION: Count the number of lines in the input buffer.  Also count
+ * DESCRIPTION: Count the number of lines in the input buffer. Also count
  *              the number of long lines (lines longer than 80 chars).
  *
  ******************************************************************************/
@@ -1037,7 +1119,7 @@ AsCountLines (
         if (!EndOfLine)
         {
             Gbl_TotalLines += LineCount;
-            return LineCount;
+            return (LineCount);
         }
 
         if ((EndOfLine - SubBuffer) > 80)
@@ -1057,7 +1139,7 @@ AsCountLines (
     }
 
     Gbl_TotalLines += LineCount;
-    return LineCount;
+    return (LineCount);
 }
 
 
@@ -1100,7 +1182,7 @@ AsCountTabs (
  *
  * FUNCTION:    AsCountNonAnsiComments
  *
- * DESCRIPTION: Count the number of "//" comments.  This type of comment is
+ * DESCRIPTION: Count the number of "//" comments. This type of comment is
  *              non-ANSI C.
  *
  ******************************************************************************/
@@ -1136,7 +1218,7 @@ AsCountNonAnsiComments (
  *
  * FUNCTION:    AsCountSourceLines
  *
- * DESCRIPTION: Count the number of C source lines.  Defined by 1) not a
+ * DESCRIPTION: Count the number of C source lines. Defined by 1) not a
  *              comment, and 2) not a blank line.
  *
  ******************************************************************************/
@@ -1444,5 +1526,3 @@ Exit:
     }
 }
 #endif
-
-
diff --git a/source/tools/acpisrc/asfile.c b/source/tools/acpisrc/asfile.c
index d3257385ff9ad..70be229928eac 100644
--- a/source/tools/acpisrc/asfile.c
+++ b/source/tools/acpisrc/asfile.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: asfile - Main module for the acpi source processor utility
@@ -159,7 +158,7 @@ AsDoWildcard (
  *
  * FUNCTION:    AsProcessTree
  *
- * DESCRIPTION: Process the directory tree.  Files with the extension ".C" and
+ * DESCRIPTION: Process the directory tree. Files with the extension ".C" and
  *              ".H" are processed as the tree is traversed.
  *
  ******************************************************************************/
@@ -188,7 +187,7 @@ AsProcessTree (
             if (errno != EEXIST)
             {
                 printf ("Could not create target directory\n");
-                return -1;
+                return (-1);
             }
         }
     }
@@ -223,7 +222,7 @@ AsProcessTree (
     AsDoWildcard (ConversionTable, SourcePath, TargetPath, MaxPathLength,
             FILE_TYPE_DIRECTORY, "*");
 
-    return 0;
+    return (0);
 }
 
 
@@ -247,7 +246,7 @@ AsDetectLoneLineFeeds (
 
     if (!Buffer[0])
     {
-        return FALSE;
+        return (FALSE);
     }
 
     while (Buffer[i])
@@ -277,7 +276,7 @@ AsDetectLoneLineFeeds (
         {
             printf ("%s: %u lone linefeeds in file\n", Filename, LfCount);
         }
-        return TRUE;
+        return (TRUE);
     }
 
     return (FALSE);
@@ -340,6 +339,12 @@ AsConvertFile (
     VERBOSE_PRINT (("Processing %u bytes\n",
         (unsigned int) strlen (FileBuffer)));
 
+    if (Gbl_Cleanup)
+    {
+        AsRemoveExtraLines (FileBuffer, Filename);
+        AsRemoveSpacesAfterPeriod (FileBuffer, Filename);
+    }
+
     if (ConversionTable->LowerCaseTable)
     {
         for (i = 0; ConversionTable->LowerCaseTable[i].Identifier; i++)
@@ -514,7 +519,7 @@ AsConvertFile (
  *
  * FUNCTION:    AsProcessOneFile
  *
- * DESCRIPTION: Process one source file.  The file is opened, read entirely
+ * DESCRIPTION: Process one source file. The file is opened, read entirely
  *              into a buffer, converted, then written to a new file.
  *
  ******************************************************************************/
@@ -538,7 +543,7 @@ AsProcessOneFile (
     if (!Pathname)
     {
         printf ("Could not allocate buffer for file pathnames\n");
-        return -1;
+        return (-1);
     }
 
     Gbl_FileType = FileType;
@@ -555,7 +560,7 @@ AsProcessOneFile (
 
     if (AsGetFile (Pathname, &Gbl_FileBuffer, &Gbl_FileSize))
     {
-        return -1;
+        return (-1);
     }
 
     Gbl_HeaderSize = 0;
@@ -597,7 +602,7 @@ AsProcessOneFile (
             if (!OutPathname)
             {
                 printf ("Could not allocate buffer for file pathnames\n");
-                return -1;
+                return (-1);
             }
 
             strcpy (OutPathname, TargetPath);
@@ -618,7 +623,7 @@ AsProcessOneFile (
         free (OutPathname);
     }
 
-    return 0;
+    return (0);
 }
 
 
@@ -626,7 +631,7 @@ AsProcessOneFile (
  *
  * FUNCTION:    AsCheckForDirectory
  *
- * DESCRIPTION: Check if the current file is a valid directory.  If not,
+ * DESCRIPTION: Check if the current file is a valid directory. If not,
  *              construct the full pathname for the source and target paths.
  *              Checks for the dot and dot-dot files (they are ignored)
  *
@@ -647,14 +652,14 @@ AsCheckForDirectory (
     if (!(strcmp (Filename, ".")) ||
         !(strcmp (Filename, "..")))
     {
-        return -1;
+        return (-1);
     }
 
     SrcPath = calloc (strlen (SourceDirPath) + strlen (Filename) + 2, 1);
     if (!SrcPath)
     {
         printf ("Could not allocate buffer for directory source pathname\n");
-        return -1;
+        return (-1);
     }
 
     TgtPath = calloc (strlen (TargetDirPath) + strlen (Filename) + 2, 1);
@@ -662,7 +667,7 @@ AsCheckForDirectory (
     {
         printf ("Could not allocate buffer for directory target pathname\n");
         free (SrcPath);
-        return -1;
+        return (-1);
     }
 
     strcpy (SrcPath, SourceDirPath);
@@ -675,7 +680,7 @@ AsCheckForDirectory (
 
     *SourcePath = SrcPath;
     *TargetPath = TgtPath;
-    return 0;
+    return (0);
 }
 
 
@@ -705,7 +710,7 @@ AsGetFile (
     if (!FileHandle)
     {
         printf ("Could not open %s\n", Filename);
-        return -1;
+        return (-1);
     }
 
     if (fstat (FileHandle, &Gbl_StatBuf))
@@ -745,7 +750,7 @@ AsGetFile (
     Gbl_HasLoneLineFeeds = AsDetectLoneLineFeeds (Filename, Buffer);
 
     /*
-     * Convert all CR/LF pairs to LF only.  We do this locally so that
+     * Convert all CR/LF pairs to LF only. We do this locally so that
      * this code is portable across operating systems.
      */
     AsConvertToLineFeeds (Buffer);
@@ -753,13 +758,13 @@ AsGetFile (
     *FileBuffer = Buffer;
     *FileSize = Size;
 
-    return 0;
+    return (0);
 
 
 ErrorExit:
 
     close (FileHandle);
-    return -1;
+    return (-1);
 }
 
 
@@ -768,7 +773,7 @@ ErrorExit:
  * FUNCTION:    AsPutFile
  *
  * DESCRIPTION: Create a new output file and write the entire contents of the
- *              buffer to the new file.  Buffer must be a zero terminated string
+ *              buffer to the new file. Buffer must be a zero terminated string
  *
  ******************************************************************************/
 
@@ -799,7 +804,7 @@ AsPutFile (
     {
         perror ("Could not create destination file");
         printf ("Could not create destination file \"%s\"\n", Pathname);
-        return -1;
+        return (-1);
     }
 
     /* Write the buffer to the file */
@@ -809,7 +814,5 @@ AsPutFile (
 
     close (DestHandle);
 
-    return 0;
+    return (0);
 }
-
-
diff --git a/source/tools/acpisrc/asmain.c b/source/tools/acpisrc/asmain.c
index e36855b5d8721..2e38e3481f571 100644
--- a/source/tools/acpisrc/asmain.c
+++ b/source/tools/acpisrc/asmain.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: asmain - Main module for the acpi source processor utility
@@ -97,6 +96,7 @@ BOOLEAN                 Gbl_Overwrite = FALSE;
 BOOLEAN                 Gbl_WidenDeclarations = FALSE;
 BOOLEAN                 Gbl_IgnoreLoneLineFeeds = FALSE;
 BOOLEAN                 Gbl_HasLoneLineFeeds = FALSE;
+BOOLEAN                 Gbl_Cleanup = FALSE;
 
 
 /******************************************************************************
@@ -154,7 +154,7 @@ AsExaminePaths (
     if (Status)
     {
         printf ("Source path \"%s\" does not exist\n", Source);
-        return -1;
+        return (-1);
     }
 
     /* Return the filetype -- file or a directory */
@@ -171,7 +171,7 @@ AsExaminePaths (
     if ((ConversionTable->Flags & FLG_NO_FILE_OUTPUT) ||
         (Gbl_BatchMode))
     {
-        return 0;
+        return (0);
     }
 
     if (!AsStricmp (Source, Target))
@@ -183,7 +183,7 @@ AsExaminePaths (
 
         if (Response != 'y')
         {
-            return -1;
+            return (-1);
         }
 
         Gbl_Overwrite = TRUE;
@@ -200,12 +200,12 @@ AsExaminePaths (
 
             if (Response != 'y')
             {
-                return -1;
+                return (-1);
             }
         }
     }
 
-    return 0;
+    return (0);
 }
 
 
@@ -325,7 +325,7 @@ main (
     if (argc < 2)
     {
         AsDisplayUsage ();
-        return 0;
+        return (0);
     }
 
     /* Command line options */
@@ -346,6 +346,7 @@ main (
 
         printf ("Code cleanup\n");
         ConversionTable = &CleanupConversionTable;
+        Gbl_Cleanup = TRUE;
         break;
 
     case 'h':
@@ -393,7 +394,7 @@ main (
 
     default:
         AsDisplayUsage ();
-        return -1;
+        return (-1);
     }
 
 
@@ -402,14 +403,14 @@ main (
     {
         printf ("Missing source path\n");
         AsDisplayUsage ();
-        return -1;
+        return (-1);
     }
 
     TargetPath = argv[AcpiGbl_Optind+1];
 
     if (!ConversionTable)
     {
-        /* Just generate statistics.  Ignore target path */
+        /* Just generate statistics. Ignore target path */
 
         TargetPath = SourcePath;
 
@@ -430,7 +431,7 @@ main (
 
     if (AsExaminePaths (ConversionTable, SourcePath, TargetPath, &FileType))
     {
-        return -1;
+        return (-1);
     }
 
     /* Source/target can be either directories or a files */
@@ -461,5 +462,5 @@ main (
 
     AsDisplayStats ();
 
-    return 0;
+    return (0);
 }
diff --git a/source/tools/acpisrc/asremove.c b/source/tools/acpisrc/asremove.c
index 8fe29e158a2a7..54da0af0b1919 100644
--- a/source/tools/acpisrc/asremove.c
+++ b/source/tools/acpisrc/asremove.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: asremove - Source conversion - removal functions
@@ -59,7 +58,7 @@ AsRemoveStatement (
  *
  * DESCRIPTION: Remove all statements that contain the given keyword.
  *              Limitations:  Removes text from the start of the line that
- *              contains the keyword to the next semicolon.  Currently
+ *              contains the keyword to the next semicolon. Currently
  *              doesn't ignore comments.
  *
  ******************************************************************************/
@@ -297,7 +296,7 @@ AsRemoveConditionalCompile (
  *
  * FUNCTION:    AsRemoveMacro
  *
- * DESCRIPTION: Remove every line that contains the keyword.  Does not
+ * DESCRIPTION: Remove every line that contains the keyword. Does not
  *              skip comments.
  *
  ******************************************************************************/
@@ -368,7 +367,7 @@ AsRemoveMacro (
  *
  * FUNCTION:    AsRemoveLine
  *
- * DESCRIPTION: Remove every line that contains the keyword.  Does not
+ * DESCRIPTION: Remove every line that contains the keyword. Does not
  *              skip comments.
  *
  ******************************************************************************/
@@ -459,7 +458,7 @@ AsReduceTypedefs (
             }
             SubString++;
 
-            /* Find the closing brace.  Handles nested braces */
+            /* Find the closing brace. Handles nested braces */
 
             NestLevel = 1;
             while (*SubString)
@@ -505,7 +504,7 @@ AsReduceTypedefs (
  *
  * FUNCTION:    AsRemoveEmptyBlocks
  *
- * DESCRIPTION: Remove any C blocks (e.g., if {}) that contain no code.  This
+ * DESCRIPTION: Remove any C blocks (e.g., if {}) that contain no code. This
  *              can happen as a result of removing lines such as DEBUG_PRINT.
  *
  ******************************************************************************/
@@ -612,5 +611,3 @@ AsRemoveDebugMacros (
     AsReplaceString ("return_acpi_status",  "return", REPLACE_WHOLE_WORD, Buffer);
     AsReplaceString ("return_VALUE",        "return", REPLACE_WHOLE_WORD, Buffer);
 }
-
-
diff --git a/source/tools/acpisrc/astable.c b/source/tools/acpisrc/astable.c
index 3159b4435074b..fa04e8b644759 100644
--- a/source/tools/acpisrc/astable.c
+++ b/source/tools/acpisrc/astable.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: astable - Tables used for source conversion
@@ -206,8 +205,6 @@ ACPI_TYPED_IDENTIFIER_TABLE           AcpiIdentifiers[] = {
     {"ACPI_DEBUG_MEM_HEADER",               SRC_TYPE_STRUCT},
     {"ACPI_DEBUG_PRINT_INFO",               SRC_TYPE_STRUCT},
     {"ACPI_DESCRIPTOR",                     SRC_TYPE_UNION},
-    {"ACPI_DEVICE_ID",                      SRC_TYPE_STRUCT},
-    {"ACPI_DEVICE_ID_LIST",                 SRC_TYPE_STRUCT},
     {"ACPI_DEVICE_INFO",                    SRC_TYPE_STRUCT},
     {"ACPI_DEVICE_WALK_INFO",               SRC_TYPE_STRUCT},
     {"ACPI_DMTABLE_DATA",                   SRC_TYPE_STRUCT},
@@ -331,6 +328,8 @@ ACPI_TYPED_IDENTIFIER_TABLE           AcpiIdentifiers[] = {
     {"ACPI_PKG_INFO",                       SRC_TYPE_STRUCT},
     {"ACPI_PKG_STATE",                      SRC_TYPE_STRUCT},
     {"ACPI_PMTT_HEADER",                    SRC_TYPE_STRUCT},
+    {"ACPI_PNP_DEVICE_ID",                  SRC_TYPE_STRUCT},
+    {"ACPI_PNP_DEVICE_ID_LIST",             SRC_TYPE_STRUCT},
     {"ACPI_POINTER",                        SRC_TYPE_STRUCT},
     {"ACPI_POINTERS",                       SRC_TYPE_UNION},
     {"ACPI_PORT_INFO",                      SRC_TYPE_STRUCT},
@@ -818,10 +817,12 @@ ACPI_CONVERSION_TABLE       LicenseConversionTable = {
 ACPI_STRING_TABLE           CustomReplacements[] = {
 
 
-    {"(c) 1999 - 2012",      "(c) 1999 - 2012",         REPLACE_WHOLE_WORD}, /* Main ACPICA source */
-    {"(c) 2006 - 2012",      "(c) 2006 - 2012",         REPLACE_WHOLE_WORD}, /* Test suites */
-
 #if 0
+    {"SUPPORT, ASSISTANCE", "SUPPORT, ASSISTANCE",     REPLACE_WHOLE_WORD}, /* Fix intel header */
+
+    {"(c) 1999 - 2012",     "(c) 1999 - 2012",         REPLACE_WHOLE_WORD}, /* Main ACPICA source */
+    {"(c) 2006 - 2012",     "(c) 2006 - 2012",         REPLACE_WHOLE_WORD}, /* Test suites */
+
     {"(ACPI_INTEGER)", "(UINT64)",   REPLACE_WHOLE_WORD},
     {"ACPI_INTEGER        ", "UINT64              ",   REPLACE_WHOLE_WORD},
     {"ACPI_INTEGER", "UINT64",   REPLACE_WHOLE_WORD},
@@ -894,4 +895,3 @@ ACPI_CONVERSION_TABLE       CustomConversionTable = {
     (CVT_COUNT_TABS | CVT_COUNT_NON_ANSI_COMMENTS | CVT_COUNT_LINES |
      CVT_TRIM_LINES | CVT_TRIM_WHITESPACE),
 };
-
diff --git a/source/tools/acpisrc/asutils.c b/source/tools/acpisrc/asutils.c
index a596ea8cee061..f3d9350a3108f 100644
--- a/source/tools/acpisrc/asutils.c
+++ b/source/tools/acpisrc/asutils.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: asutils - common utilities
@@ -63,7 +62,7 @@ AsSkipUntilChar (
     {
         if (!*Buffer)
         {
-            return NULL;
+            return (NULL);
         }
 
         Buffer++;
@@ -92,7 +91,7 @@ AsSkipPastChar (
     {
         if (!*Buffer)
         {
-            return NULL;
+            return (NULL);
         }
 
         Buffer++;
@@ -110,7 +109,7 @@ AsSkipPastChar (
  *
  * DESCRIPTION: This function inserts and removes data from the file buffer.
  *              if more data is inserted than is removed, the data in the buffer
- *              is moved to make room.  If less data is inserted than is removed,
+ *              is moved to make room. If less data is inserted than is removed,
  *              the remaining data is moved to close the hole.
  *
  ******************************************************************************/
@@ -163,7 +162,7 @@ AsReplaceData (
  *
  * DESCRIPTION: This function inserts and removes data from the file buffer.
  *              if more data is inserted than is removed, the data in the buffer
- *              is moved to make room.  If less data is inserted than is removed,
+ *              is moved to make room. If less data is inserted than is removed,
  *              the remaining data is moved to close the hole.
  *
  ******************************************************************************/
@@ -208,7 +207,7 @@ AsInsertData (
  *
  * DESCRIPTION: This function inserts and removes data from the file buffer.
  *              if more data is inserted than is removed, the data in the buffer
- *              is moved to make room.  If less data is inserted than is removed,
+ *              is moved to make room. If less data is inserted than is removed,
  *              the remaining data is moved to close the hole.
  *
  ******************************************************************************/
@@ -231,4 +230,3 @@ AsRemoveData (
 
     return (StartPointer);
 }
-