WebSVN – Kolibri OS – Diff – /drivers/devman/acpica/tools/acpixtract/acpixtract.c

 /******************************************************************************
+ *
  * 1. Copyright Notice
+ *
- * Some or all of this work - Copyright (c) 1999 - 2010, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2011, Intel Corp.
  * All rights reserved.
+ *
  * 2. License
+ *
  * 2.1. This is your license from Intel Corp. under its intellectual property
 /* Note: This is a 32-bit program only */
-#define VERSION             0x20100107
+#define VERSION             0x20110330
 #define FIND_HEADER         0
-#define EXTRACT_DATA        1
+#define EXTRACT_DATA        1
 #define BUFFER_SIZE         256
+#define MIN_HEADER_LENGTH   6   /* strlen ("DSDT @") */
 /* Local prototypes */
-void
+static void
 CheckAscii (
     char                    *Name,
     int                     Count);
-void
+static void
 NormalizeSignature (
     char                    *Signature);
-unsigned int
+static unsigned int
 GetNextInstance (
     char                    *InputPathname,
     char                    *Signature);
-int
+static int
 ExtractTables (
     char                    *InputPathname,
     char                    *Signature,
     unsigned int            MinimumInstances);
-size_t
+static size_t
 GetTableHeader (
     FILE                    *InputFile,
     unsigned char           *OutputData);
-unsigned int
+static unsigned int
 CountTableInstances (
     char                    *InputPathname,
     char                    *Signature);
-int
+static int
     unsigned int            NextInstance;
     struct TableInfo        *Next;
 };
-struct TableInfo            *ListHead = NULL;
+static struct TableInfo     *ListHead = NULL;
-char                        Filename[16];
+static char                 Filename[16];
-unsigned char               Data[16];
+static unsigned char        Data[16];
 /******************************************************************************
+ *
  * FUNCTION:    DisplayUsage
+ *
  * DESCRIPTION: Usage message
  *
  ******************************************************************************/
-void
+static void
 DisplayUsage (
  *              Ascii characters. Sets non-printable and null chars to .
+ *
  ******************************************************************************/
-void
+static void
 CheckAscii (
     char                    *Name,
     int                     Count)
+{
     int                     i;
  * DESCRIPTION: Change "RSD PTR" to "RSDP"
+ *
  ******************************************************************************/
-void
+static void
 NormalizeSignature (
     char                    *Signature)
+{
  * DESCRIPTION: Convert one line of ascii text binary (up to 16 bytes)
+ *
  ******************************************************************************/
-size_t
+static size_t
 ConvertLine (
     char                    *InputLine,
     unsigned char           *OutputData)
+{
     char                    *End;
  * DESCRIPTION: Extract and convert an ACPI table header
+ *
  ******************************************************************************/
-size_t
+static size_t
 GetTableHeader (
     FILE                    *InputFile,
     unsigned char           *OutputData)
+{
     size_t                  BytesConverted;
  *              the input acpidump file.
+ *
  ******************************************************************************/
-unsigned int
+static unsigned int
 CountTableInstances (
     char                    *InputPathname,
     char                    *Signature)
+{
     char                    Buffer[BUFFER_SIZE];
  *              instances.
+ *
  ******************************************************************************/
-unsigned int
+static unsigned int
 GetNextInstance (
     char                    *InputPathname,
     char                    *Signature)
+{
     struct TableInfo        *Info;
  * DESCRIPTION: Convert text ACPI tables to binary
+ *
  ******************************************************************************/
-int
+static int
 ExtractTables (
     char                    *InputPathname,
     char                    *Signature,
     unsigned int            MinimumInstances)
+{
         switch (State)
+        {
         case FIND_HEADER:
+            /* Ignore lines that are too short to be header lines */
+            if (strlen (Buffer) < MIN_HEADER_LENGTH)
+            {
+                continue;
+            }
             /* Ignore empty lines and lines that start with a space */
             if ((Buffer[0] == ' ') ||
                 (Buffer[0] == '\n'))
+            {
                 continue;
+            }
+            /*
+             * Ignore lines that are not of the form  @ . Examples:
+             *
+             * DSDT @ 0x737e4000
+             * XSDT @ 0x737f2fff
+             * RSD PTR @ 0xf6cd0
+             * SSDT @ (nil)
+             */
+            if (!strstr (Buffer, " @ "))
+            {
+                continue;
+            }
             NormalizeSignature (Buffer);
             strncpy (ThisSignature, Buffer, 4);
                 fclose (OutputFile);
                 OutputFile = NULL;
                 State = FIND_HEADER;
-                printf ("Acpi table [%4.4s] - % 7d bytes written to %s\n",
+                printf ("Acpi table [%4.4s] - %u bytes written to %s\n",
-                    ThisSignature, TotalBytesWritten, Filename);
+                    ThisSignature, (unsigned int) TotalBytesWritten, Filename);
                 continue;
+            }
         if (State == EXTRACT_DATA)
+        {
             /* Received an EOF while extracting data */
-            printf ("Acpi table [%4.4s] - % 7d bytes written to %s\n",
+            printf ("Acpi table [%4.4s] - %u bytes written to %s\n",
-                ThisSignature, TotalBytesWritten, Filename);
+                ThisSignature, (unsigned int) TotalBytesWritten, Filename);
+        }
+    }
     fclose (InputFile);
  *              perform an actual extraction of the tables.
+ *
  ******************************************************************************/
-int
+static int
 ListTables (
     char                    *InputPathname)
+{
     FILE                    *InputFile;
     char                    Buffer[BUFFER_SIZE];

Subversion Repositories Kolibri OS

(root)/drivers/devman/acpica/tools/acpixtract/acpixtract.c – Rev 1498 → 2216