diff options
author | jkim <jkim@FreeBSD.org> | 2015-06-16 20:00:53 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2015-06-16 20:00:53 +0000 |
commit | 0a885a06376a92624987d1a67113b1d40b9c6d2a (patch) | |
tree | 9cdb2e881fca8e83d94fb1733d90e810e5fcc82a /sys/contrib/dev/acpica/include/aclocal.h | |
parent | 4680fa4d960d2f6208d5138b22eb56e2cc048f84 (diff) | |
download | FreeBSD-src-0a885a06376a92624987d1a67113b1d40b9c6d2a.zip FreeBSD-src-0a885a06376a92624987d1a67113b1d40b9c6d2a.tar.gz |
MFC: r283092, r283966
Merge ACPICA 20150515.
Relnotes: yes
Diffstat (limited to 'sys/contrib/dev/acpica/include/aclocal.h')
-rw-r--r-- | sys/contrib/dev/acpica/include/aclocal.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/sys/contrib/dev/acpica/include/aclocal.h b/sys/contrib/dev/acpica/include/aclocal.h index 9729930..4c96303 100644 --- a/sys/contrib/dev/acpica/include/aclocal.h +++ b/sys/contrib/dev/acpica/include/aclocal.h @@ -401,12 +401,24 @@ typedef struct acpi_package_info3 } ACPI_PACKAGE_INFO3; +typedef struct acpi_package_info4 +{ + UINT8 Type; + UINT8 ObjectType1; + UINT8 Count1; + UINT8 SubObjectTypes; + UINT8 PkgCount; + UINT16 Reserved; + +} ACPI_PACKAGE_INFO4; + typedef union acpi_predefined_info { ACPI_NAME_INFO Info; ACPI_PACKAGE_INFO RetInfo; ACPI_PACKAGE_INFO2 RetInfo2; ACPI_PACKAGE_INFO3 RetInfo3; + ACPI_PACKAGE_INFO4 RetInfo4; } ACPI_PREDEFINED_INFO; @@ -1371,4 +1383,11 @@ typedef struct ah_uuid } AH_UUID; +typedef struct ah_table +{ + char *Signature; + char *Description; + +} AH_TABLE; + #endif /* __ACLOCAL_H__ */ |