diff options
Diffstat (limited to 'drivers/acpi/acpica/aclocal.h')
-rw-r--r-- | drivers/acpi/acpica/aclocal.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h index 24b8faa5c395..147a7e6bd38f 100644 --- a/drivers/acpi/acpica/aclocal.h +++ b/drivers/acpi/acpica/aclocal.h | |||
@@ -213,12 +213,12 @@ struct acpi_namespace_node { | |||
213 | #define ANOBJ_IS_BIT_OFFSET 0x40 /* i_aSL only: Reference is a bit offset */ | 213 | #define ANOBJ_IS_BIT_OFFSET 0x40 /* i_aSL only: Reference is a bit offset */ |
214 | #define ANOBJ_IS_REFERENCED 0x80 /* i_aSL only: Object was referenced */ | 214 | #define ANOBJ_IS_REFERENCED 0x80 /* i_aSL only: Object was referenced */ |
215 | 215 | ||
216 | /* One internal RSDT for table management */ | 216 | /* Internal ACPI table management - master table list */ |
217 | 217 | ||
218 | struct acpi_internal_rsdt { | 218 | struct acpi_table_list { |
219 | struct acpi_table_desc *tables; | 219 | struct acpi_table_desc *tables; /* Table descriptor array */ |
220 | u32 count; | 220 | u32 current_table_count; /* Tables currently in the array */ |
221 | u32 size; | 221 | u32 max_table_count; /* Max tables array will hold */ |
222 | u8 flags; | 222 | u8 flags; |
223 | }; | 223 | }; |
224 | 224 | ||
@@ -427,8 +427,8 @@ struct acpi_gpe_event_info { | |||
427 | struct acpi_gpe_register_info *register_info; /* Backpointer to register info */ | 427 | struct acpi_gpe_register_info *register_info; /* Backpointer to register info */ |
428 | u8 flags; /* Misc info about this GPE */ | 428 | u8 flags; /* Misc info about this GPE */ |
429 | u8 gpe_number; /* This GPE */ | 429 | u8 gpe_number; /* This GPE */ |
430 | u8 runtime_count; | 430 | u8 runtime_count; /* References to a run GPE */ |
431 | u8 wakeup_count; | 431 | u8 wakeup_count; /* References to a wake GPE */ |
432 | }; | 432 | }; |
433 | 433 | ||
434 | /* Information about a GPE register pair, one per each status/enable pair in an array */ | 434 | /* Information about a GPE register pair, one per each status/enable pair in an array */ |
@@ -454,6 +454,7 @@ struct acpi_gpe_block_info { | |||
454 | struct acpi_gpe_event_info *event_info; /* One for each GPE */ | 454 | struct acpi_gpe_event_info *event_info; /* One for each GPE */ |
455 | struct acpi_generic_address block_address; /* Base address of the block */ | 455 | struct acpi_generic_address block_address; /* Base address of the block */ |
456 | u32 register_count; /* Number of register pairs in block */ | 456 | u32 register_count; /* Number of register pairs in block */ |
457 | u16 gpe_count; /* Number of individual GPEs in block */ | ||
457 | u8 block_base_number; /* Base GPE number for this block */ | 458 | u8 block_base_number; /* Base GPE number for this block */ |
458 | }; | 459 | }; |
459 | 460 | ||
@@ -469,6 +470,10 @@ struct acpi_gpe_xrupt_info { | |||
469 | struct acpi_gpe_walk_info { | 470 | struct acpi_gpe_walk_info { |
470 | struct acpi_namespace_node *gpe_device; | 471 | struct acpi_namespace_node *gpe_device; |
471 | struct acpi_gpe_block_info *gpe_block; | 472 | struct acpi_gpe_block_info *gpe_block; |
473 | u16 count; | ||
474 | acpi_owner_id owner_id; | ||
475 | u8 enable_this_gpe; | ||
476 | u8 execute_by_owner_id; | ||
472 | }; | 477 | }; |
473 | 478 | ||
474 | struct acpi_gpe_device_info { | 479 | struct acpi_gpe_device_info { |