patch-2.4.0-test9 linux/drivers/acpi/common/cmcopy.c

• Lines: 228
• Date: Fri Sep 15 14:30:29 2000
• Orig file: v2.4.0-test8/linux/drivers/acpi/common/cmcopy.c
• Orig date: Wed Jul 5 11:23:12 2000

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/acpi/common/cmcopy.c linux/drivers/acpi/common/cmcopy.c
@@ -1,6 +1,7 @@
 /******************************************************************************
  *
  * Module Name: cmcopy - Internal to external object translation utilities
+ *              $Revision: 56 $
  *
  *****************************************************************************/
 
@@ -24,17 +25,17 @@
 
 
 #include "acpi.h"
-#include "interp.h"
-#include "namesp.h"
+#include "acinterp.h"
+#include "acnamesp.h"
 
 
 #define _COMPONENT          MISCELLANEOUS
-	 MODULE_NAME         ("cmcopy");
+	 MODULE_NAME         ("cmcopy")
 
 
 typedef struct search_st
 {
-	ACPI_OBJECT_INTERNAL        *internal_obj;
+	ACPI_OPERAND_OBJECT         *internal_obj;
 	u32                         index;
 	ACPI_OBJECT                 *external_obj;
 
@@ -64,13 +65,13 @@
 
 ACPI_STATUS
 acpi_cm_build_external_simple_object (
-	ACPI_OBJECT_INTERNAL    *internal_obj,
+	ACPI_OPERAND_OBJECT     *internal_obj,
 	ACPI_OBJECT             *external_obj,
 	u8                      *data_space,
 	u32                     *buffer_space_used)
 {
 	u32                     length = 0;
-	char                    *source_ptr = NULL;
+	u8                      *source_ptr = NULL;
 
 
 	/*
@@ -103,8 +104,8 @@
 
 		length = internal_obj->string.length;
 		external_obj->string.length = internal_obj->string.length;
-		external_obj->string.pointer = (char *) data_space;
-		source_ptr = internal_obj->string.pointer;
+		external_obj->string.pointer = (NATIVE_CHAR *) data_space;
+		source_ptr = (u8 *) internal_obj->string.pointer;
 		break;
 
 
@@ -113,7 +114,7 @@
 		length = internal_obj->buffer.length;
 		external_obj->buffer.length = internal_obj->buffer.length;
 		external_obj->buffer.pointer = data_space;
-		source_ptr = (char *) internal_obj->buffer.pointer;
+		source_ptr = (u8 *) internal_obj->buffer.pointer;
 		break;
 
 
@@ -132,7 +133,7 @@
 		 */
 
 		external_obj->type = ACPI_TYPE_ANY;
-		external_obj->reference.handle = internal_obj->reference.nte;
+		external_obj->reference.handle = internal_obj->reference.node;
 		break;
 
 
@@ -142,10 +143,10 @@
 				 internal_obj->processor.proc_id;
 
 		external_obj->processor.pblk_address =
-				 internal_obj->processor.pblk_address;
+				 internal_obj->processor.address;
 
 		external_obj->processor.pblk_length =
-				 internal_obj->processor.pblk_length;
+				 internal_obj->processor.length;
 		break;
 
 	case ACPI_TYPE_POWER:
@@ -200,7 +201,7 @@
 
 ACPI_STATUS
 acpi_cm_build_external_package_object (
-	ACPI_OBJECT_INTERNAL    *internal_obj,
+	ACPI_OPERAND_OBJECT     *internal_obj,
 	u8                      *buffer,
 	u32                     *space_used)
 {
@@ -211,7 +212,7 @@
 	u32                     length = 0;
 	u32                     this_index;
 	u32                     object_space;
-	ACPI_OBJECT_INTERNAL    *this_internal_obj;
+	ACPI_OPERAND_OBJECT     *this_internal_obj;
 	ACPI_OBJECT             *this_external_obj;
 	PKG_SEARCH_INFO         *level_ptr;
 
@@ -256,7 +257,7 @@
 	while (1) {
 		this_index      = level_ptr->index;
 		this_internal_obj =
-				(ACPI_OBJECT_INTERNAL *)
+				(ACPI_OPERAND_OBJECT  *)
 				level_ptr->internal_obj->package.elements[this_index];
 		this_external_obj =
 				(ACPI_OBJECT *)
@@ -264,10 +265,11 @@
 
 
 		/*
-		 * Check for 1) Null object -- OK, this can happen if package
+		 * Check for
+		 * 1) Null object -- OK, this can happen if package
 		 *              element is never initialized
-		 *           2) Not an internal object - can be an NTE instead
-		 *           3) Any internal object other than a package.
+		 * 2) Not an internal object - can be Node instead
+		 * 3) Any internal object other than a package.
 		 *
 		 * The more complex package case is handled later
 		 */
@@ -367,8 +369,6 @@
 			level_ptr->index        = 0;
 		}
 	}
-
-	return (AE_OK);
 }
 
 
@@ -388,7 +388,7 @@
 
 ACPI_STATUS
 acpi_cm_build_external_object (
-	ACPI_OBJECT_INTERNAL    *internal_obj,
+	ACPI_OPERAND_OBJECT     *internal_obj,
 	ACPI_BUFFER             *ret_buffer)
 {
 	ACPI_STATUS             status;
@@ -446,7 +446,7 @@
 ACPI_STATUS
 acpi_cm_build_internal_simple_object (
 	ACPI_OBJECT             *external_obj,
-	ACPI_OBJECT_INTERNAL    *internal_obj)
+	ACPI_OPERAND_OBJECT     *internal_obj)
 {
 
 
@@ -508,18 +508,17 @@
 
 ACPI_STATUS
 acpi_cm_build_internal_package_object (
-	ACPI_OBJECT_INTERNAL    *internal_obj,
+	ACPI_OPERAND_OBJECT     *internal_obj,
 	u8                      *buffer,
 	u32                     *space_used)
 {
 	u8                      *free_space;
 	ACPI_OBJECT             *external_obj;
 	u32                     current_depth = 0;
-	ACPI_STATUS             status = AE_OK;
 	u32                     length = 0;
 	u32                     this_index;
 	u32                     object_space = 0;
-	ACPI_OBJECT_INTERNAL    *this_internal_obj;
+	ACPI_OPERAND_OBJECT     *this_internal_obj;
 	ACPI_OBJECT             *this_external_obj;
 	PKG_SEARCH_INFO         *level_ptr;
 
@@ -562,7 +561,7 @@
 	while (1) {
 		this_index      = level_ptr->index;
 
-		this_internal_obj = (ACPI_OBJECT_INTERNAL *)
+		this_internal_obj = (ACPI_OPERAND_OBJECT *)
 				 &level_ptr->internal_obj->package.elements[this_index];
 
 		this_external_obj = (ACPI_OBJECT *)
@@ -605,17 +604,6 @@
 		}   /* if object is a package */
 
 		else {
-/*            Status = Acpi_cm_build_simple_object(This_internal_obj,
-				 This_external_obj, Free_space,
-				 &Object_space);
-*/
-			if (status != AE_OK) {
-				/*
-				 * Failure get out
-				 */
-				return (status);
-			}
-
 			free_space  += object_space;
 			length      += object_space;
 
@@ -651,13 +639,6 @@
 			}
 		}   /* else object is NOT a package */
 	}   /* while (1)  */
-
-
-	/*
-	 * We'll never get here, but the compiler whines about
-	 * return value
-	 */
-	return (AE_OK);
 }
 
 
@@ -677,7 +658,7 @@
 ACPI_STATUS
 acpi_cm_build_internal_object (
 	ACPI_OBJECT             *external_obj,
-	ACPI_OBJECT_INTERNAL    *internal_obj)
+	ACPI_OPERAND_OBJECT     *internal_obj)
 {
 	ACPI_STATUS             status;