ACPI: update to 20030122

drivers/acpi/dispatcher/dsinit.c

@@ -24,11 +24,8 @@
 
 
 #include "acpi.h"
-#include "acparser.h"
-#include "amlcode.h"
 #include "acdispat.h"
 #include "acnamesp.h"
-#include "acinterp.h"
 
 #define _COMPONENT          ACPI_DISPATCHER
 	 ACPI_MODULE_NAME    ("dsinit")

drivers/acpi/hardware/hwtimer.c

@@ -117,7 +117,10 @@ acpi_get_timer (
  *              Note that this function accomodates only a single timer
  *              rollover.  Thus for 24-bit timers, this function should only
  *              be used for calculating durations less than ~4.6 seconds
- *              (~20 hours for 32-bit timers).
+ *              (~20 minutes for 32-bit timers) -- calculations below
+ *
+ *              2**24 Ticks / 3,600,000 Ticks/Sec = 4.66 sec
+ *              2**32 Ticks / 3,600,000 Ticks/Sec = 1193 sec or 19.88 minutes
  *
  ******************************************************************************/
 

drivers/acpi/namespace/nsload.c

@@ -75,9 +75,11 @@ acpi_ns_load_table (
 
 	ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "AML block at %p\n", table_desc->aml_start));
 
+	/* Ignore table if there is no AML contained within */
+
 	if (!table_desc->aml_length) {
-		ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Zero-length AML block\n"));
-		return_ACPI_STATUS (AE_BAD_PARAMETER);
+		ACPI_REPORT_WARNING (("Zero-length AML block in table [%4.4s]\n", table_desc->pointer->signature));
+		return_ACPI_STATUS (AE_OK);
 	}
 
 	/*

drivers/acpi/resources/rscalc.c

@@ -793,7 +793,7 @@ acpi_rs_get_pci_routing_table_length (
 				 * The length String.Length field does not include the
 				 * terminating NULL, add 1
 				 */
-				temp_size_needed += ((*sub_object_list)->string.length + 1);
+				temp_size_needed += ((acpi_size) (*sub_object_list)->string.length + 1);
 			}
 			else {
 				temp_size_needed += acpi_ns_get_pathname_length (

drivers/acpi/tables/tbinstal.c

@@ -61,7 +61,7 @@ acpi_tb_match_signature (
 	 * Search for a signature match among the known table types
 	 */
 	for (i = 0; i < NUM_ACPI_TABLES; i++) {
-		if ((acpi_gbl_acpi_table_data[i].flags & ACPI_TABLE_TYPE_MASK) != search_type) {
+		if (!(acpi_gbl_acpi_table_data[i].flags & search_type)) {
 			continue;
 		}
 
@@ -74,7 +74,7 @@ acpi_tb_match_signature (
 			}
 
 			ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
-				"Table [%4.4s] matched and is a required ACPI table\n",
+				"Table [%4.4s] is an ACPI table consumed by the core subsystem\n",
 				(char *) acpi_gbl_acpi_table_data[i].signature));
 
 			return_ACPI_STATUS (AE_OK);
@@ -82,7 +82,7 @@ acpi_tb_match_signature (
 	}
 
 	ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
-		"Table [%4.4s] is not a required ACPI table - ignored\n",
+		"Table [%4.4s] is not an ACPI table consumed by the core subsystem - ignored\n",
 		(char *) signature));
 
 	return_ACPI_STATUS (AE_TABLE_NOT_SUPPORTED);
@@ -125,7 +125,7 @@ acpi_tb_install_table (
 
 	status = acpi_tb_init_table_descriptor (table_info->type, table_info);
 	if (ACPI_FAILURE (status)) {
-		ACPI_REPORT_ERROR (("Could not install ACPI table [%s], %s\n",
+		ACPI_REPORT_ERROR (("Could not install ACPI table [%4.4s], %s\n",
 			table_info->pointer->signature, acpi_format_exception (status)));
 	}
 

drivers/acpi/utilities/utcopy.c

@@ -652,13 +652,13 @@ acpi_ut_copy_simple_object (
 		 */
 		if ((source_desc->string.length) &&
 			(!(source_desc->common.flags & AOPOBJ_STATIC_POINTER))) {
-			dest_desc->string.pointer = ACPI_MEM_ALLOCATE (source_desc->string.length + 1);
+			dest_desc->string.pointer = ACPI_MEM_ALLOCATE ((acpi_size) source_desc->string.length + 1);
 			if (!dest_desc->string.pointer) {
 				return (AE_NO_MEMORY);
 			}
 
 			ACPI_MEMCPY (dest_desc->string.pointer, source_desc->string.pointer,
-					  source_desc->string.length + 1);
+					  (acpi_size) source_desc->string.length + 1);
 		}
 		break;
 

include/acpi/acconfig.h

@@ -53,7 +53,7 @@
 
 /* Version string */
 
-#define ACPI_CA_VERSION                 0x20030109
+#define ACPI_CA_VERSION                 0x20030122
 
 /* Version of ACPI supported */
 

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

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 (

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 */