diff options
Diffstat (limited to 'drivers/acpi/namespace/nsdump.c')
| -rw-r--r-- | drivers/acpi/namespace/nsdump.c | 109 | 
1 files changed, 67 insertions, 42 deletions
diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c index 1f6af3eb6c91..6c2aef0e0dd4 100644 --- a/drivers/acpi/namespace/nsdump.c +++ b/drivers/acpi/namespace/nsdump.c @@ -50,16 +50,32 @@  #define _COMPONENT          ACPI_NAMESPACE  	 ACPI_MODULE_NAME    ("nsdump") +/* Local prototypes */ -#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) +#ifdef ACPI_OBSOLETE_FUNCTIONS +void +acpi_ns_dump_root_devices ( +	void); +static acpi_status +acpi_ns_dump_one_device ( +	acpi_handle                     obj_handle, +	u32                             level, +	void                            *context, +	void                            **return_value); +#endif + + +#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)  /*******************************************************************************   *   * FUNCTION:    acpi_ns_print_pathname   * - * PARAMETERS:  num_segment         - Number of ACPI name segments + * PARAMETERS:  num_segments        - Number of ACPI name segments   *              Pathname            - The compressed (internal) path   * + * RETURN:      None + *   * DESCRIPTION: Print an object's full namespace pathname   *   ******************************************************************************/ @@ -103,6 +119,8 @@ acpi_ns_print_pathname (   *              Level               - Desired debug level   *              Component           - Caller's component ID   * + * RETURN:      None + *   * DESCRIPTION: Print an object's full namespace pathname   *              Manages allocation/freeing of a pathname buffer   * @@ -137,9 +155,12 @@ acpi_ns_dump_pathname (   *   * FUNCTION:    acpi_ns_dump_one_object   * - * PARAMETERS:  Handle              - Node to be dumped + * PARAMETERS:  obj_handle          - Node to be dumped   *              Level               - Nesting level of the handle   *              Context             - Passed into walk_namespace + *              return_value        - Not used + * + * RETURN:      Status   *   * DESCRIPTION: Dump a single Node   *              This procedure is a user_function called by acpi_ns_walk_namespace. @@ -394,8 +415,7 @@ acpi_ns_dump_one_object (  			return (AE_OK);  		} -		acpi_os_printf ("(R%d)", -				obj_desc->common.reference_count); +		acpi_os_printf ("(R%d)", obj_desc->common.reference_count);  		switch (type) {  		case ACPI_TYPE_METHOD: @@ -551,18 +571,20 @@ cleanup:  #ifdef ACPI_FUTURE_USAGE -  /*******************************************************************************   *   * FUNCTION:    acpi_ns_dump_objects   *   * PARAMETERS:  Type                - Object type to be dumped + *              display_type        - 0 or ACPI_DISPLAY_SUMMARY   *              max_depth           - Maximum depth of dump. Use ACPI_UINT32_MAX   *                                    for an effectively unlimited depth.   *              owner_id            - Dump only objects owned by this ID.  Use   *                                    ACPI_UINT32_MAX to match all owners.   *              start_handle        - Where in namespace to start/end search   * + * RETURN:      None + *   * DESCRIPTION: Dump typed objects within the loaded namespace.   *              Uses acpi_ns_walk_namespace in conjunction with acpi_ns_dump_one_object.   * @@ -590,10 +612,44 @@ acpi_ns_dump_objects (  			 ACPI_NS_WALK_NO_UNLOCK, acpi_ns_dump_one_object,  			 (void *) &info, NULL);  } +#endif	/* ACPI_FUTURE_USAGE */  /*******************************************************************************   * + * FUNCTION:    acpi_ns_dump_entry + * + * PARAMETERS:  Handle              - Node to be dumped + *              debug_level         - Output level + * + * RETURN:      None + * + * DESCRIPTION: Dump a single Node + * + ******************************************************************************/ + +void +acpi_ns_dump_entry ( +	acpi_handle                     handle, +	u32                             debug_level) +{ +	struct acpi_walk_info           info; + + +	ACPI_FUNCTION_ENTRY (); + + +	info.debug_level = debug_level; +	info.owner_id = ACPI_UINT32_MAX; +	info.display_type = ACPI_DISPLAY_SUMMARY; + +	(void) acpi_ns_dump_one_object (handle, 1, &info, NULL); +} + + +#ifdef _ACPI_ASL_COMPILER +/******************************************************************************* + *   * FUNCTION:    acpi_ns_dump_tables   *   * PARAMETERS:  search_base         - Root of subtree to be dumped, or @@ -601,6 +657,8 @@ acpi_ns_dump_objects (   *              max_depth           - Maximum depth of dump.  Use INT_MAX   *                                    for an effectively unlimited depth.   * + * RETURN:      None + *   * DESCRIPTION: Dump the name space, or a portion of it.   *   ******************************************************************************/ @@ -626,7 +684,7 @@ acpi_ns_dump_tables (  	}  	if (ACPI_NS_ALL == search_base) { -		/*  entire namespace    */ +		/* Entire namespace */  		search_handle = acpi_gbl_root_node;  		ACPI_DEBUG_PRINT ((ACPI_DB_TABLES, "\\\n")); @@ -636,38 +694,5 @@ acpi_ns_dump_tables (  			ACPI_UINT32_MAX, search_handle);  	return_VOID;  } - -#endif  /*  ACPI_FUTURE_USAGE  */ - - -/******************************************************************************* - * - * FUNCTION:    acpi_ns_dump_entry - * - * PARAMETERS:  Handle              - Node to be dumped - *              debug_level         - Output level - * - * DESCRIPTION: Dump a single Node - * - ******************************************************************************/ - -void -acpi_ns_dump_entry ( -	acpi_handle                     handle, -	u32                             debug_level) -{ -	struct acpi_walk_info           info; - - -	ACPI_FUNCTION_ENTRY (); - - -	info.debug_level = debug_level; -	info.owner_id = ACPI_UINT32_MAX; -	info.display_type = ACPI_DISPLAY_SUMMARY; - -	(void) acpi_ns_dump_one_object (handle, 1, &info, NULL); -} - -#endif - +#endif	/* _ACPI_ASL_COMPILER */ +#endif	/* defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) */  | 
