Changeset 16637

Timestamp:

03/08/06 01:51:46 (3 years ago)

Author:

bvarner

Message:

* acpi bus_manager addition of get_object() functions.
* thermal driver uses get_object to obtain the passive device package.

Need changes to acpi_object_type to handle references... that'll have to come in the near future.

Location:

haiku/trunk

Files:

• headers/os/drivers/ACPI.h (modified) (1 diff)
• src/add-ons/kernel/bus_managers/acpi/acpi_busman.c (modified) (3 diffs)
• src/add-ons/kernel/drivers/power/acpi_thermal/acpi_thermal.c (modified) (6 diffs)
• src/add-ons/kernel/drivers/power/acpi_thermal/acpi_thermal.h (modified) (1 diff)

haiku/trunk/headers/os/drivers/ACPI.h

@@ -35 +35 @@
         status_t                        (*get_device_hid) (const char *path, char *hid);
         uint32                          (*get_object_type) (const char *path);
+        status_t                        (*get_object) (const char *path, acpi_object_type **return_value);
+        status_t                        (*get_object_typed) (const char *path, acpi_object_type **return_value, uint32 object_type);
         
         /* Control method execution and data acquisition */

haiku/trunk/src/add-ons/kernel/bus_managers/acpi/acpi_busman.c

@@ -24 +24 @@
 
 status_t get_device_hid (const char *path, char *hid);
+status_t get_object(const char *path, acpi_object_type **return_value);
+status_t get_object_typed(const char *path, acpi_object_type **return_value, uint32 object_type);
 uint32 get_object_type (const char *path);
 
@@ -51 +53 @@
         get_device,
         get_device_hid,
+        get_object,
+        get_object_typed,
         get_object_type,
         evaluate_object,
@@ -252 +256 @@
 }
 
+status_t get_object (const char *path, acpi_object_type **return_value) {
+        ACPI_HANDLE handle;
+        ACPI_BUFFER buffer;
+        ACPI_STATUS status;
+        
+        status = AcpiGetHandle(NULL, path, &handle);
+        if (status != AE_OK) {
+                return B_ENTRY_NOT_FOUND;
+        }
+        buffer.Pointer = NULL;
+        buffer.Length = ACPI_ALLOCATE_BUFFER;
+        
+        status = AcpiEvaluateObject(handle, NULL, NULL, &buffer);
+        
+        *return_value = buffer.Pointer;
+        return (status == AE_OK) ? B_OK : B_ERROR;
+}
+
+status_t get_object_typed (const char *path, acpi_object_type **return_value, uint32 object_type) {
+        ACPI_HANDLE handle;
+        ACPI_BUFFER buffer;
+        ACPI_STATUS status;
+        
+        status = AcpiGetHandle(NULL, path, &handle);
+        if (status != AE_OK) {
+                return B_ENTRY_NOT_FOUND;
+        }
+        buffer.Pointer = NULL;
+        buffer.Length = ACPI_ALLOCATE_BUFFER;
+        
+        status = AcpiEvaluateObjectTyped(handle, NULL, NULL, &buffer, object_type);
+        
+        *return_value = buffer.Pointer;
+        return (status == AE_OK) ? B_OK : B_ERROR;
+}
+
 status_t evaluate_object (const char *object, acpi_object_type *return_value, size_t buf_len) {
         ACPI_BUFFER buffer;

haiku/trunk/src/add-ons/kernel/drivers/power/acpi_thermal/acpi_thermal.c

@@ -37 +37 @@
                                 td->open = 0;
                                 td->num = device_count;
+                                
                                 dprintf("acpi_thermal: Adding thermal device from: %s\n", result);
                                 td->path = malloc(sizeof(char) * strlen(result) + 1);
@@ -140 +141 @@
 acpi_thermal_read (void* cookie, off_t position, void *buf, size_t* num_bytes)
 {
+        int i;
         acpi_thermal_type therm_info;
         if (*num_bytes < 1)
@@ -150 +152 @@
                 *num_bytes = strlen((char *)buf);
         
-                sprintf((char *)buf + *num_bytes, "  Critical Temperature: %lu.%lu K\n", (therm_info.critical_temp / 10), (therm_info.critical_temp % 10));
+                sprintf((char *)buf + *num_bytes, "  Critical Temperature: %lu.%lu K\n", 
+                                (therm_info.critical_temp / 10), (therm_info.critical_temp % 10));
                 *num_bytes = strlen((char *)buf);
                 
-                sprintf((char *)buf + *num_bytes, "  Current Temperature: %lu.%lu K\n", (therm_info.current_temp / 10), (therm_info.current_temp % 10));
+                sprintf((char *)buf + *num_bytes, "  Current Temperature: %lu.%lu K\n", 
+                                (therm_info.current_temp / 10), (therm_info.current_temp % 10));
                 *num_bytes = strlen((char *)buf);
         
                 if (therm_info.hot_temp > 0) {
-                        sprintf((char *)buf, "Hot Temperature: %lu.%lu K\n", (therm_info.hot_temp / 10), (therm_info.hot_temp % 10));
+                        sprintf((char *)buf + *num_bytes, "  Hot Temperature: %lu.%lu K\n", 
+                                        (therm_info.hot_temp / 10), (therm_info.hot_temp % 10));
                         *num_bytes = strlen((char *)buf);
+                }
+
+                if (therm_info.passive_package) {
+/* Incomplete. 
+     Needs to obtain acpi global lock.
+     acpi_object_type needs Reference entry (with Handle that can be resolved)
+     what you see here is _highly_ unreliable.
+*/
+/*                      if (therm_info.passive_package->data.package.count > 0) {
+                                sprintf((char *)buf + *num_bytes, "  Passive Devices\n");
+                                *num_bytes = strlen((char *)buf);
+                                for (i = 0; i < therm_info.passive_package->data.package.count; i++) {
+                                        sprintf((char *)buf + *num_bytes, "    Processor: %lu\n", therm_info.passive_package->data.package.objects[i].data.processor.cpu_id);
+                                        *num_bytes = strlen((char *)buf);
+                                }
+                        }
+*/
+                        free(therm_info.passive_package);
                 }
         } else {
@@ -179 +202 @@
         
         thermal_dev *td = (thermal_dev *)cookie;
+        char objname[255];
         acpi_thermal_type *att = NULL;
         
+        size_t bufsize = sizeof(acpi_object_type);
         acpi_object_type buf;
-        size_t bufsize = sizeof(buf);
-
+        
         switch (op) {
                 case drvOpGetThermalType: {
@@ -189 +213 @@
                         att = (acpi_thermal_type *)arg;
                         
+                        // Read basic temperature thresholds.
                         att->devnum = td->num;
                         err = acpi->evaluate_method(td->path, "_CRT", &buf, bufsize, NULL, 0);
@@ -202 +227 @@
                         dprintf("acpi_thermal: GotBasicTemperatures()\n");
                         
-                        // TODO: Fill this out
-                        att->passive_count = 0;
+                        // Read Passive Cooling devices
                         att->passive_package = NULL;
+                        sprintf(objname, "%s._PSL", td->path);
+                        err = acpi->get_object(objname, &(att->passive_package));
                         
                         att->active_count = 0;

haiku/trunk/src/add-ons/kernel/drivers/power/acpi_thermal/acpi_thermal.h

@@ -27 +27 @@
         uint32 hot_temp;
         
-        /* List of acpi_objects_types assigned to the passive device list */
-        uint32 passive_count;
+        /* acpi_objects_type evaluated from _PSL 
+           if != NULL, client must free()
+        */
         acpi_object_type *passive_package;