diff options
author | jkim <jkim@FreeBSD.org> | 2011-02-12 01:03:15 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2011-02-12 01:03:15 +0000 |
commit | f74b693166215a41e29f1932c91ef7c921e662a7 (patch) | |
tree | 77080c497fdac042ac2702fc74a130a870de5215 /sys/contrib/dev/acpica/compiler/dttable.c | |
parent | 060dcf42aad3ccbc8df13ec962fd6a93e9f78070 (diff) | |
parent | 6636ac3533f4af02a42a7302b5cd1197817f4ed9 (diff) | |
download | FreeBSD-src-f74b693166215a41e29f1932c91ef7c921e662a7.zip FreeBSD-src-f74b693166215a41e29f1932c91ef7c921e662a7.tar.gz |
Merge ACPICA 20110211.
Diffstat (limited to 'sys/contrib/dev/acpica/compiler/dttable.c')
-rw-r--r-- | sys/contrib/dev/acpica/compiler/dttable.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/sys/contrib/dev/acpica/compiler/dttable.c b/sys/contrib/dev/acpica/compiler/dttable.c index d8ebeb4..8938e2d 100644 --- a/sys/contrib/dev/acpica/compiler/dttable.c +++ b/sys/contrib/dev/acpica/compiler/dttable.c @@ -1278,7 +1278,7 @@ DtCompileSrat ( /****************************************************************************** * - * FUNCTION: DtTableInfoGeneric + * FUNCTION: DtGetGenericTableInfo * * PARAMETERS: Name - Generic type name * @@ -1288,8 +1288,8 @@ DtCompileSrat ( * *****************************************************************************/ -static ACPI_DMTABLE_INFO * -DtTableInfoGeneric ( +ACPI_DMTABLE_INFO * +DtGetGenericTableInfo ( char *Name) { ACPI_DMTABLE_INFO *Info; @@ -1346,6 +1346,8 @@ DtCompileUefi ( UINT16 *DataOffset; + /* Compile the predefined portion of the UEFI table */ + Status = DtCompileTable (PFieldList, AcpiDmTableInfoUefi, &Subtable, TRUE); if (ACPI_FAILURE (Status)) @@ -1359,9 +1361,21 @@ DtCompileUefi ( ParentTable = DtPeekSubtable (); DtInsertSubtable (ParentTable, Subtable); + /* + * Compile the "generic" portion of the UEFI table. This + * part of the table is not predefined and any of the generic + * operators may be used. + */ + + /* Find any and all labels in the entire generic portion */ + + DtDetectAllLabels (*PFieldList); + + /* Now we can actually compile the parse tree */ + while (*PFieldList) { - Info = DtTableInfoGeneric ((*PFieldList)->Name); + Info = DtGetGenericTableInfo ((*PFieldList)->Name); if (!Info) { sprintf (MsgBuffer, "Generic data type \"%s\" not found", |