aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/namespace/nsaccess.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-05 00:44:28 -0400
committerLen Brown <len.brown@intel.com>2005-08-05 00:45:14 -0400
commit4be44fcd3bf648b782f4460fd06dfae6c42ded4b (patch)
tree5b5b7d296ea58786f53b95e5eac9565ff66890b0 /drivers/acpi/namespace/nsaccess.c
parentc65ade4dc8b486e8c8b9b0a6399789a5428e2039 (diff)
[ACPI] Lindent all ACPI files
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/namespace/nsaccess.c')
-rw-r--r--drivers/acpi/namespace/nsaccess.c342
1 files changed, 172 insertions, 170 deletions
diff --git a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c
index 7589e1fdf25a..edfbe34600f5 100644
--- a/drivers/acpi/namespace/nsaccess.c
+++ b/drivers/acpi/namespace/nsaccess.c
@@ -41,16 +41,13 @@
41 * POSSIBILITY OF SUCH DAMAGES. 41 * POSSIBILITY OF SUCH DAMAGES.
42 */ 42 */
43 43
44
45#include <acpi/acpi.h> 44#include <acpi/acpi.h>
46#include <acpi/amlcode.h> 45#include <acpi/amlcode.h>
47#include <acpi/acnamesp.h> 46#include <acpi/acnamesp.h>
48#include <acpi/acdispat.h> 47#include <acpi/acdispat.h>
49 48
50
51#define _COMPONENT ACPI_NAMESPACE 49#define _COMPONENT ACPI_NAMESPACE
52 ACPI_MODULE_NAME ("nsaccess") 50ACPI_MODULE_NAME("nsaccess")
53
54 51
55/******************************************************************************* 52/*******************************************************************************
56 * 53 *
@@ -65,24 +62,19 @@
65 * MUTEX: Locks namespace for entire execution 62 * MUTEX: Locks namespace for entire execution
66 * 63 *
67 ******************************************************************************/ 64 ******************************************************************************/
68 65acpi_status acpi_ns_root_initialize(void)
69acpi_status
70acpi_ns_root_initialize (
71 void)
72{ 66{
73 acpi_status status; 67 acpi_status status;
74 const struct acpi_predefined_names *init_val = NULL; 68 const struct acpi_predefined_names *init_val = NULL;
75 struct acpi_namespace_node *new_node; 69 struct acpi_namespace_node *new_node;
76 union acpi_operand_object *obj_desc; 70 union acpi_operand_object *obj_desc;
77 acpi_string val = NULL; 71 acpi_string val = NULL;
78
79 72
80 ACPI_FUNCTION_TRACE ("ns_root_initialize"); 73 ACPI_FUNCTION_TRACE("ns_root_initialize");
81 74
82 75 status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
83 status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE); 76 if (ACPI_FAILURE(status)) {
84 if (ACPI_FAILURE (status)) { 77 return_ACPI_STATUS(status);
85 return_ACPI_STATUS (status);
86 } 78 }
87 79
88 /* 80 /*
@@ -102,24 +94,26 @@ acpi_ns_root_initialize (
102 94
103 /* Enter the pre-defined names in the name table */ 95 /* Enter the pre-defined names in the name table */
104 96
105 ACPI_DEBUG_PRINT ((ACPI_DB_INFO, 97 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
106 "Entering predefined entries into namespace\n")); 98 "Entering predefined entries into namespace\n"));
107 99
108 for (init_val = acpi_gbl_pre_defined_names; init_val->name; init_val++) { 100 for (init_val = acpi_gbl_pre_defined_names; init_val->name; init_val++) {
109 /* _OSI is optional for now, will be permanent later */ 101 /* _OSI is optional for now, will be permanent later */
110 102
111 if (!ACPI_STRCMP (init_val->name, "_OSI") && !acpi_gbl_create_osi_method) { 103 if (!ACPI_STRCMP(init_val->name, "_OSI")
104 && !acpi_gbl_create_osi_method) {
112 continue; 105 continue;
113 } 106 }
114 107
115 status = acpi_ns_lookup (NULL, init_val->name, init_val->type, 108 status = acpi_ns_lookup(NULL, init_val->name, init_val->type,
116 ACPI_IMODE_LOAD_PASS2, ACPI_NS_NO_UPSEARCH, 109 ACPI_IMODE_LOAD_PASS2,
117 NULL, &new_node); 110 ACPI_NS_NO_UPSEARCH, NULL, &new_node);
118 111
119 if (ACPI_FAILURE (status) || (!new_node)) /* Must be on same line for code converter */ { 112 if (ACPI_FAILURE(status) || (!new_node)) { /* Must be on same line for code converter */
120 ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, 113 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
121 "Could not create predefined name %s, %s\n", 114 "Could not create predefined name %s, %s\n",
122 init_val->name, acpi_format_exception (status))); 115 init_val->name,
116 acpi_format_exception(status)));
123 } 117 }
124 118
125 /* 119 /*
@@ -128,11 +122,11 @@ acpi_ns_root_initialize (
128 * initial value, create the initial value. 122 * initial value, create the initial value.
129 */ 123 */
130 if (init_val->val) { 124 if (init_val->val) {
131 status = acpi_os_predefined_override (init_val, &val); 125 status = acpi_os_predefined_override(init_val, &val);
132 if (ACPI_FAILURE (status)) { 126 if (ACPI_FAILURE(status)) {
133 ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, 127 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
134 "Could not override predefined %s\n", 128 "Could not override predefined %s\n",
135 init_val->name)); 129 init_val->name));
136 } 130 }
137 131
138 if (!val) { 132 if (!val) {
@@ -143,7 +137,8 @@ acpi_ns_root_initialize (
143 * Entry requests an initial value, allocate a 137 * Entry requests an initial value, allocate a
144 * descriptor for it. 138 * descriptor for it.
145 */ 139 */
146 obj_desc = acpi_ut_create_internal_object (init_val->type); 140 obj_desc =
141 acpi_ut_create_internal_object(init_val->type);
147 if (!obj_desc) { 142 if (!obj_desc) {
148 status = AE_NO_MEMORY; 143 status = AE_NO_MEMORY;
149 goto unlock_and_exit; 144 goto unlock_and_exit;
@@ -156,7 +151,8 @@ acpi_ns_root_initialize (
156 */ 151 */
157 switch (init_val->type) { 152 switch (init_val->type) {
158 case ACPI_TYPE_METHOD: 153 case ACPI_TYPE_METHOD:
159 obj_desc->method.param_count = (u8) ACPI_TO_INTEGER (val); 154 obj_desc->method.param_count =
155 (u8) ACPI_TO_INTEGER(val);
160 obj_desc->common.flags |= AOPOBJ_DATA_VALID; 156 obj_desc->common.flags |= AOPOBJ_DATA_VALID;
161 157
162#if defined (ACPI_ASL_COMPILER) 158#if defined (ACPI_ASL_COMPILER)
@@ -167,45 +163,50 @@ acpi_ns_root_initialize (
167#else 163#else
168 /* Mark this as a very SPECIAL method */ 164 /* Mark this as a very SPECIAL method */
169 165
170 obj_desc->method.method_flags = AML_METHOD_INTERNAL_ONLY; 166 obj_desc->method.method_flags =
167 AML_METHOD_INTERNAL_ONLY;
171 168
172#ifndef ACPI_DUMP_APP 169#ifndef ACPI_DUMP_APP
173 obj_desc->method.implementation = acpi_ut_osi_implementation; 170 obj_desc->method.implementation =
171 acpi_ut_osi_implementation;
174#endif 172#endif
175#endif 173#endif
176 break; 174 break;
177 175
178 case ACPI_TYPE_INTEGER: 176 case ACPI_TYPE_INTEGER:
179 177
180 obj_desc->integer.value = ACPI_TO_INTEGER (val); 178 obj_desc->integer.value = ACPI_TO_INTEGER(val);
181 break; 179 break;
182 180
183
184 case ACPI_TYPE_STRING: 181 case ACPI_TYPE_STRING:
185 182
186 /* 183 /*
187 * Build an object around the static string 184 * Build an object around the static string
188 */ 185 */
189 obj_desc->string.length = (u32) ACPI_STRLEN (val); 186 obj_desc->string.length =
187 (u32) ACPI_STRLEN(val);
190 obj_desc->string.pointer = val; 188 obj_desc->string.pointer = val;
191 obj_desc->common.flags |= AOPOBJ_STATIC_POINTER; 189 obj_desc->common.flags |= AOPOBJ_STATIC_POINTER;
192 break; 190 break;
193 191
194
195 case ACPI_TYPE_MUTEX: 192 case ACPI_TYPE_MUTEX:
196 193
197 obj_desc->mutex.node = new_node; 194 obj_desc->mutex.node = new_node;
198 obj_desc->mutex.sync_level = (u8) (ACPI_TO_INTEGER (val) - 1); 195 obj_desc->mutex.sync_level =
196 (u8) (ACPI_TO_INTEGER(val) - 1);
199 197
200 if (ACPI_STRCMP (init_val->name, "_GL_") == 0) { 198 if (ACPI_STRCMP(init_val->name, "_GL_") == 0) {
201 /* 199 /*
202 * Create a counting semaphore for the 200 * Create a counting semaphore for the
203 * global lock 201 * global lock
204 */ 202 */
205 status = acpi_os_create_semaphore (ACPI_NO_UNIT_LIMIT, 203 status =
206 1, &obj_desc->mutex.semaphore); 204 acpi_os_create_semaphore
207 if (ACPI_FAILURE (status)) { 205 (ACPI_NO_UNIT_LIMIT, 1,
208 acpi_ut_remove_reference (obj_desc); 206 &obj_desc->mutex.semaphore);
207 if (ACPI_FAILURE(status)) {
208 acpi_ut_remove_reference
209 (obj_desc);
209 goto unlock_and_exit; 210 goto unlock_and_exit;
210 } 211 }
211 212
@@ -213,56 +214,58 @@ acpi_ns_root_initialize (
213 * We just created the mutex for the 214 * We just created the mutex for the
214 * global lock, save it 215 * global lock, save it
215 */ 216 */
216 acpi_gbl_global_lock_semaphore = obj_desc->mutex.semaphore; 217 acpi_gbl_global_lock_semaphore =
217 } 218 obj_desc->mutex.semaphore;
218 else { 219 } else {
219 /* Create a mutex */ 220 /* Create a mutex */
220 221
221 status = acpi_os_create_semaphore (1, 1, 222 status = acpi_os_create_semaphore(1, 1,
222 &obj_desc->mutex.semaphore); 223 &obj_desc->
223 if (ACPI_FAILURE (status)) { 224 mutex.
224 acpi_ut_remove_reference (obj_desc); 225 semaphore);
226 if (ACPI_FAILURE(status)) {
227 acpi_ut_remove_reference
228 (obj_desc);
225 goto unlock_and_exit; 229 goto unlock_and_exit;
226 } 230 }
227 } 231 }
228 break; 232 break;
229 233
230
231 default: 234 default:
232 235
233 ACPI_REPORT_ERROR (("Unsupported initial type value %X\n", 236 ACPI_REPORT_ERROR(("Unsupported initial type value %X\n", init_val->type));
234 init_val->type)); 237 acpi_ut_remove_reference(obj_desc);
235 acpi_ut_remove_reference (obj_desc);
236 obj_desc = NULL; 238 obj_desc = NULL;
237 continue; 239 continue;
238 } 240 }
239 241
240 /* Store pointer to value descriptor in the Node */ 242 /* Store pointer to value descriptor in the Node */
241 243
242 status = acpi_ns_attach_object (new_node, obj_desc, 244 status = acpi_ns_attach_object(new_node, obj_desc,
243 ACPI_GET_OBJECT_TYPE (obj_desc)); 245 ACPI_GET_OBJECT_TYPE
246 (obj_desc));
244 247
245 /* Remove local reference to the object */ 248 /* Remove local reference to the object */
246 249
247 acpi_ut_remove_reference (obj_desc); 250 acpi_ut_remove_reference(obj_desc);
248 } 251 }
249 } 252 }
250 253
251 254 unlock_and_exit:
252unlock_and_exit: 255 (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
253 (void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
254 256
255 /* Save a handle to "_GPE", it is always present */ 257 /* Save a handle to "_GPE", it is always present */
256 258
257 if (ACPI_SUCCESS (status)) { 259 if (ACPI_SUCCESS(status)) {
258 status = acpi_ns_get_node_by_path ("\\_GPE", NULL, ACPI_NS_NO_UPSEARCH, 260 status =
259 &acpi_gbl_fadt_gpe_device); 261 acpi_ns_get_node_by_path("\\_GPE", NULL,
262 ACPI_NS_NO_UPSEARCH,
263 &acpi_gbl_fadt_gpe_device);
260 } 264 }
261 265
262 return_ACPI_STATUS (status); 266 return_ACPI_STATUS(status);
263} 267}
264 268
265
266/******************************************************************************* 269/*******************************************************************************
267 * 270 *
268 * FUNCTION: acpi_ns_lookup 271 * FUNCTION: acpi_ns_lookup
@@ -287,62 +290,57 @@ unlock_and_exit:
287 ******************************************************************************/ 290 ******************************************************************************/
288 291
289acpi_status 292acpi_status
290acpi_ns_lookup ( 293acpi_ns_lookup(union acpi_generic_state *scope_info,
291 union acpi_generic_state *scope_info, 294 char *pathname,
292 char *pathname, 295 acpi_object_type type,
293 acpi_object_type type, 296 acpi_interpreter_mode interpreter_mode,
294 acpi_interpreter_mode interpreter_mode, 297 u32 flags,
295 u32 flags, 298 struct acpi_walk_state *walk_state,
296 struct acpi_walk_state *walk_state, 299 struct acpi_namespace_node **return_node)
297 struct acpi_namespace_node **return_node)
298{ 300{
299 acpi_status status; 301 acpi_status status;
300 char *path = pathname; 302 char *path = pathname;
301 struct acpi_namespace_node *prefix_node; 303 struct acpi_namespace_node *prefix_node;
302 struct acpi_namespace_node *current_node = NULL; 304 struct acpi_namespace_node *current_node = NULL;
303 struct acpi_namespace_node *this_node = NULL; 305 struct acpi_namespace_node *this_node = NULL;
304 u32 num_segments; 306 u32 num_segments;
305 u32 num_carats; 307 u32 num_carats;
306 acpi_name simple_name; 308 acpi_name simple_name;
307 acpi_object_type type_to_check_for; 309 acpi_object_type type_to_check_for;
308 acpi_object_type this_search_type; 310 acpi_object_type this_search_type;
309 u32 search_parent_flag = ACPI_NS_SEARCH_PARENT; 311 u32 search_parent_flag = ACPI_NS_SEARCH_PARENT;
310 u32 local_flags = flags & ~(ACPI_NS_ERROR_IF_FOUND | 312 u32 local_flags = flags & ~(ACPI_NS_ERROR_IF_FOUND |
311 ACPI_NS_SEARCH_PARENT); 313 ACPI_NS_SEARCH_PARENT);
312 314
313 315 ACPI_FUNCTION_TRACE("ns_lookup");
314 ACPI_FUNCTION_TRACE ("ns_lookup");
315
316 316
317 if (!return_node) { 317 if (!return_node) {
318 return_ACPI_STATUS (AE_BAD_PARAMETER); 318 return_ACPI_STATUS(AE_BAD_PARAMETER);
319 } 319 }
320 320
321 acpi_gbl_ns_lookup_count++; 321 acpi_gbl_ns_lookup_count++;
322 *return_node = ACPI_ENTRY_NOT_FOUND; 322 *return_node = ACPI_ENTRY_NOT_FOUND;
323 323
324 if (!acpi_gbl_root_node) { 324 if (!acpi_gbl_root_node) {
325 return_ACPI_STATUS (AE_NO_NAMESPACE); 325 return_ACPI_STATUS(AE_NO_NAMESPACE);
326 } 326 }
327 327
328 /* 328 /*
329 * Get the prefix scope. 329 * Get the prefix scope.
330 * A null scope means use the root scope 330 * A null scope means use the root scope
331 */ 331 */
332 if ((!scope_info) || 332 if ((!scope_info) || (!scope_info->scope.node)) {
333 (!scope_info->scope.node)) { 333 ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
334 ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, 334 "Null scope prefix, using root node (%p)\n",
335 "Null scope prefix, using root node (%p)\n", 335 acpi_gbl_root_node));
336 acpi_gbl_root_node));
337 336
338 prefix_node = acpi_gbl_root_node; 337 prefix_node = acpi_gbl_root_node;
339 } 338 } else {
340 else {
341 prefix_node = scope_info->scope.node; 339 prefix_node = scope_info->scope.node;
342 if (ACPI_GET_DESCRIPTOR_TYPE (prefix_node) != ACPI_DESC_TYPE_NAMED) { 340 if (ACPI_GET_DESCRIPTOR_TYPE(prefix_node) !=
343 ACPI_REPORT_ERROR (("ns_lookup: %p is not a namespace node [%s]\n", 341 ACPI_DESC_TYPE_NAMED) {
344 prefix_node, acpi_ut_get_descriptor_name (prefix_node))); 342 ACPI_REPORT_ERROR(("ns_lookup: %p is not a namespace node [%s]\n", prefix_node, acpi_ut_get_descriptor_name(prefix_node)));
345 return_ACPI_STATUS (AE_AML_INTERNAL); 343 return_ACPI_STATUS(AE_AML_INTERNAL);
346 } 344 }
347 345
348 /* 346 /*
@@ -350,9 +348,9 @@ acpi_ns_lookup (
350 * Device/Method, etc.) It could be a Package or other object node. 348 * Device/Method, etc.) It could be a Package or other object node.
351 * Backup up the tree to find the containing scope node. 349 * Backup up the tree to find the containing scope node.
352 */ 350 */
353 while (!acpi_ns_opens_scope (prefix_node->type) && 351 while (!acpi_ns_opens_scope(prefix_node->type) &&
354 prefix_node->type != ACPI_TYPE_ANY) { 352 prefix_node->type != ACPI_TYPE_ANY) {
355 prefix_node = acpi_ns_get_parent_node (prefix_node); 353 prefix_node = acpi_ns_get_parent_node(prefix_node);
356 } 354 }
357 } 355 }
358 356
@@ -367,13 +365,13 @@ acpi_ns_lookup (
367 /* A Null name_path is allowed and refers to the root */ 365 /* A Null name_path is allowed and refers to the root */
368 366
369 num_segments = 0; 367 num_segments = 0;
370 this_node = acpi_gbl_root_node; 368 this_node = acpi_gbl_root_node;
371 path = ""; 369 path = "";
372 370
373 ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, 371 ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
374 "Null Pathname (Zero segments), Flags=%X\n", flags)); 372 "Null Pathname (Zero segments), Flags=%X\n",
375 } 373 flags));
376 else { 374 } else {
377 /* 375 /*
378 * Name pointer is valid (and must be in internal name format) 376 * Name pointer is valid (and must be in internal name format)
379 * 377 *
@@ -397,15 +395,16 @@ acpi_ns_lookup (
397 395
398 path++; 396 path++;
399 397
400 ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, 398 ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
401 "Path is absolute from root [%p]\n", this_node)); 399 "Path is absolute from root [%p]\n",
402 } 400 this_node));
403 else { 401 } else {
404 /* Pathname is relative to current scope, start there */ 402 /* Pathname is relative to current scope, start there */
405 403
406 ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, 404 ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
407 "Searching relative to prefix scope [%4.4s] (%p)\n", 405 "Searching relative to prefix scope [%4.4s] (%p)\n",
408 acpi_ut_get_node_name (prefix_node), prefix_node)); 406 acpi_ut_get_node_name(prefix_node),
407 prefix_node));
409 408
410 /* 409 /*
411 * Handle multiple Parent Prefixes (carat) by just getting 410 * Handle multiple Parent Prefixes (carat) by just getting
@@ -426,20 +425,20 @@ acpi_ns_lookup (
426 /* Backup to the parent node */ 425 /* Backup to the parent node */
427 426
428 num_carats++; 427 num_carats++;
429 this_node = acpi_ns_get_parent_node (this_node); 428 this_node = acpi_ns_get_parent_node(this_node);
430 if (!this_node) { 429 if (!this_node) {
431 /* Current scope has no parent scope */ 430 /* Current scope has no parent scope */
432 431
433 ACPI_REPORT_ERROR ( 432 ACPI_REPORT_ERROR(("ACPI path has too many parent prefixes (^) - reached beyond root node\n"));
434 ("ACPI path has too many parent prefixes (^) - reached beyond root node\n")); 433 return_ACPI_STATUS(AE_NOT_FOUND);
435 return_ACPI_STATUS (AE_NOT_FOUND);
436 } 434 }
437 } 435 }
438 436
439 if (search_parent_flag == ACPI_NS_NO_UPSEARCH) { 437 if (search_parent_flag == ACPI_NS_NO_UPSEARCH) {
440 ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, 438 ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
441 "Search scope is [%4.4s], path has %d carat(s)\n", 439 "Search scope is [%4.4s], path has %d carat(s)\n",
442 acpi_ut_get_node_name (this_node), num_carats)); 440 acpi_ut_get_node_name
441 (this_node), num_carats));
443 } 442 }
444 } 443 }
445 444
@@ -465,9 +464,9 @@ acpi_ns_lookup (
465 num_segments = 0; 464 num_segments = 0;
466 type = this_node->type; 465 type = this_node->type;
467 466
468 ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, 467 ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
469 "Prefix-only Pathname (Zero name segments), Flags=%X\n", 468 "Prefix-only Pathname (Zero name segments), Flags=%X\n",
470 flags)); 469 flags));
471 break; 470 break;
472 471
473 case AML_DUAL_NAME_PREFIX: 472 case AML_DUAL_NAME_PREFIX:
@@ -481,8 +480,9 @@ acpi_ns_lookup (
481 num_segments = 2; 480 num_segments = 2;
482 path++; 481 path++;
483 482
484 ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, 483 ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
485 "Dual Pathname (2 segments, Flags=%X)\n", flags)); 484 "Dual Pathname (2 segments, Flags=%X)\n",
485 flags));
486 break; 486 break;
487 487
488 case AML_MULTI_NAME_PREFIX_OP: 488 case AML_MULTI_NAME_PREFIX_OP:
@@ -494,12 +494,12 @@ acpi_ns_lookup (
494 /* Extract segment count, point to first name segment */ 494 /* Extract segment count, point to first name segment */
495 495
496 path++; 496 path++;
497 num_segments = (u32) (u8) *path; 497 num_segments = (u32) (u8) * path;
498 path++; 498 path++;
499 499
500 ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, 500 ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
501 "Multi Pathname (%d Segments, Flags=%X) \n", 501 "Multi Pathname (%d Segments, Flags=%X) \n",
502 num_segments, flags)); 502 num_segments, flags));
503 break; 503 break;
504 504
505 default: 505 default:
@@ -509,15 +509,15 @@ acpi_ns_lookup (
509 */ 509 */
510 num_segments = 1; 510 num_segments = 1;
511 511
512 ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, 512 ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
513 "Simple Pathname (1 segment, Flags=%X)\n", flags)); 513 "Simple Pathname (1 segment, Flags=%X)\n",
514 flags));
514 break; 515 break;
515 } 516 }
516 517
517 ACPI_DEBUG_EXEC (acpi_ns_print_pathname (num_segments, path)); 518 ACPI_DEBUG_EXEC(acpi_ns_print_pathname(num_segments, path));
518 } 519 }
519 520
520
521 /* 521 /*
522 * Search namespace for each segment of the name. Loop through and 522 * Search namespace for each segment of the name. Loop through and
523 * verify (or add to the namespace) each name segment. 523 * verify (or add to the namespace) each name segment.
@@ -541,7 +541,7 @@ acpi_ns_lookup (
541 * requested it AND we have a single, non-fully-qualified name_seg 541 * requested it AND we have a single, non-fully-qualified name_seg
542 */ 542 */
543 if ((search_parent_flag != ACPI_NS_NO_UPSEARCH) && 543 if ((search_parent_flag != ACPI_NS_NO_UPSEARCH) &&
544 (flags & ACPI_NS_SEARCH_PARENT)) { 544 (flags & ACPI_NS_SEARCH_PARENT)) {
545 local_flags |= ACPI_NS_SEARCH_PARENT; 545 local_flags |= ACPI_NS_SEARCH_PARENT;
546 } 546 }
547 547
@@ -554,24 +554,28 @@ acpi_ns_lookup (
554 554
555 /* Extract one ACPI name from the front of the pathname */ 555 /* Extract one ACPI name from the front of the pathname */
556 556
557 ACPI_MOVE_32_TO_32 (&simple_name, path); 557 ACPI_MOVE_32_TO_32(&simple_name, path);
558 558
559 /* Try to find the single (4 character) ACPI name */ 559 /* Try to find the single (4 character) ACPI name */
560 560
561 status = acpi_ns_search_and_enter (simple_name, walk_state, current_node, 561 status =
562 interpreter_mode, this_search_type, local_flags, &this_node); 562 acpi_ns_search_and_enter(simple_name, walk_state,
563 if (ACPI_FAILURE (status)) { 563 current_node, interpreter_mode,
564 this_search_type, local_flags,
565 &this_node);
566 if (ACPI_FAILURE(status)) {
564 if (status == AE_NOT_FOUND) { 567 if (status == AE_NOT_FOUND) {
565 /* Name not found in ACPI namespace */ 568 /* Name not found in ACPI namespace */
566 569
567 ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, 570 ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
568 "Name [%4.4s] not found in scope [%4.4s] %p\n", 571 "Name [%4.4s] not found in scope [%4.4s] %p\n",
569 (char *) &simple_name, (char *) &current_node->name, 572 (char *)&simple_name,
570 current_node)); 573 (char *)&current_node->name,
574 current_node));
571 } 575 }
572 576
573 *return_node = this_node; 577 *return_node = this_node;
574 return_ACPI_STATUS (status); 578 return_ACPI_STATUS(status);
575 } 579 }
576 580
577 /* 581 /*
@@ -587,19 +591,16 @@ acpi_ns_lookup (
587 * 591 *
588 * Then we have a type mismatch. Just warn and ignore it. 592 * Then we have a type mismatch. Just warn and ignore it.
589 */ 593 */
590 if ((num_segments == 0) && 594 if ((num_segments == 0) &&
591 (type_to_check_for != ACPI_TYPE_ANY) && 595 (type_to_check_for != ACPI_TYPE_ANY) &&
592 (type_to_check_for != ACPI_TYPE_LOCAL_ALIAS) && 596 (type_to_check_for != ACPI_TYPE_LOCAL_ALIAS) &&
593 (type_to_check_for != ACPI_TYPE_LOCAL_METHOD_ALIAS) && 597 (type_to_check_for != ACPI_TYPE_LOCAL_METHOD_ALIAS) &&
594 (type_to_check_for != ACPI_TYPE_LOCAL_SCOPE) && 598 (type_to_check_for != ACPI_TYPE_LOCAL_SCOPE) &&
595 (this_node->type != ACPI_TYPE_ANY) && 599 (this_node->type != ACPI_TYPE_ANY) &&
596 (this_node->type != type_to_check_for)) { 600 (this_node->type != type_to_check_for)) {
597 /* Complain about a type mismatch */ 601 /* Complain about a type mismatch */
598 602
599 ACPI_REPORT_WARNING ( 603 ACPI_REPORT_WARNING(("ns_lookup: Type mismatch on %4.4s (%s), searching for (%s)\n", (char *)&simple_name, acpi_ut_get_type_name(this_node->type), acpi_ut_get_type_name(type_to_check_for)));
600 ("ns_lookup: Type mismatch on %4.4s (%s), searching for (%s)\n",
601 (char *) &simple_name, acpi_ut_get_type_name (this_node->type),
602 acpi_ut_get_type_name (type_to_check_for)));
603 } 604 }
604 605
605 /* 606 /*
@@ -625,15 +626,16 @@ acpi_ns_lookup (
625 * If entry is a type which opens a scope, push the new scope on the 626 * If entry is a type which opens a scope, push the new scope on the
626 * scope stack. 627 * scope stack.
627 */ 628 */
628 if (acpi_ns_opens_scope (type)) { 629 if (acpi_ns_opens_scope(type)) {
629 status = acpi_ds_scope_stack_push (this_node, type, walk_state); 630 status =
630 if (ACPI_FAILURE (status)) { 631 acpi_ds_scope_stack_push(this_node, type,
631 return_ACPI_STATUS (status); 632 walk_state);
633 if (ACPI_FAILURE(status)) {
634 return_ACPI_STATUS(status);
632 } 635 }
633 } 636 }
634 } 637 }
635 638
636 *return_node = this_node; 639 *return_node = this_node;
637 return_ACPI_STATUS (AE_OK); 640 return_ACPI_STATUS(AE_OK);
638} 641}
639
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-12 20:59:03 -0500