vserver 1.9.5.x5

[linux-2.6.git] / include / acpi / acutils.h

diff --git a/include/acpi/acutils.h b/include/acpi/acutils.h
index d786ae5..0de26b8 100644 (file)
--- a/include/acpi/acutils.h
+++ b/include/acpi/acutils.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2004, R. Byron Moore
+ * Copyright (C) 2000 - 2005, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -177,6 +177,12 @@ acpi_ut_strncpy (
        const char                      *src_string,
        acpi_size                       count);
 
+int
+acpi_ut_memcmp (
+       const char                      *buffer1,
+       const char                      *buffer2,
+       acpi_size                       count);
+
 int
 acpi_ut_strncmp (
        const char                      *string1,
@@ -577,6 +583,10 @@ union acpi_operand_object *
 acpi_ut_create_buffer_object (
        acpi_size                       buffer_size);
 
+union acpi_operand_object *
+acpi_ut_create_string_object (
+       acpi_size                       string_size);
+
 
 /*
  * ut_ref_cnt - Object reference count management
@@ -656,12 +666,14 @@ acpi_ut_create_update_state_and_push (
        u16                             action,
        union acpi_generic_state        **state_list);
 
+#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_ut_create_pkg_state_and_push (
        void                            *internal_object,
        void                            *external_object,
        u16                             index,
        union acpi_generic_state        **state_list);
+#endif
 
 union acpi_generic_state *
 acpi_ut_create_control_state (
@@ -671,6 +683,7 @@ void
 acpi_ut_delete_generic_state (
        union acpi_generic_state        *state);
 
+#ifdef ACPI_ENABLE_OBJECT_CACHE
 void
 acpi_ut_delete_generic_state_cache (
        void);
@@ -678,6 +691,7 @@ acpi_ut_delete_generic_state_cache (
 void
 acpi_ut_delete_object_cache (
        void);
+#endif
 
 /*
  * utmisc
@@ -690,14 +704,14 @@ acpi_ut_print_string (
 
 acpi_status
 acpi_ut_divide (
-       acpi_integer                    *in_dividend,
-       acpi_integer                    *in_divisor,
+       acpi_integer                    in_dividend,
+       acpi_integer                    in_divisor,
        acpi_integer                    *out_quotient,
        acpi_integer                    *out_remainder);
 
 acpi_status
 acpi_ut_short_divide (
-       acpi_integer                    *in_dividend,
+       acpi_integer                    in_dividend,
        u32                             divisor,
        acpi_integer                    *out_quotient,
        u32                             *out_remainder);
@@ -716,9 +730,15 @@ acpi_ut_strtoul64 (
        u32                             base,
        acpi_integer                    *ret_integer);
 
+/* Values for Base above (16=Hex, 10=Decimal) */
+
+#define ACPI_ANY_BASE        0
+
+#ifdef ACPI_FUTURE_USAGE
 char *
 acpi_ut_strupr (
        char                            *src_string);
+#endif
 
 u8 *
 acpi_ut_get_resource_end_tag (
@@ -760,9 +780,11 @@ acpi_ut_release_to_cache (
        u32                             list_id,
        void                            *object);
 
+#ifdef ACPI_ENABLE_OBJECT_CACHE
 void
 acpi_ut_delete_generic_cache (
        u32                             list_id);
+#endif
 
 acpi_status
 acpi_ut_validate_buffer (
@@ -837,9 +859,11 @@ acpi_ut_remove_allocation (
        char                            *module,
        u32                             line);
 
+#ifdef ACPI_FUTURE_USAGE
 void
 acpi_ut_dump_allocation_info (
        void);
+#endif
 
 void
 acpi_ut_dump_allocations (