patch-2.4.10 linux/drivers/acpi/include/acutils.h

Next file: linux/drivers/acpi/include/amlcode.h
Previous file: linux/drivers/acpi/include/actypes.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.9/linux/drivers/acpi/include/acutils.h linux/drivers/acpi/include/acutils.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acutils.h -- prototypes for the common (subsystem-wide) procedures
- *       $Revision: 100 $
+ *       $Revision: 113 $
  *
  *****************************************************************************/
 
@@ -28,16 +28,16 @@
 
 
 typedef
-ACPI_STATUS (*ACPI_PKG_CALLBACK) (
+acpi_status (*ACPI_PKG_CALLBACK) (
 	u8                      object_type,
-	ACPI_OPERAND_OBJECT     *source_object,
-	ACPI_GENERIC_STATE      *state,
+	acpi_operand_object     *source_object,
+	acpi_generic_state      *state,
 	void                    *context);
 
 
-ACPI_STATUS
+acpi_status
 acpi_ut_walk_package_tree (
-	ACPI_OPERAND_OBJECT     *source_object,
+	acpi_operand_object     *source_object,
 	void                    *target_object,
 	ACPI_PKG_CALLBACK       walk_callback,
 	void                    *context);
@@ -49,7 +49,7 @@
 	u32                     length;
 	u32                     object_space;
 	u32                     num_packages;
-} ACPI_PKG_INFO;
+} acpi_pkg_info;
 
 #define REF_INCREMENT       (u16) 0
 #define REF_DECREMENT       (u16) 1
@@ -78,15 +78,15 @@
  * Ut_init - miscellaneous initialization and shutdown
  */
 
-ACPI_STATUS
+acpi_status
 acpi_ut_hardware_initialize (
 	void);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_subsystem_shutdown (
 	void);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_validate_fadt (
 	void);
 
@@ -112,10 +112,15 @@
 
 
 u8
+acpi_ut_hex_to_ascii_char (
+	acpi_integer            integer,
+	u32                     position);
+
+u8
 acpi_ut_valid_object_type (
 	u32                     type);
 
-ACPI_OWNER_ID
+acpi_owner_id
 acpi_ut_allocate_owner_id (
 	u32                     id_type);
 
@@ -200,168 +205,128 @@
  * Ut_copy - Object construction and conversion interfaces
  */
 
-ACPI_STATUS
+acpi_status
 acpi_ut_build_simple_object(
-	ACPI_OPERAND_OBJECT     *obj,
-	ACPI_OBJECT             *user_obj,
+	acpi_operand_object     *obj,
+	acpi_object             *user_obj,
 	u8                      *data_space,
 	u32                     *buffer_space_used);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_build_package_object (
-	ACPI_OPERAND_OBJECT     *obj,
+	acpi_operand_object     *obj,
 	u8                      *buffer,
 	u32                     *space_used);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_copy_iobject_to_eobject (
-	ACPI_OPERAND_OBJECT     *obj,
-	ACPI_BUFFER             *ret_buffer);
+	acpi_operand_object     *obj,
+	acpi_buffer             *ret_buffer);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_copy_esimple_to_isimple(
-	ACPI_OBJECT             *user_obj,
-	ACPI_OPERAND_OBJECT     *obj);
+	acpi_object             *user_obj,
+	acpi_operand_object     **return_obj);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_copy_eobject_to_iobject (
-	ACPI_OBJECT             *obj,
-	ACPI_OPERAND_OBJECT     *internal_obj);
+	acpi_object             *obj,
+	acpi_operand_object     **internal_obj);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_copy_isimple_to_isimple (
-	ACPI_OPERAND_OBJECT     *source_obj,
-	ACPI_OPERAND_OBJECT     *dest_obj);
+	acpi_operand_object     *source_obj,
+	acpi_operand_object     *dest_obj);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_copy_ipackage_to_ipackage (
-	ACPI_OPERAND_OBJECT     *source_obj,
-	ACPI_OPERAND_OBJECT     *dest_obj,
-	ACPI_WALK_STATE         *walk_state);
+	acpi_operand_object     *source_obj,
+	acpi_operand_object     *dest_obj,
+	acpi_walk_state         *walk_state);
 
 
 /*
  * Ut_create - Object creation
  */
 
-ACPI_STATUS
+acpi_status
 acpi_ut_update_object_reference (
-	ACPI_OPERAND_OBJECT     *object,
+	acpi_operand_object     *object,
 	u16                     action);
 
-ACPI_OPERAND_OBJECT  *
-_ut_create_internal_object (
-	NATIVE_CHAR             *module_name,
-	u32                     line_number,
-	u32                     component_id,
-	ACPI_OBJECT_TYPE8       type);
-
 
 /*
  * Ut_debug - Debug interfaces
  */
 
-u32
-get_debug_level (
+void
+acpi_ut_init_stack_ptr_trace (
 	void);
 
 void
-set_debug_level (
-	u32                     level);
+acpi_ut_track_stack_ptr (
+	void);
 
 void
-function_trace (
-	NATIVE_CHAR             *module_name,
+acpi_ut_trace (
 	u32                     line_number,
-	u32                     component_id,
-	NATIVE_CHAR             *function_name);
+	ACPI_DEBUG_PRINT_INFO   *dbg_info);
 
 void
-function_trace_ptr (
-	NATIVE_CHAR             *module_name,
+acpi_ut_trace_ptr (
 	u32                     line_number,
-	u32                     component_id,
-	NATIVE_CHAR             *function_name,
+	ACPI_DEBUG_PRINT_INFO   *dbg_info,
 	void                    *pointer);
 
 void
-function_trace_u32 (
-	NATIVE_CHAR             *module_name,
+acpi_ut_trace_u32 (
 	u32                     line_number,
-	u32                     component_id,
-	NATIVE_CHAR             *function_name,
+	ACPI_DEBUG_PRINT_INFO   *dbg_info,
 	u32                     integer);
 
 void
-function_trace_str (
-	NATIVE_CHAR             *module_name,
+acpi_ut_trace_str (
 	u32                     line_number,
-	u32                     component_id,
-	NATIVE_CHAR             *function_name,
+	ACPI_DEBUG_PRINT_INFO   *dbg_info,
 	NATIVE_CHAR             *string);
 
 void
-function_exit (
-	NATIVE_CHAR             *module_name,
+acpi_ut_exit (
 	u32                     line_number,
-	u32                     component_id,
-	NATIVE_CHAR             *function_name);
+	ACPI_DEBUG_PRINT_INFO   *dbg_info);
 
 void
-function_status_exit (
-	NATIVE_CHAR             *module_name,
+acpi_ut_status_exit (
 	u32                     line_number,
-	u32                     component_id,
-	NATIVE_CHAR             *function_name,
-	ACPI_STATUS             status);
+	ACPI_DEBUG_PRINT_INFO   *dbg_info,
+	acpi_status             status);
 
 void
-function_value_exit (
-	NATIVE_CHAR             *module_name,
+acpi_ut_value_exit (
 	u32                     line_number,
-	u32                     component_id,
-	NATIVE_CHAR             *function_name,
-	ACPI_INTEGER            value);
+	ACPI_DEBUG_PRINT_INFO   *dbg_info,
+	acpi_integer            value);
 
 void
-function_ptr_exit (
-	NATIVE_CHAR             *module_name,
+acpi_ut_ptr_exit (
 	u32                     line_number,
-	u32                     component_id,
-	NATIVE_CHAR             *function_name,
+	ACPI_DEBUG_PRINT_INFO   *dbg_info,
 	u8                      *ptr);
 
 void
-debug_print_prefix (
-	NATIVE_CHAR             *module_name,
-	u32                     line_number);
-
-void
-debug_print (
-	NATIVE_CHAR             *module_name,
-	u32                     line_number,
-	u32                     component_id,
-	u32                     print_level,
-	NATIVE_CHAR             *format, ...);
-
-void
-debug_print_raw (
-	NATIVE_CHAR             *format, ...);
-
-void
-_report_info (
+acpi_ut_report_info (
 	NATIVE_CHAR             *module_name,
 	u32                     line_number,
 	u32                     component_id);
 
 void
-_report_error (
+acpi_ut_report_error (
 	NATIVE_CHAR             *module_name,
 	u32                     line_number,
 	u32                     component_id);
 
 void
-_report_warning (
+acpi_ut_report_warning (
 	NATIVE_CHAR             *module_name,
 	u32                     line_number,
 	u32                     component_id);
@@ -373,6 +338,22 @@
 	u32                     display,
 	u32                     component_id);
 
+void
+acpi_ut_debug_print (
+	u32                     requested_debug_level,
+	u32                     line_number,
+	ACPI_DEBUG_PRINT_INFO   *dbg_info,
+	char                    *format,
+	...);
+
+void
+acpi_ut_debug_print_raw (
+	u32                     requested_debug_level,
+	u32                     line_number,
+	ACPI_DEBUG_PRINT_INFO   *dbg_info,
+	char                    *format,
+	...);
+
 
 /*
  * Ut_delete - Object deletion
@@ -380,19 +361,19 @@
 
 void
 acpi_ut_delete_internal_obj (
-	ACPI_OPERAND_OBJECT     *object);
+	acpi_operand_object     *object);
 
 void
 acpi_ut_delete_internal_package_object (
-	ACPI_OPERAND_OBJECT     *object);
+	acpi_operand_object     *object);
 
 void
 acpi_ut_delete_internal_simple_object (
-	ACPI_OPERAND_OBJECT     *object);
+	acpi_operand_object     *object);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_delete_internal_object_list (
-	ACPI_OPERAND_OBJECT     **obj_list);
+	acpi_operand_object     **obj_list);
 
 
 /*
@@ -410,42 +391,33 @@
 #define METHOD_NAME__BBN        "_BBN"
 
 
-ACPI_STATUS
+acpi_status
 acpi_ut_evaluate_numeric_object (
 	NATIVE_CHAR             *object_name,
-	ACPI_NAMESPACE_NODE     *device_node,
-	ACPI_INTEGER            *address);
+	acpi_namespace_node     *device_node,
+	acpi_integer            *address);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_execute_HID (
-	ACPI_NAMESPACE_NODE     *device_node,
+	acpi_namespace_node     *device_node,
 	ACPI_DEVICE_ID          *hid);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_execute_STA (
-	ACPI_NAMESPACE_NODE     *device_node,
+	acpi_namespace_node     *device_node,
 	u32                     *status_flags);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_execute_UID (
-	ACPI_NAMESPACE_NODE     *device_node,
+	acpi_namespace_node     *device_node,
 	ACPI_DEVICE_ID          *uid);
 
 
 /*
- * Ut_error - exception interfaces
- */
-
-NATIVE_CHAR *
-acpi_ut_format_exception (
-	ACPI_STATUS             status);
-
-
-/*
  * Ut_mutex - mutual exclusion interfaces
  */
 
-ACPI_STATUS
+acpi_status
 acpi_ut_mutex_initialize (
 	void);
 
@@ -453,19 +425,19 @@
 acpi_ut_mutex_terminate (
 	void);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_create_mutex (
 	ACPI_MUTEX_HANDLE       mutex_id);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_delete_mutex (
 	ACPI_MUTEX_HANDLE       mutex_id);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_acquire_mutex (
 	ACPI_MUTEX_HANDLE       mutex_id);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_release_mutex (
 	ACPI_MUTEX_HANDLE       mutex_id);
 
@@ -474,18 +446,25 @@
  * Ut_object - internal object create/delete/cache routines
  */
 
+acpi_operand_object  *
+acpi_ut_create_internal_object_dbg (
+	NATIVE_CHAR             *module_name,
+	u32                     line_number,
+	u32                     component_id,
+	acpi_object_type8       type);
+
 void *
-_ut_allocate_object_desc (
+acpi_ut_allocate_object_desc_dbg (
 	NATIVE_CHAR             *module_name,
 	u32                     line_number,
 	u32                     component_id);
 
-#define acpi_ut_create_internal_object(t) _ut_create_internal_object(_THIS_MODULE,__LINE__,_COMPONENT,t)
-#define acpi_ut_allocate_object_desc()  _ut_allocate_object_desc(_THIS_MODULE,__LINE__,_COMPONENT)
+#define acpi_ut_create_internal_object(t) acpi_ut_create_internal_object_dbg (_THIS_MODULE,__LINE__,_COMPONENT,t)
+#define acpi_ut_allocate_object_desc()  acpi_ut_allocate_object_desc_dbg (_THIS_MODULE,__LINE__,_COMPONENT)
 
 void
 acpi_ut_delete_object_desc (
-	ACPI_OPERAND_OBJECT     *object);
+	acpi_operand_object     *object);
 
 u8
 acpi_ut_valid_internal_object (
@@ -498,29 +477,29 @@
 
 void
 acpi_ut_add_reference (
-	ACPI_OPERAND_OBJECT     *object);
+	acpi_operand_object     *object);
 
 void
 acpi_ut_remove_reference (
-	ACPI_OPERAND_OBJECT     *object);
+	acpi_operand_object     *object);
 
 /*
  * Ut_size - Object size routines
  */
 
-ACPI_STATUS
+acpi_status
 acpi_ut_get_simple_object_size (
-	ACPI_OPERAND_OBJECT     *obj,
+	acpi_operand_object     *obj,
 	u32                     *obj_length);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_get_package_object_size (
-	ACPI_OPERAND_OBJECT     *obj,
+	acpi_operand_object     *obj,
 	u32                     *obj_length);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_get_object_size(
-	ACPI_OPERAND_OBJECT     *obj,
+	acpi_operand_object     *obj,
 	u32                     *obj_length);
 
 
@@ -530,49 +509,49 @@
 
 void
 acpi_ut_push_generic_state (
-	ACPI_GENERIC_STATE      **list_head,
-	ACPI_GENERIC_STATE      *state);
+	acpi_generic_state      **list_head,
+	acpi_generic_state      *state);
 
-ACPI_GENERIC_STATE *
+acpi_generic_state *
 acpi_ut_pop_generic_state (
-	ACPI_GENERIC_STATE      **list_head);
+	acpi_generic_state      **list_head);
 
 
-ACPI_GENERIC_STATE *
+acpi_generic_state *
 acpi_ut_create_generic_state (
 	void);
 
-ACPI_GENERIC_STATE *
+acpi_generic_state *
 acpi_ut_create_update_state (
-	ACPI_OPERAND_OBJECT     *object,
+	acpi_operand_object     *object,
 	u16                     action);
 
-ACPI_GENERIC_STATE *
+acpi_generic_state *
 acpi_ut_create_pkg_state (
 	void                    *internal_object,
 	void                    *external_object,
 	u16                     index);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_create_update_state_and_push (
-	ACPI_OPERAND_OBJECT     *object,
+	acpi_operand_object     *object,
 	u16                     action,
-	ACPI_GENERIC_STATE      **state_list);
+	acpi_generic_state      **state_list);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_create_pkg_state_and_push (
 	void                    *internal_object,
 	void                    *external_object,
 	u16                     index,
-	ACPI_GENERIC_STATE      **state_list);
+	acpi_generic_state      **state_list);
 
-ACPI_GENERIC_STATE *
+acpi_generic_state *
 acpi_ut_create_control_state (
 	void);
 
 void
 acpi_ut_delete_generic_state (
-	ACPI_GENERIC_STATE      *state);
+	acpi_generic_state      *state);
 
 void
 acpi_ut_delete_generic_state_cache (
@@ -598,52 +577,62 @@
 acpi_ut_strupr (
 	NATIVE_CHAR             *src_string);
 
-ACPI_STATUS
+acpi_status
 acpi_ut_resolve_package_references (
-	ACPI_OPERAND_OBJECT     *obj_desc);
+	acpi_operand_object     *obj_desc);
 
 
 #ifdef ACPI_DEBUG
 void
 acpi_ut_display_init_pathname (
-	ACPI_HANDLE             obj_handle,
+	acpi_handle             obj_handle,
 	char                    *path);
 
 #endif
 
 
 /*
- * Memory allocation functions and related macros.
- * Macros that expand to include filename and line number
+ * Utalloc - memory allocation and object caching
  */
 
 void *
-_ut_allocate (
+acpi_ut_acquire_from_cache (
+	u32                     list_id);
+
+void
+acpi_ut_release_to_cache (
+	u32                     list_id,
+	void                    *object);
+
+void
+acpi_ut_delete_generic_cache (
+	u32                     list_id);
+
+
+/* Debug Memory allocation functions */
+
+void *
+acpi_ut_allocate (
 	u32                     size,
 	u32                     component,
 	NATIVE_CHAR             *module,
 	u32                     line);
 
 void *
-_ut_callocate (
+acpi_ut_callocate (
 	u32                     size,
 	u32                     component,
 	NATIVE_CHAR             *module,
 	u32                     line);
 
 void
-_ut_free (
+acpi_ut_free (
 	void                    *address,
 	u32                     component,
 	NATIVE_CHAR             *module,
 	u32                     line);
 
-void
-acpi_ut_init_static_object (
-	ACPI_OPERAND_OBJECT     *obj_desc);
-
-
-#ifdef ACPI_DEBUG_TRACK_ALLOCATIONS
+#ifdef ACPI_DBG_TRACK_ALLOCATIONS
 void
 acpi_ut_dump_allocation_info (
 	void);
@@ -653,11 +642,6 @@
 	u32                     component,
 	NATIVE_CHAR             *module);
 #endif
-
-
-#define acpi_ut_allocate(a) _ut_allocate(a,_COMPONENT,_THIS_MODULE,__LINE__)
-#define acpi_ut_callocate(a) _ut_callocate(a, _COMPONENT,_THIS_MODULE,__LINE__)
-#define acpi_ut_free(a)     _ut_free(a,_COMPONENT,_THIS_MODULE,__LINE__)
 
 
 #endif /* _ACUTILS_H */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)