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

• Lines: 76
• Date: Fri Dec 29 14:07:21 2000
• Orig file: v2.4.0-test12/linux/drivers/acpi/common/cmcopy.c
• Orig date: Sun Oct 8 10:50:13 2000

diff -u --recursive --new-file v2.4.0-test12/linux/drivers/acpi/common/cmcopy.c linux/drivers/acpi/common/cmcopy.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: cmcopy - Internal to external object translation utilities
- *              $Revision: 56 $
+ *              $Revision: 61 $
  *
  *****************************************************************************/
 
@@ -63,7 +63,7 @@
  *
  ******************************************************************************/
 
-ACPI_STATUS
+static ACPI_STATUS
 acpi_cm_build_external_simple_object (
 	ACPI_OPERAND_OBJECT     *internal_obj,
 	ACPI_OBJECT             *external_obj,
@@ -102,7 +102,7 @@
 
 	case ACPI_TYPE_STRING:
 
-		length = internal_obj->string.length;
+		length = internal_obj->string.length + 1;
 		external_obj->string.length = internal_obj->string.length;
 		external_obj->string.pointer = (NATIVE_CHAR *) data_space;
 		source_ptr = (u8 *) internal_obj->string.pointer;
@@ -199,7 +199,7 @@
  *
  ******************************************************************************/
 
-ACPI_STATUS
+static ACPI_STATUS
 acpi_cm_build_external_package_object (
 	ACPI_OPERAND_OBJECT     *internal_obj,
 	u8                      *buffer,
@@ -487,6 +487,10 @@
 }
 
 
+#ifdef ACPI_FUTURE_IMPLEMENTATION
+
+/* Code to convert packages that are parameters to control methods */
+
 /******************************************************************************
  *
  * FUNCTION:    Acpi_cm_build_internal_package_object
@@ -506,7 +510,7 @@
  *
  ******************************************************************************/
 
-ACPI_STATUS
+static ACPI_STATUS
 acpi_cm_build_internal_package_object (
 	ACPI_OPERAND_OBJECT     *internal_obj,
 	u8                      *buffer,
@@ -641,6 +645,8 @@
 	}   /* while (1)  */
 }
 
+#endif /* Future implementation */
+
 
 /******************************************************************************
  *
@@ -667,6 +673,10 @@
 		/*
 		 * Package objects contain other objects (which can be objects)
 		 * buildpackage does it all
+		 *
+		 * TBD: Package conversion must be completed and tested
+		 * NOTE: this code converts packages as input parameters to
+		 * control methods only.  This is a very, very rare case.
 		 */
 /*
 		Status = Acpi_cm_build_internal_package_object(Internal_obj,