Replace more ad-hoc versions of acpi_GetReference(). Since the type of

Reference objects changed from ACPI_TYPE_ANY to ACPI_TYPE_LOCAL_REFERENCE
in Oct. 2002, this may help systems where switching the cooler on failed.
We support both types for now until this sorts out.

1 files changed, 3 insertions, 23 deletions

diff --git a/sys/dev/acpica/acpi_powerres.c b/sys/dev/acpica/acpi_powerres.c
index a0d8eb7..7bbcc01 100644
--- a/sys/dev/acpica/acpi_powerres.c
+++ b/sys/dev/acpica/acpi_powerres.c
@@ -488,30 +488,10 @@ acpi_pwr_reference_resource(ACPI_OBJECT *obj, void *arg)
 
     ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
-    /* check the object type */
-    switch (obj->Type) {
-    case ACPI_TYPE_ANY:
-	ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "building reference from %s to %s\n",
-			 acpi_name(pc->ac_consumer),
-			 acpi_name(obj->Reference.Handle)));
-	res = obj->Reference.Handle;
-	break;
-    case ACPI_TYPE_STRING:
-	ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "building reference from %s to %s\n",
-			  acpi_name(pc->ac_consumer), obj->String.Pointer));
-
-	/* Get the handle of the resource */
-	status = AcpiGetHandle(NULL, obj->String.Pointer, &res);
-	if (ACPI_FAILURE(status)) {
-	    ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS,
-			     "couldn't find power resource %s\n", 
-			     obj->String.Pointer));
-	    return_VOID;
-	}
-	break;
-    default:
+    res = acpi_GetReference(NULL, obj);
+    if (res == NULL) {
 	ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS,
-			 "can't create a power reference for object type %d\n", 
+			 "can't create a power reference for object type %d\n",
 			 obj->Type));
 	return_VOID;
     }