ACPICA: Improve error messages for the namespace root node (4032cc3e) · Commits · 戴 / test

drivers/acpi/acpica/dbnames.c

+9 −3

Original line number	Diff line number	Diff line
		@@ -189,9 +189,15 @@ void acpi_db_dump_namespace(char start_arg, char depth_arg)
		}

		acpi_db_set_output_destination(ACPI_DB_DUPLICATE_OUTPUT);

		if (((struct acpi_namespace_node *)subtree_entry)->parent) {
		acpi_os_printf("ACPI Namespace (from %4.4s (%p) subtree):\n",
		((struct acpi_namespace_node *)subtree_entry)->name.
		ascii, subtree_entry);
		((struct acpi_namespace_node *)subtree_entry)->
		name.ascii, subtree_entry);
		} else {
		acpi_os_printf("ACPI Namespace (from %s):\n",
		ACPI_NAMESPACE_ROOT);
		}

		/* Display the subtree */

+4 −4

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ acpi_ds_scope_stack_push(struct acpi_namespace_node *node,
		acpi_ut_get_type_name(old_scope_info->
		common.value)));
		} else {
		ACPI_DEBUG_PRINT_RAW((ACPI_DB_EXEC, "[\\___] (%s)", "ROOT"));
		ACPI_DEBUG_PRINT_RAW((ACPI_DB_EXEC, ACPI_NAMESPACE_ROOT));
		}

		ACPI_DEBUG_PRINT_RAW((ACPI_DB_EXEC,
		@@ -166,14 +166,14 @@ acpi_status acpi_ds_scope_stack_pop(struct acpi_walk_state *walk_state)

		new_scope_info = walk_state->scope_info;
		if (new_scope_info) {
		ACPI_DEBUG_PRINT_RAW((ACPI_DB_EXEC,
		"[%4.4s] (%s)\n",
		ACPI_DEBUG_PRINT_RAW((ACPI_DB_EXEC, "[%4.4s] (%s)\n",
		acpi_ut_get_node_name(new_scope_info->
		scope.node),
		acpi_ut_get_type_name(new_scope_info->
		common.value)));
		} else {
		ACPI_DEBUG_PRINT_RAW((ACPI_DB_EXEC, "[\\___] (ROOT)\n"));
		ACPI_DEBUG_PRINT_RAW((ACPI_DB_EXEC, "%s\n",
		ACPI_NAMESPACE_ROOT));
		}

		acpi_ut_delete_generic_state(scope_info);

+1 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,7 @@ void acpi_ut_repair_name(char *name)
		* Special case for the root node. This can happen if we get an
		* error during the execution of module-level code.
		*/
		if (ACPI_COMPARE_NAME(name, "\\___")) {
		if (ACPI_COMPARE_NAME(name, ACPI_ROOT_PATHNAME)) {
		return;
		}

+5 −2

Original line number	Diff line number	Diff line
		@@ -49,11 +49,14 @@
		/* Definitions of the predefined namespace names */

		#define ACPI_UNKNOWN_NAME (u32) 0x3F3F3F3F /* Unknown name is "????" */
		#define ACPI_ROOT_NAME (u32) 0x5F5F5F5C /* Root name is "\___" */

		#define ACPI_PREFIX_MIXED (u32) 0x69706341 /* "Acpi" */
		#define ACPI_PREFIX_LOWER (u32) 0x69706361 /* "acpi" */

		/* Root name stuff */

		#define ACPI_ROOT_NAME (u32) 0x5F5F5F5C /* Root name is "\___" */
		#define ACPI_ROOT_PATHNAME "\\___"
		#define ACPI_NAMESPACE_ROOT "Namespace Root"
		#define ACPI_NS_ROOT_PATH "\\"

		#endif /* __ACNAMES_H__ */