patch-2.4.1 linux/drivers/acpi/interpreter/amresolv.c

• Lines: 95
• Date: Mon Jan 29 10:15:59 2001
• Orig file: v2.4.0/linux/drivers/acpi/interpreter/amresolv.c
• Orig date: Fri Dec 29 14:07:21 2000

diff -u --recursive --new-file v2.4.0/linux/drivers/acpi/interpreter/amresolv.c linux/drivers/acpi/interpreter/amresolv.c
@@ -2,12 +2,12 @@
 /******************************************************************************
  *
  * Module Name: amresolv - AML Interpreter object resolution
- *              $Revision: 78 $
+ *              $Revision: 81 $
  *
  *****************************************************************************/
 
 /*
- *  Copyright (C) 2000 R. Byron Moore
+ *  Copyright (C) 2000, 2001 R. Byron Moore
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -118,19 +118,19 @@
 		mask = ACPI_UINT32_MAX;
 	}
 
-	result_desc->number.type = (u8) ACPI_TYPE_NUMBER;
+	result_desc->integer.type = (u8) ACPI_TYPE_INTEGER;
 
 	/* Get the 32 bit value at the location */
 
-	MOVE_UNALIGNED32_TO_32 (&result_desc->number.value, location);
+	MOVE_UNALIGNED32_TO_32 (&result_desc->integer.value, location);
 
 	/*
 	 * Shift the 32-bit word containing the field, and mask off the
 	 * resulting value
 	 */
 
-	result_desc->number.value =
-		(result_desc->number.value >> field_desc->field_unit.bit_offset) & mask;
+	result_desc->integer.value =
+		(result_desc->integer.value >> field_desc->field_unit.bit_offset) & mask;
 
 	/* Release global lock if we acquired it earlier */
 
@@ -150,7 +150,7 @@
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Convert Reference entries on Obj_stack to Rvalues
+ * DESCRIPTION: Convert Reference objects to values
  *
  ******************************************************************************/
 
@@ -279,7 +279,7 @@
 			acpi_cm_remove_reference (stack_desc);
 			*stack_ptr = obj_desc;
 
-			if (ACPI_TYPE_NUMBER == obj_desc->common.type) {
+			if (ACPI_TYPE_INTEGER == obj_desc->common.type) {
 				/* Value is a Number */
 
 			}
@@ -311,7 +311,7 @@
 			acpi_cm_remove_reference (stack_desc);
 			*stack_ptr = obj_desc;
 
-			if (ACPI_TYPE_NUMBER == obj_desc->common.type) {
+			if (ACPI_TYPE_INTEGER == obj_desc->common.type) {
 				/* Value is a Number */
 
 			}
@@ -326,22 +326,22 @@
 
 		case AML_ZERO_OP:
 
-			stack_desc->common.type = (u8) ACPI_TYPE_NUMBER;
-			stack_desc->number.value = 0;
+			stack_desc->common.type = (u8) ACPI_TYPE_INTEGER;
+			stack_desc->integer.value = 0;
 			break;
 
 
 		case AML_ONE_OP:
 
-			stack_desc->common.type = (u8) ACPI_TYPE_NUMBER;
-			stack_desc->number.value = 1;
+			stack_desc->common.type = (u8) ACPI_TYPE_INTEGER;
+			stack_desc->integer.value = 1;
 			break;
 
 
 		case AML_ONES_OP:
 
-			stack_desc->common.type = (u8) ACPI_TYPE_NUMBER;
-			stack_desc->number.value = ACPI_INTEGER_MAX;
+			stack_desc->common.type = (u8) ACPI_TYPE_INTEGER;
+			stack_desc->integer.value = ACPI_INTEGER_MAX;
 
 			/* Truncate value if we are executing from a 32-bit ACPI table */