WebSVN – Kolibri OS – Diff – /drivers/devman/acpica/compiler/dtutils.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
+ *
     char                    *ExtraMessage)
+{
+    DtError (ASL_ERROR, MessageId, FieldObject, ExtraMessage);
+/*
+ * TBD: remove this entire function, DtFatal
+ *
+ * We cannot abort the compiler on error, because we may be compiling a
+ * list of files. We must move on to the next file.
-    DtError (ASL_ERROR, MessageId, FieldObject, ExtraMessage);
+ */
 #ifdef __OBSOLETE
+    CmCleanupAndExit ();
-    CmCleanupAndExit ();
+    exit (1);
-    exit (1);
+#endif
+}
 /******************************************************************************
+ *
  * FUNCTION:    DtGetFieldValue
+ *
  * PARAMETERS:  Field               - Current field list pointer
- *              Name                - Field name
+ *
  * RETURN:      Field value
+ *
  * DESCRIPTION: Get field value
+ *
  *****************************************************************************/
 char *
 DtGetFieldValue (
-    DT_FIELD                *Field,
-    char                    *Name)
+    DT_FIELD                *Field)
-{
-    /* Search the field list for the name */
+{
-    while (Field)
+    if (!Field)
-    {
-        if (!ACPI_STRCMP (Name, Field->Name))
-        {
+    {
-            return (Field->Value);
-        }
-        Field = Field->Next;
+        return (NULL);
     }
-    return (NULL);
+    return (Field->Value);
+}
     case ACPI_DMT_STRING:
         Type = DT_FIELD_TYPE_STRING;
         break;
+    case ACPI_DMT_BUFFER:
-    case ACPI_DMT_BUFFER:
+    case ACPI_DMT_BUF7:
     case ACPI_DMT_BUF16:
-        Type = DT_FIELD_TYPE_BUFFER;
-        break;
     case ACPI_DMT_BUF128:
     case ACPI_DMT_PCI_PATH:
-        Type = DT_FIELD_TYPE_PCI_PATH;
+        Type = DT_FIELD_TYPE_BUFFER;
         break;
     case ACPI_DMT_GAS:
     case ACPI_DMT_HESTNTFY:
+        Type = DT_FIELD_TYPE_INLINE_SUBTABLE;
+        break;
+    case ACPI_DMT_UNICODE:
+        Type = DT_FIELD_TYPE_UNICODE;
+        break;
+    case ACPI_DMT_UUID:
+        Type = DT_FIELD_TYPE_UUID;
+        break;
+    case ACPI_DMT_DEVICE_PATH:
+        Type = DT_FIELD_TYPE_DEVICE_PATH;
+        break;
+    case ACPI_DMT_LABEL:
-        Type = DT_FIELD_TYPE_INLINE_SUBTABLE;
+        Type = DT_FIELD_TYPE_LABEL;
         break;
     default:
 /******************************************************************************
+ *
  * FUNCTION:    DtGetFieldLength
  *
- * PARAMETERS:  Field               - Current field list pointer
+ * PARAMETERS:  Field               - Current field
  *              Info                - Data table info
+ *
  * RETURN:      Field length
+ *
  * DESCRIPTION: Get length of bytes needed to compile the field
+ *
+ * Note: This function must remain in sync with AcpiDmDumpTable.
+ *
  *****************************************************************************/
 UINT32
     case ACPI_DMT_FLAG5:
     case ACPI_DMT_FLAG6:
     case ACPI_DMT_FLAG7:
     case ACPI_DMT_FLAGS0:
     case ACPI_DMT_FLAGS2:
+    case ACPI_DMT_LABEL:
         ByteLength = 0;
         break;
     case ACPI_DMT_UINT8:
     case ACPI_DMT_CHKSUM:
+    case ACPI_DMT_SPACEID:
+    case ACPI_DMT_ACCWIDTH:
-    case ACPI_DMT_SPACEID:
+    case ACPI_DMT_IVRS:
     case ACPI_DMT_MADT:
     case ACPI_DMT_SRAT:
     case ACPI_DMT_ASF:
     case ACPI_DMT_HESTNTYP:
+    case ACPI_DMT_FADTPM:
-    case ACPI_DMT_FADTPM:
+    case ACPI_DMT_EINJACT:
+    case ACPI_DMT_EINJINST:
+    case ACPI_DMT_ERSTACT:
-    case ACPI_DMT_IVRS:
+    case ACPI_DMT_ERSTINST:
         ByteLength = 1;
         break;
         ByteLength = 3;
         break;
     case ACPI_DMT_UINT32:
+    case ACPI_DMT_NAME4:
-    case ACPI_DMT_NAME4:
+    case ACPI_DMT_SLIC:
     case ACPI_DMT_SIG:
         ByteLength = 4;
         break;
     case ACPI_DMT_NAME6:
         ByteLength = 6;
+        break;
         break;
     case ACPI_DMT_UINT56:
-    case ACPI_DMT_UINT56:
+    case ACPI_DMT_BUF7:
         ByteLength = 7;
         break;
     case ACPI_DMT_UINT64:
     case ACPI_DMT_NAME8:
-        ByteLength = 8;
-        break;
+        ByteLength = 8;
+        break;
     case ACPI_DMT_STRING:
+    case ACPI_DMT_STRING:
+        Value = DtGetFieldValue (Field);
+        if (Value)
+        {
+            ByteLength = ACPI_STRLEN (Value) + 1;
+        }
+        else
+        {   /* At this point, this is a fatal error */
         Value = DtGetFieldValue (Field, Info->Name);
             sprintf (MsgBuffer, "Expected \"%s\"", Info->Name);
-        /* TBD: error if Value is NULL? (as below?) */
+            DtFatal (ASL_MSG_COMPILER_INTERNAL, NULL, MsgBuffer);
             return (0);
     case ACPI_DMT_HESTNTFY:
         ByteLength = sizeof (ACPI_HEST_NOTIFY);
         break;
     case ACPI_DMT_BUFFER:
-        Value = DtGetFieldValue (Field, Info->Name);
+        Value = DtGetFieldValue (Field);
         if (Value)
+        {
             ByteLength = DtGetBufferLength (Value);
+        }
         else
         {   /* At this point, this is a fatal error */
+            sprintf (MsgBuffer, "Expected \"%s\"", Info->Name);
-            sprintf (MsgBuffer, "Expected \"%s\"", Info->Name);
+            DtFatal (ASL_MSG_COMPILER_INTERNAL, NULL, MsgBuffer);
-            DtFatal (ASL_MSG_COMPILER_INTERNAL, NULL, MsgBuffer);
+            return (0);
+        }
+        break;
         break;
     case ACPI_DMT_BUF16:
+    case ACPI_DMT_UUID:
+        ByteLength = 16;
+        break;
+    case ACPI_DMT_BUF128:
+        ByteLength = 128;
+        break;
+    case ACPI_DMT_UNICODE:
+        Value = DtGetFieldValue (Field);
+        /* TBD: error if Value is NULL? (as below?) */
     case ACPI_DMT_BUF16:
-        ByteLength = 16;
+        ByteLength = (ACPI_STRLEN (Value) + 1) * sizeof(UINT16);
         break;
     default:
         DtFatal (ASL_MSG_COMPILER_INTERNAL, Field, "Invalid table opcode");
     while (1)
+    {
         ChildTable = DtGetNextSubtable (ParentTable, ChildTable);
         if (ChildTable)
+        {
+            if (ChildTable->LengthField)
+            {
+                DtSetSubtableLength (ChildTable);
+            }
             if (ChildTable->Child)
+            {
                 ParentTable = ChildTable;
                 ChildTable = NULL;
+            }

Subversion Repositories Kolibri OS

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