WebSVN – Kolibri OS – Diff – /drivers/devman/acpica/compiler/dtcompile.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
+ *
 static char                 VersionString[9];
 /* Local prototypes */
-static void
+static ACPI_STATUS
 DtInitialize (
     DT_FIELD                *FieldList;
+    /* Initialize globals */
+    Status = DtInitialize ();
+    if (ACPI_FAILURE (Status))
+    {
-    /* Initialize globals */
+        printf ("Error during compiler initialization, 0x%X\n", Status);
         return (Status);
     DtInitialize ();
     if (!FieldList)
+    {
         /* TBD: temporary error message. Msgs should come from function above */
         DtError (ASL_ERROR, ASL_MSG_SYNTAX, NULL,
+            "Input file does not appear to be an ASL or data table source file");
-            "Could not parse input file");
+        Status = AE_ERROR;
-        return (AE_ERROR);
+        goto CleanupAndExit;
+    }
+    {
         /* TBD: temporary error message. Msgs should come from function above */
         DtError (ASL_ERROR, ASL_MSG_SYNTAX, NULL,
+            "Could not compile input file");
             "Could not compile input file");
         goto CleanupAndExit;
+    }
     /* Write the binary, then the optional hex file */
+    DtOutputBinary (Gbl_RootTable);
-    DtOutputBinary (Gbl_RootTable);
+    LsDoHexOutput ();
-    LsDoHexOutput ();
+    DtWriteTableToListing ();
+ *
  * FUNCTION:    DtInitialize
+ *
  * PARAMETERS:  None
+ *
- * RETURN:      None
+ * RETURN:      Status
+ *
  * DESCRIPTION: Initialize data table compiler globals. Enables multiple
  *              compiles per invocation.
+ *
  *****************************************************************************/
-static void
+static ACPI_STATUS
 DtInitialize (
     void)
+{
+    ACPI_STATUS             Status;
+    Status = AcpiOsInitialize ();
+    if (ACPI_FAILURE (Status))
+    {
+        return (Status);
+    }
+    Status = AcpiUtInitGlobals ();
+    if (ACPI_FAILURE (Status))
+    {
+        return (Status);
+    }
     Gbl_FieldList = NULL;
     Gbl_RootTable = NULL;
+    Gbl_SubtableStack = NULL;
     Gbl_SubtableStack = NULL;
     sprintf (VersionString, "%X", (UINT32) ACPI_CA_VERSION);
-    sprintf (VersionString, "%X", (UINT32) ACPI_CA_VERSION);
+    return (AE_OK);
     for (i = 0; i < 7; i++)
+    {
         Next = Next->Next;
+    }
-    Next->Value = CompilerCreatorId;
+    Next->Value = ASL_CREATOR_ID;
     Next->Flags = DT_FIELD_NOT_ALLOCATED;
     Next = Next->Next;
     ACPI_STATUS             Status;
     /* Verify that we at least have a table signature and save it */
+    Signature = DtGetFieldValue (*FieldList);
-    Signature = DtGetFieldValue (*FieldList, "Signature");
+    if (!Signature)
+    {
-    if (!Signature)
+        sprintf (MsgBuffer, "Expected \"%s\"", "Signature");
         DtNameError (ASL_ERROR, ASL_MSG_INVALID_FIELD_NAME,
-        DtError (ASL_ERROR, ASL_MSG_TABLE_SIGNATURE, *FieldList, NULL);
+            *FieldList, MsgBuffer);
         return (AE_ERROR);
     else if (ACPI_COMPARE_NAME (Signature, ACPI_SIG_RSDP))
+    {
         Status = DtCompileRsdp (FieldList);
         return (Status);
+    }
-    else if (!ACPI_STRNCMP (Signature, "OEM", 3))
-    {
-        DtFatal (ASL_MSG_OEM_TABLE, *FieldList, Signature);
-        return (AE_ERROR);
-    }
     /*
      * All other tables must use the common ACPI table header. Insert the
      * current iASL IDs (name, version), and compile the header now.
         return (Status);
+    }
     DtPushSubtable (Gbl_RootTable);
-    /* Match signature and dispatch appropriately */
+    /* Validate the signature via the ACPI table list */
     TableData = AcpiDmGetTableData (Signature);
     if (!TableData)
+    {
+        DtCompileGeneric ((void **) FieldList);
+        goto Out;
         DtFatal (ASL_MSG_UNKNOWN_TABLE, *FieldList, Signature);
         return (AE_ERROR);
     /* Dispatch to per-table compile */
         DtFatal (ASL_MSG_COMPILER_INTERNAL, *FieldList,
             "Missing table dispatch info");
         return (AE_ERROR);
+    }
 Out:
     /* Set the final table length and then the checksum */
     DtSetTableLength ();
     DT_SUBTABLE             *InlineSubtable;
     UINT32                  FieldLength = 0;
     UINT8                   FieldType;
     UINT8                   *Buffer;
     UINT8                   *FlagBuffer = NULL;
-    UINT32                  FlagBitPosition = 0;
     ACPI_STATUS             Status;
     if (!Field || !*Field)
+    {
         return (AE_BAD_PARAMETER);
+    }
+    Length = DtGetSubtableLength (*Field, Info);
+    if (Length == ASL_EOF)
+    {
         return (AE_ERROR);
+    }
     Subtable = UtLocalCalloc (sizeof (DT_SUBTABLE));
-    Length = DtGetSubtableLength (*Field, Info);
+    if (Length > 0)
     Subtable = UtLocalCalloc (sizeof (DT_SUBTABLE));
         Subtable->Buffer = UtLocalCalloc (Length);
     Subtable->Buffer = UtLocalCalloc (Length);
             DtFatal (ASL_MSG_COMPILER_INTERNAL, NULL, MsgBuffer);
             Status = AE_BAD_DATA;
             goto Error;
+        }
-        /* Does input field name match what is expected? */
-        if (ACPI_STRCMP (LocalField->Name, Info->Name))
-        {
-            /*
-             * If Required = TRUE, the subtable must exist.
-             * If Required = FALSE, the subtable is optional
-             * (For example, AcpiDmTableInfoDmarScope in DMAR table is
-             * optional)
-             */
-            if (Required)
-            {
-                sprintf (MsgBuffer, "Expected \"%s\"", Info->Name);
-                DtNameError (ASL_ERROR, ASL_MSG_INVALID_FIELD_NAME,
-                    LocalField, MsgBuffer);
-            }
-            else
-            {
-                Status = AE_NOT_FOUND;
-                goto Error;
-            }
+        /* Maintain table offsets */
+        LocalField->TableOffset = Gbl_CurrentTableOffset;
+        FieldLength = DtGetFieldLength (LocalField, Info);
         Gbl_CurrentTableOffset += FieldLength;
         FieldLength = DtGetFieldLength (LocalField, Info);
         FieldType = DtGetFieldType (Info);
         Gbl_InputFieldCount++;
              * to compile and insert the flag fields from the individual bits
              */
             LocalField = LocalField->Next;
             *Field = LocalField;
             FlagBitPosition = 0;
             FlagBuffer = Buffer;
             break;
         case DT_FIELD_TYPE_FLAG:
             /* Individual Flag field, can be multiple bits */
             if (FlagBuffer)
             if (FlagBuffer)
                 FlagBitPosition = DtCompileFlag (FlagBuffer,
-                     LocalField, Info, FlagBitPosition);
+                DtCompileFlag (FlagBuffer, LocalField, Info);
+            }
         case DT_FIELD_TYPE_INLINE_SUBTABLE:
             /*
              * Recursion (one level max): compile GAS (Generic Address)
              * or Notify in-line subtable
              */
-            LocalField = LocalField->Next;
             *Field = LocalField;
             if (Info->Opcode == ACPI_DMT_GAS)
+            {
             if (ACPI_FAILURE (Status))
+            {
                 goto Error;
+            }
+            DtSetSubtableLength (InlineSubtable);
             ACPI_MEMCPY (Buffer, InlineSubtable->Buffer, FieldLength);
             ACPI_FREE (InlineSubtable->Buffer);
             ACPI_FREE (InlineSubtable);
             LocalField = *Field;
+            break;
+        case DT_FIELD_TYPE_LABEL:
+            DtWriteFieldToListing (Buffer, LocalField, 0);
+            LocalField = LocalField->Next;
             break;
         default:
+            /* Normal case for most field types (Integer, String, etc.) */
-            /* Normal case for most field types (Integer, String, etc.) */
+            DtCompileOneField (Buffer, LocalField,
                 FieldLength, FieldType, Info->Flags);
             DtCompileOneField (Buffer, LocalField,
-                FieldLength, FieldType, Info->Flags);
+            DtWriteFieldToListing (Buffer, LocalField, FieldLength);
             LocalField = LocalField->Next;
             if (Info->Flags & DT_LENGTH)
+            {
                 /* Field is an Integer that will contain a subtable length */
                 /* Field is an Integer that will contain a subtable length */
                 Subtable->LengthField = Buffer;
-                Subtable->LengthField = Buffer;
+                Subtable->SizeOfLengthField = FieldLength;

Subversion Repositories Kolibri OS

(root)/drivers/devman/acpica/compiler/dtcompile.c – Rev 1498 → 2216