union acpi_operand_object *obj_desc;
acpi_string val = NULL;
- ACPI_FUNCTION_TRACE(ns_root_initialize);
+ ACPI_FUNCTION_TRACE("ns_root_initialize");
status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
if (ACPI_FAILURE(status)) {
"Entering predefined entries into namespace\n"));
for (init_val = acpi_gbl_pre_defined_names; init_val->name; init_val++) {
-
/* _OSI is optional for now, will be permanent later */
if (!ACPI_STRCMP(init_val->name, "_OSI")
#if defined (ACPI_ASL_COMPILER)
- /* Save the parameter count for the i_aSL compiler */
+ /* save the parameter count for the i_aSL compiler */
new_node->value = obj_desc->method.param_count;
#else
(u8) (ACPI_TO_INTEGER(val) - 1);
if (ACPI_STRCMP(init_val->name, "_GL_") == 0) {
-
- /* Create a counting semaphore for the global lock */
-
+ /*
+ * Create a counting semaphore for the
+ * global lock
+ */
status =
acpi_os_create_semaphore
(ACPI_NO_UNIT_LIMIT, 1,
- &acpi_gbl_global_lock_semaphore);
+ &obj_desc->mutex.semaphore);
if (ACPI_FAILURE(status)) {
acpi_ut_remove_reference
(obj_desc);
goto unlock_and_exit;
}
- /* Mark this mutex as very special */
-
- obj_desc->mutex.os_mutex =
- ACPI_GLOBAL_LOCK;
+ /*
+ * We just created the mutex for the
+ * global lock, save it
+ */
+ acpi_gbl_global_lock_semaphore =
+ obj_desc->mutex.semaphore;
} else {
/* Create a mutex */
- status =
- acpi_os_create_mutex(&obj_desc->
- mutex.
- os_mutex);
+ status = acpi_os_create_semaphore(1, 1,
+ &obj_desc->
+ mutex.
+ semaphore);
if (ACPI_FAILURE(status)) {
acpi_ut_remove_reference
(obj_desc);
/* Save a handle to "_GPE", it is always present */
if (ACPI_SUCCESS(status)) {
- status = acpi_ns_get_node(NULL, "\\_GPE", ACPI_NS_NO_UPSEARCH,
- &acpi_gbl_fadt_gpe_device);
+ status =
+ acpi_ns_get_node_by_path("\\_GPE", NULL,
+ ACPI_NS_NO_UPSEARCH,
+ &acpi_gbl_fadt_gpe_device);
}
return_ACPI_STATUS(status);
acpi_object_type type_to_check_for;
acpi_object_type this_search_type;
u32 search_parent_flag = ACPI_NS_SEARCH_PARENT;
- u32 local_flags;
+ u32 local_flags = flags & ~(ACPI_NS_ERROR_IF_FOUND |
+ ACPI_NS_SEARCH_PARENT);
- ACPI_FUNCTION_TRACE(ns_lookup);
+ ACPI_FUNCTION_TRACE("ns_lookup");
if (!return_node) {
return_ACPI_STATUS(AE_BAD_PARAMETER);
}
- local_flags = flags & ~(ACPI_NS_ERROR_IF_FOUND | ACPI_NS_SEARCH_PARENT);
- *return_node = ACPI_ENTRY_NOT_FOUND;
acpi_gbl_ns_lookup_count++;
+ *return_node = ACPI_ENTRY_NOT_FOUND;
if (!acpi_gbl_root_node) {
return_ACPI_STATUS(AE_NO_NAMESPACE);
return_ACPI_STATUS(AE_AML_INTERNAL);
}
- if (!(flags & ACPI_NS_PREFIX_IS_SCOPE)) {
- /*
- * This node might not be a actual "scope" node (such as a
- * Device/Method, etc.) It could be a Package or other object node.
- * Backup up the tree to find the containing scope node.
- */
- while (!acpi_ns_opens_scope(prefix_node->type) &&
- prefix_node->type != ACPI_TYPE_ANY) {
- prefix_node =
- acpi_ns_get_parent_node(prefix_node);
- }
+ /*
+ * This node might not be a actual "scope" node (such as a
+ * Device/Method, etc.) It could be a Package or other object node.
+ * Backup up the tree to find the containing scope node.
+ */
+ while (!acpi_ns_opens_scope(prefix_node->type) &&
+ prefix_node->type != ACPI_TYPE_ANY) {
+ prefix_node = acpi_ns_get_parent_node(prefix_node);
}
}
* Begin examination of the actual pathname
*/
if (!pathname) {
-
/* A Null name_path is allowed and refers to the root */
num_segments = 0;
* to the current scope).
*/
if (*path == (u8) AML_ROOT_PREFIX) {
-
/* Pathname is fully qualified, start from the root */
this_node = acpi_gbl_root_node;
this_node = prefix_node;
num_carats = 0;
while (*path == (u8) AML_PARENT_PREFIX) {
-
/* Name is fully qualified, no search rules apply */
search_parent_flag = ACPI_NS_NO_UPSEARCH;
num_carats++;
this_node = acpi_ns_get_parent_node(this_node);
if (!this_node) {
-
/* Current scope has no parent scope */
ACPI_ERROR((AE_INFO,
&this_node);
if (ACPI_FAILURE(status)) {
if (status == AE_NOT_FOUND) {
-
/* Name not found in ACPI namespace */
ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
(type_to_check_for != ACPI_TYPE_LOCAL_SCOPE) &&
(this_node->type != ACPI_TYPE_ANY) &&
(this_node->type != type_to_check_for)) {
-
/* Complain about a type mismatch */
ACPI_WARNING((AE_INFO,
- "NsLookup: Type mismatch on %4.4s (%s), searching for (%s)",
+ "ns_lookup: Type mismatch on %4.4s (%s), searching for (%s)",
ACPI_CAST_PTR(char, &simple_name),
acpi_ut_get_type_name(this_node->type),
acpi_ut_get_type_name
git://git.onelab.eu / linux-2.6.git / blobdiff