diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-09-14 22:53:11 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-09-14 22:53:11 +0000 |
| commit | ebef5c959a0ea58fa05c4a5a80bb93104780bf87 (patch) | |
| tree | 033c7834a7ab5fe0b48b11ac066372bfd32f2c22 /source/include | |
| parent | fc8e34d9a95f87b780f9ee3d400dd995aba2ce27 (diff) | |
Notes
Diffstat (limited to 'source/include')
| -rw-r--r-- | source/include/acdebug.h | 22 | ||||
| -rw-r--r-- | source/include/acpixf.h | 2 | ||||
| -rw-r--r-- | source/include/actbl1.h | 4 |
3 files changed, 19 insertions, 9 deletions
diff --git a/source/include/acdebug.h b/source/include/acdebug.h index 5c91c87dafaae..de915b44017a1 100644 --- a/source/include/acdebug.h +++ b/source/include/acdebug.h @@ -47,25 +47,33 @@ #define ACPI_DEBUG_BUFFER_SIZE 0x4000 /* 16K buffer for return objects */ -typedef struct CommandInfo +typedef struct acpi_db_command_info { char *Name; /* Command Name */ UINT8 MinArgs; /* Minimum arguments required */ -} COMMAND_INFO; +} ACPI_DB_COMMAND_INFO; -typedef struct ArgumentInfo +typedef struct acpi_db_command_help +{ + UINT8 LineCount; /* Number of help lines */ + char *Invocation; /* Command Invocation */ + char *Description; /* Command Description */ + +} ACPI_DB_COMMAND_HELP; + +typedef struct acpi_db_argument_info { char *Name; /* Argument Name */ -} ARGUMENT_INFO; +} ACPI_DB_ARGUMENT_INFO; -typedef struct acpi_execute_walk +typedef struct acpi_db_execute_walk { UINT32 Count; UINT32 MaxCount; -} ACPI_EXECUTE_WALK; +} ACPI_DB_EXECUTE_WALK; #define PARAM_LIST(pl) pl @@ -304,7 +312,7 @@ AcpiDbGetCacheInfo ( ACPI_OBJECT_TYPE AcpiDbMatchArgument ( char *UserArgument, - ARGUMENT_INFO *Arguments); + ACPI_DB_ARGUMENT_INFO *Arguments); void AcpiDbCloseDebugFile ( diff --git a/source/include/acpixf.h b/source/include/acpixf.h index cdec63a337bda..cd04e260acee7 100644 --- a/source/include/acpixf.h +++ b/source/include/acpixf.h @@ -48,7 +48,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20120816 +#define ACPI_CA_VERSION 0x20120913 #include "acconfig.h" #include "actypes.h" diff --git a/source/include/actbl1.h b/source/include/actbl1.h index c95d0c944e3dc..d7cc59b021f2e 100644 --- a/source/include/actbl1.h +++ b/source/include/actbl1.h @@ -567,7 +567,9 @@ enum AcpiHestNotifyTypes ACPI_HEST_NOTIFY_LOCAL = 2, ACPI_HEST_NOTIFY_SCI = 3, ACPI_HEST_NOTIFY_NMI = 4, - ACPI_HEST_NOTIFY_RESERVED = 5 /* 5 and greater are reserved */ + ACPI_HEST_NOTIFY_CMCI = 5, /* ACPI 5.0 */ + ACPI_HEST_NOTIFY_MCE = 6, /* ACPI 5.0 */ + ACPI_HEST_NOTIFY_RESERVED = 7 /* 7 and greater are reserved */ }; /* Values for ConfigWriteEnable bitfield above */ |