summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndy Grover <agrover@groveronline.com>2003-01-22 19:09:29 -0800
committerAndy Grover <agrover@groveronline.com>2003-01-22 19:09:29 -0800
commit576228539931d1ad1cd63d8b354e1eaeb9ba9ed5 (patch)
tree862e0fd13551385170fe21ff5fd9994278253759 /include
parent0253fc4714b741f42c5403e9ab46d50b2b88a965 (diff)
ACPI: update to 20030122
Diffstat (limited to 'include')
-rw-r--r--include/acpi/acconfig.h2
-rw-r--r--include/acpi/acdebug.h32
-rw-r--r--include/acpi/acpiosxf.h9
-rw-r--r--include/acpi/actbl.h2
4 files changed, 37 insertions, 8 deletions
diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h
index fbac15e36756..6336994b843e 100644
--- a/include/acpi/acconfig.h
+++ b/include/acpi/acconfig.h
@@ -53,7 +53,7 @@
/* Version string */
-#define ACPI_CA_VERSION 0x20030109
+#define ACPI_CA_VERSION 0x20030122
/* Version of ACPI supported */
diff --git a/include/acpi/acdebug.h b/include/acpi/acdebug.h
index ed08890bea25..c7d80590fc4f 100644
--- a/include/acpi/acdebug.h
+++ b/include/acpi/acdebug.h
@@ -48,15 +48,15 @@ struct argument_info
#define VERBOSE_PRINT(fp) DBTEST_OUTPUT_LEVEL(lvl) {\
acpi_os_printf PARAM_LIST(fp);}
-#define EX_NO_SINGLE_STEP 1
-#define EX_SINGLE_STEP 2
+#define EX_NO_SINGLE_STEP 1
+#define EX_SINGLE_STEP 2
/* Prototypes */
/*
- * dbapi - external debugger interfaces
+ * dbxface - external debugger interfaces
*/
acpi_status
@@ -73,6 +73,15 @@ acpi_db_single_step (
union acpi_parse_object *op,
u32 op_type);
+acpi_status
+acpi_db_start_command (
+ struct acpi_walk_state *walk_state,
+ union acpi_parse_object *op);
+
+void
+acpi_db_method_end (
+ struct acpi_walk_state *walk_state);
+
/*
* dbcmds - debug commands and output routines
@@ -279,6 +288,13 @@ void ACPI_SYSTEM_XFACE
acpi_db_method_thread (
void *context);
+acpi_status
+acpi_db_execution_walk (
+ acpi_handle obj_handle,
+ u32 nesting_level,
+ void *context,
+ void **return_value);
+
/*
* dbfileio - Debugger file I/O commands
@@ -306,8 +322,14 @@ acpi_db_load_acpi_table (
char *filename);
acpi_status
-acpi_db_get_acpi_table (
- char *filename);
+acpi_db_get_table_from_file (
+ char *filename,
+ struct acpi_table_header **table);
+
+acpi_status
+acpi_db_read_table_from_file (
+ char *filename,
+ struct acpi_table_header **table);
/*
* dbhistry - debugger HISTORY command
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index 8309e692eff0..2a7a7de700a3 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -312,7 +312,14 @@ acpi_os_get_line (
void *
acpi_os_open_directory (
char *pathname,
- char *wildcard_spec);
+ char *wildcard_spec,
+ char requested_file_type);
+
+/* requeste_file_type values */
+
+#define REQUEST_FILE_ONLY 0
+#define REQUEST_DIR_ONLY 1
+
char *
acpi_os_get_next_filename (
diff --git a/include/acpi/actbl.h b/include/acpi/actbl.h
index 22865adb8e60..aee343bef781 100644
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
@@ -184,7 +184,7 @@ struct smart_battery_description_table
#define ACPI_TABLE_ROOT 0x00
#define ACPI_TABLE_PRIMARY 0x10
#define ACPI_TABLE_SECONDARY 0x20
-#define ACPI_TABLE_OTHER 0x30
+#define ACPI_TABLE_ALL 0x30
#define ACPI_TABLE_TYPE_MASK 0x30
/* Data about each known table type */