diff options
author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
commit | 81b7bbd1932a04869d4c8635a75222dfc6089f96 (patch) | |
tree | 285ae868a1e3a41fb0dbfe346c28e380949bcb55 /include/acpi/aclocal.h | |
parent | 98051995ab44b993f992946055edc6115351f725 (diff) | |
parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) |
Merge branch 'linus'
Conflicts:
drivers/scsi/ipr.c
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/acpi/aclocal.h')
-rw-r--r-- | include/acpi/aclocal.h | 77 |
1 files changed, 57 insertions, 20 deletions
diff --git a/include/acpi/aclocal.h b/include/acpi/aclocal.h index 063c4b54290f..6f83ddbed3af 100644 --- a/include/acpi/aclocal.h +++ b/include/acpi/aclocal.h | |||
@@ -5,7 +5,7 @@ | |||
5 | *****************************************************************************/ | 5 | *****************************************************************************/ |
6 | 6 | ||
7 | /* | 7 | /* |
8 | * Copyright (C) 2000 - 2006, R. Byron Moore | 8 | * Copyright (C) 2000 - 2007, R. Byron Moore |
9 | * All rights reserved. | 9 | * All rights reserved. |
10 | * | 10 | * |
11 | * Redistribution and use in source and binary forms, with or without | 11 | * Redistribution and use in source and binary forms, with or without |
@@ -80,8 +80,8 @@ union acpi_parse_object; | |||
80 | * table below also! | 80 | * table below also! |
81 | */ | 81 | */ |
82 | #define ACPI_MTX_INTERPRETER 0 /* AML Interpreter, main lock */ | 82 | #define ACPI_MTX_INTERPRETER 0 /* AML Interpreter, main lock */ |
83 | #define ACPI_MTX_TABLES 1 /* Data for ACPI tables */ | 83 | #define ACPI_MTX_NAMESPACE 1 /* ACPI Namespace */ |
84 | #define ACPI_MTX_NAMESPACE 2 /* ACPI Namespace */ | 84 | #define ACPI_MTX_TABLES 2 /* Data for ACPI tables */ |
85 | #define ACPI_MTX_EVENTS 3 /* Data for ACPI events */ | 85 | #define ACPI_MTX_EVENTS 3 /* Data for ACPI events */ |
86 | #define ACPI_MTX_CACHES 4 /* Internal caches, general purposes */ | 86 | #define ACPI_MTX_CACHES 4 /* Internal caches, general purposes */ |
87 | #define ACPI_MTX_MEMORY 5 /* Debug memory tracking lists */ | 87 | #define ACPI_MTX_MEMORY 5 /* Debug memory tracking lists */ |
@@ -162,7 +162,7 @@ struct acpi_mutex_info { | |||
162 | typedef enum { | 162 | typedef enum { |
163 | ACPI_IMODE_LOAD_PASS1 = 0x01, | 163 | ACPI_IMODE_LOAD_PASS1 = 0x01, |
164 | ACPI_IMODE_LOAD_PASS2 = 0x02, | 164 | ACPI_IMODE_LOAD_PASS2 = 0x02, |
165 | ACPI_IMODE_EXECUTE = 0x0E | 165 | ACPI_IMODE_EXECUTE = 0x03 |
166 | } acpi_interpreter_mode; | 166 | } acpi_interpreter_mode; |
167 | 167 | ||
168 | union acpi_name_union { | 168 | union acpi_name_union { |
@@ -204,7 +204,7 @@ struct acpi_namespace_node { | |||
204 | /* Namespace Node flags */ | 204 | /* Namespace Node flags */ |
205 | 205 | ||
206 | #define ANOBJ_END_OF_PEER_LIST 0x01 /* End-of-list, Peer field points to parent */ | 206 | #define ANOBJ_END_OF_PEER_LIST 0x01 /* End-of-list, Peer field points to parent */ |
207 | #define ANOBJ_RESERVED 0x02 /* Available for future use */ | 207 | #define ANOBJ_TEMPORARY 0x02 /* Node is create by a method and is temporary */ |
208 | #define ANOBJ_METHOD_ARG 0x04 /* Node is a method argument */ | 208 | #define ANOBJ_METHOD_ARG 0x04 /* Node is a method argument */ |
209 | #define ANOBJ_METHOD_LOCAL 0x08 /* Node is a method local */ | 209 | #define ANOBJ_METHOD_LOCAL 0x08 /* Node is a method local */ |
210 | #define ANOBJ_SUBTREE_HAS_INI 0x10 /* Used to optimize device initialization */ | 210 | #define ANOBJ_SUBTREE_HAS_INI 0x10 /* Used to optimize device initialization */ |
@@ -219,25 +219,42 @@ struct acpi_namespace_node { | |||
219 | * ACPI Table Descriptor. One per ACPI table | 219 | * ACPI Table Descriptor. One per ACPI table |
220 | */ | 220 | */ |
221 | struct acpi_table_desc { | 221 | struct acpi_table_desc { |
222 | struct acpi_table_desc *prev; | 222 | acpi_physical_address address; |
223 | struct acpi_table_desc *next; | ||
224 | struct acpi_table_desc *installed_desc; | ||
225 | struct acpi_table_header *pointer; | 223 | struct acpi_table_header *pointer; |
226 | u8 *aml_start; | 224 | u32 length; /* Length fixed at 32 bits */ |
227 | u64 physical_address; | 225 | union acpi_name_union signature; |
228 | acpi_size length; | ||
229 | u32 aml_length; | ||
230 | acpi_owner_id owner_id; | 226 | acpi_owner_id owner_id; |
231 | u8 type; | 227 | u8 flags; |
232 | u8 allocation; | ||
233 | u8 loaded_into_namespace; | ||
234 | }; | 228 | }; |
235 | 229 | ||
236 | struct acpi_table_list { | 230 | /* Flags for above */ |
237 | struct acpi_table_desc *next; | 231 | |
232 | #define ACPI_TABLE_ORIGIN_UNKNOWN (0) | ||
233 | #define ACPI_TABLE_ORIGIN_MAPPED (1) | ||
234 | #define ACPI_TABLE_ORIGIN_ALLOCATED (2) | ||
235 | #define ACPI_TABLE_ORIGIN_MASK (3) | ||
236 | #define ACPI_TABLE_IS_LOADED (4) | ||
237 | |||
238 | /* One internal RSDT for table management */ | ||
239 | |||
240 | struct acpi_internal_rsdt { | ||
241 | struct acpi_table_desc *tables; | ||
238 | u32 count; | 242 | u32 count; |
243 | u32 size; | ||
244 | u8 flags; | ||
239 | }; | 245 | }; |
240 | 246 | ||
247 | /* Flags for above */ | ||
248 | |||
249 | #define ACPI_ROOT_ORIGIN_UNKNOWN (0) /* ~ORIGIN_ALLOCATED */ | ||
250 | #define ACPI_ROOT_ORIGIN_ALLOCATED (1) | ||
251 | #define ACPI_ROOT_ALLOW_RESIZE (2) | ||
252 | |||
253 | /* Predefined (fixed) table indexes */ | ||
254 | |||
255 | #define ACPI_TABLE_INDEX_DSDT (0) | ||
256 | #define ACPI_TABLE_INDEX_FACS (1) | ||
257 | |||
241 | struct acpi_find_context { | 258 | struct acpi_find_context { |
242 | char *search_for; | 259 | char *search_for; |
243 | acpi_handle *list; | 260 | acpi_handle *list; |
@@ -350,7 +367,7 @@ struct acpi_gpe_event_info { | |||
350 | union acpi_gpe_dispatch_info dispatch; /* Either Method or Handler */ | 367 | union acpi_gpe_dispatch_info dispatch; /* Either Method or Handler */ |
351 | struct acpi_gpe_register_info *register_info; /* Backpointer to register info */ | 368 | struct acpi_gpe_register_info *register_info; /* Backpointer to register info */ |
352 | u8 flags; /* Misc info about this GPE */ | 369 | u8 flags; /* Misc info about this GPE */ |
353 | u8 register_bit; /* This GPE bit within the register */ | 370 | u8 gpe_number; /* This GPE */ |
354 | }; | 371 | }; |
355 | 372 | ||
356 | /* Information about a GPE register pair, one per each status/enable pair in an array */ | 373 | /* Information about a GPE register pair, one per each status/enable pair in an array */ |
@@ -855,12 +872,30 @@ struct acpi_bit_register_info { | |||
855 | ****************************************************************************/ | 872 | ****************************************************************************/ |
856 | 873 | ||
857 | struct acpi_db_method_info { | 874 | struct acpi_db_method_info { |
858 | acpi_handle thread_gate; | 875 | acpi_handle main_thread_gate; |
876 | acpi_handle thread_complete_gate; | ||
877 | u32 *threads; | ||
878 | u32 num_threads; | ||
879 | u32 num_created; | ||
880 | u32 num_completed; | ||
881 | |||
859 | char *name; | 882 | char *name; |
860 | char **args; | ||
861 | u32 flags; | 883 | u32 flags; |
862 | u32 num_loops; | 884 | u32 num_loops; |
863 | char pathname[128]; | 885 | char pathname[128]; |
886 | char **args; | ||
887 | |||
888 | /* | ||
889 | * Arguments to be passed to method for the command | ||
890 | * Threads - | ||
891 | * the Number of threads, ID of current thread and | ||
892 | * Index of current thread inside all them created. | ||
893 | */ | ||
894 | char init_args; | ||
895 | char *arguments[4]; | ||
896 | char num_threads_str[11]; | ||
897 | char id_of_thread_str[11]; | ||
898 | char index_of_thread_str[11]; | ||
864 | }; | 899 | }; |
865 | 900 | ||
866 | struct acpi_integrity_info { | 901 | struct acpi_integrity_info { |
@@ -919,6 +954,8 @@ struct acpi_memory_list { | |||
919 | 954 | ||
920 | u32 total_allocated; | 955 | u32 total_allocated; |
921 | u32 total_freed; | 956 | u32 total_freed; |
957 | u32 max_occupied; | ||
958 | u32 total_size; | ||
922 | u32 current_total_size; | 959 | u32 current_total_size; |
923 | u32 requests; | 960 | u32 requests; |
924 | u32 hits; | 961 | u32 hits; |