aboutsummaryrefslogtreecommitdiff
path: root/source/include/aclocal.h
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2013-04-04 21:18:57 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2013-04-04 21:18:57 +0000
commit0ff2ef6cfe11e98b10c26dc8f1c359e6502538c8 (patch)
tree2d060ed4fedfc9aace2e673176570faa8ae1d376 /source/include/aclocal.h
parent6bb10c5e2fa82c104e57c7468335930ba9e47d4f (diff)
downloadsrc-0ff2ef6cfe11e98b10c26dc8f1c359e6502538c8.tar.gz
src-0ff2ef6cfe11e98b10c26dc8f1c359e6502538c8.zip
Import ACPICA 20130328.vendor/acpica/20130328
Notes
Notes: svn path=/vendor-sys/acpica/dist/; revision=249109 svn path=/vendor-sys/acpica/20130328/; revision=249110; tag=vendor/acpica/20130328
Diffstat (limited to 'source/include/aclocal.h')
-rw-r--r--source/include/aclocal.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/source/include/aclocal.h b/source/include/aclocal.h
index ab03935a9c4e..f9fefb5df796 100644
--- a/source/include/aclocal.h
+++ b/source/include/aclocal.h
@@ -335,6 +335,7 @@ ACPI_STATUS (*ACPI_INTERNAL_METHOD) (
#define ACPI_BTYPE_OBJECTS_AND_REFS 0x0001FFFF /* ARG or LOCAL */
#define ACPI_BTYPE_ALL_OBJECTS 0x0000FFFF
+#pragma pack(1)
/*
* Information structure for ACPI predefined names.
@@ -347,7 +348,7 @@ ACPI_STATUS (*ACPI_INTERNAL_METHOD) (
typedef struct acpi_name_info
{
char Name[ACPI_NAME_SIZE];
- UINT8 ParamCount;
+ UINT16 ArgumentList;
UINT8 ExpectedBtypes;
} ACPI_NAME_INFO;
@@ -372,7 +373,7 @@ typedef struct acpi_package_info
UINT8 Count1;
UINT8 ObjectType2;
UINT8 Count2;
- UINT8 Reserved;
+ UINT16 Reserved;
} ACPI_PACKAGE_INFO;
@@ -383,6 +384,7 @@ typedef struct acpi_package_info2
UINT8 Type;
UINT8 Count;
UINT8 ObjectType[4];
+ UINT8 Reserved;
} ACPI_PACKAGE_INFO2;
@@ -394,7 +396,7 @@ typedef struct acpi_package_info3
UINT8 Count;
UINT8 ObjectType[2];
UINT8 TailObjectType;
- UINT8 Reserved;
+ UINT16 Reserved;
} ACPI_PACKAGE_INFO3;
@@ -407,6 +409,10 @@ typedef union acpi_predefined_info
} ACPI_PREDEFINED_INFO;
+/* Reset to default packing */
+
+#pragma pack()
+
/* Data block used during object validation */