Changeset 443

Timestamp:

Feb 20, 2019, 7:55:27 AM (6 years ago)

Author:

rlwalsh

Message:

acpih: add CPU temperature support; update battery support
patch from David Azarewicz

Location:

branches/branch-1-0

Files:

• include/helpers/acpih.h (modified) (2 diffs)
• src/helpers/acpih.c (modified) (9 diffs)

branches/branch-1-0/include/helpers/acpih.h

@@ -66 +66 @@
 
     VOID APIENTRY acpihClose(ACPI_API_HANDLE *phACPI);
+    typedef APIRET APIENTRY ACPIHCLOSE(ACPI_API_HANDLE *phACPI);
+    typedef ACPIHCLOSE *PACPIHCLOSE;
 
     //@added V1.0.10 (2014-08-30) [dazarewicz]
@@ -74 +76 @@
     typedef APIRET APIENTRY ACPIHGETPOWERSTATUS(PAPM, PBOOL);
     typedef ACPIHGETPOWERSTATUS *PACPIHGETPOWERSTATUS;
+
+    ULONG APIENTRY acpihGetCpuTemp(ACPI_API_HANDLE *phACPI);
+    typedef ULONG APIENTRY ACPIHGETCPUTEMP(ACPI_API_HANDLE *phACPI);
+    typedef ACPIHGETCPUTEMP *PACPIHGETCPUTEMP;
 
     BOOL acpihHasBattery(VOID);

branches/branch-1-0/src/helpers/acpih.c

@@ -54 +54 @@
 // @@added V1.0.9 (2012-02-20) [slevine]: additional ACPI support, code from David Azarewicz
 ACPI_HANDLE   G_ahAC = 0;
+ACPI_HANDLE   G_ahTemp = 0;
+ULONG         G_uiTempWalked = 0;
 #define MAX_BATTERY_COUNT 4
-ACPI_HANDLE   G_ahBat[MAX_BATTERY_COUNT];
+struct _gahbat_ {
+    ACPI_HANDLE ahBat;
+    ULONG ulLastFull;
+} G_Bat[MAX_BATTERY_COUNT];
 ULONG         G_uiBatteryCount = 0;
 ULONG         G_uiAlreadyWalked = 0;
@@ -202 +207 @@
 }
 
+    // VAC 3.08 long long compatibility support
+#ifdef INCL_LONGLONG // VAC 3.6.5 - compiler supports long long
+#define OBJECT_VALUE(index)  (Object[index].Integer.Value)
+#define OBJ_VALUE(index)  (pObj[index].Integer.Value)
+#else // VAC 3.08 - compiler does not support long long
+#define OBJECT_VALUE(index)  (Object[index].Integer.Value.ulLo)
+#define OBJ_VALUE(index)  (pObj[index].Integer.Value.ulLo)
+#endif
 
 /**
@@ -214 +227 @@
 {
     ACPI_DEVICE_INFO *pDevInfo = NULL;
+    ACPI_BUFFER Buffer;
+    ACPI_OBJECT *pObj, Object[25];
 
     if (pAcpiTkGetObjectInfoAlloc( ObjHandle, &pDevInfo ) != AE_OK)
@@ -240 +255 @@
         { /* Smart battery */
             if (G_uiBatteryCount < MAX_BATTERY_COUNT)
-                G_ahBat[G_uiBatteryCount++] = ObjHandle;
+            {
+                G_Bat[G_uiBatteryCount].ahBat = ObjHandle;
+                G_Bat[G_uiBatteryCount].ulLastFull = 0xffffffff;
+
+                /* Get static battery inFormation */
+                Buffer.Length = sizeof(Object);
+                Buffer.Pointer = Object;
+                if (pAcpiTkEvaluateObject(ObjHandle, "_BIX", NULL, &Buffer) == AE_OK)
+                {
+                    pObj = Buffer.Pointer;
+                    pObj = (ACPI_OBJECT *)pObj[0].Package.Elements;
+                    G_Bat[G_uiBatteryCount].ulLastFull = (UINT32)OBJ_VALUE(3);
+                }
+                else
+                {
+                    Buffer.Length = sizeof(Object);
+                    Buffer.Pointer = Object;
+                    if (pAcpiTkEvaluateObject(ObjHandle, "_BIF", NULL, &Buffer) == AE_OK)
+                    {
+                        pObj = Buffer.Pointer;
+                        pObj = (ACPI_OBJECT *)pObj[0].Package.Elements;
+                        G_Bat[G_uiBatteryCount].ulLastFull = (UINT32)OBJ_VALUE(2);
+                    }
+                }
+
+                G_uiBatteryCount++;
+            }
 
             break;
@@ -265 +306 @@
     ACPI_STATUS Status;
     ACPI_BUFFER Result;
-    ACPI_OBJECT *Obj, Object[20];
+    ACPI_OBJECT *pObj, Object[20];
     UINT32 uiI;
-    ULONG ulTmp, BRemaining, LastFull;
+    ULONG ulTmp, BRemaining;
     BOOL fChanged;
 
@@ -292 +333 @@
     fChanged = FALSE;
 
-    // VAC 3.08 long long compatibility support
-#ifdef INCL_LONGLONG // VAC 3.6.5 - compiler supports long long
-#define OBJECT_VALUE(index)  (Object[index].Integer.Value)
-#define OBJ_VALUE(index)  (Obj[index].Integer.Value)
-#else // VAC 3.08 - compiler does not support long long
-#define OBJECT_VALUE(index)  (Object[index].Integer.Value.ulLo)
-#define OBJ_VALUE(index)  (Obj[index].Integer.Value.ulLo)
-#endif
-
     if (G_ahAC)
     {
@@ -323 +355 @@
     for (uiI=0; uiI < G_uiBatteryCount; uiI++)
     {
-        if (G_ahBat[uiI] == 0)
+        if (G_Bat[uiI].ahBat == 0)
             continue;
-
-        Result.Length = sizeof(Object);
-        Result.Pointer = Object;
-        // Get battery info
-        Status = pAcpiTkEvaluateObject(G_ahBat[uiI], "_BIF", NULL, &Result);
-        if (Status != AE_OK)
-        {
-            G_ahBat[uiI] = 0;
+        if (G_Bat[uiI].ulLastFull == 0xffffffff)
             continue;
-        }
-
-        Obj = Result.Pointer;
-        Obj = (ACPI_OBJECT *)Obj[0].Package.Elements;   // Battery info package
-        LastFull = (UINT32)OBJ_VALUE(2);
 
         Result.Length = sizeof(Object);
         Result.Pointer = Object;
         // Get battery status
-        Status = pAcpiTkEvaluateObject(G_ahBat[uiI], "_BST", NULL, &Result);
+        Status = pAcpiTkEvaluateObject(G_Bat[uiI].ahBat, "_BST", NULL, &Result);
         if (Status != AE_OK)
         {
-            G_ahBat[uiI] = 0;
+            G_Bat[uiI].ahBat = 0;
             continue;
         }
 
-        Obj = Result.Pointer;
-        Obj = (ACPI_OBJECT *)Obj[0].Package.Elements;   // Battery status package
+        pObj = Result.Pointer;
+        pObj = (ACPI_OBJECT *)pObj[0].Package.Elements;   // Battery status package
         BRemaining = (UINT32)OBJ_VALUE(2);
 
         // If battery units are mWh or mAh
         // If not, it is a percentage
-        if (    (LastFull != 0xffffffff)
-             && (BRemaining != 0xffffffff)
-           )
+        if (BRemaining == 0xffffffff)
+            continue;
+
+        if (BRemaining > (G_Bat[uiI].ulLastFull >> 1)) // > 50% is high. < 50% is low
+            ulTmp = 1; // High
+        else
+            ulTmp = 2; // Low
+
+        if (OBJ_VALUE(0) & 4)
+            ulTmp = 2; // Critical
+
+        // If battery charging - it can't be critical
+        if (OBJ_VALUE(0) & 2)
+            ulTmp = 3; // Charging
+
+        if (pApm->bBatteryStatus != ulTmp)
         {
-            if (BRemaining > (LastFull >> 1)) // > 50% is high. < 50% is low
-                ulTmp = 1; // High
-            else
-                ulTmp = 2; // Low
-
-            if (OBJ_VALUE(0) & 4)
-                ulTmp = 2; // Critical
-
-            // If battery charging - it can't be critical
-            if (OBJ_VALUE(0) & 2)
-                ulTmp = 3; // Charging
-
-            if (pApm->bBatteryStatus != ulTmp)
-            {
-                pApm->bBatteryStatus = (BYTE)ulTmp;
-                fChanged = TRUE;
-            }
-
-            ulTmp = 0;
-            if (LastFull)
-                ulTmp = (BRemaining*100) / LastFull;
-            if (ulTmp > 100)
-                ulTmp = 100;
-
-            if (pApm->bBatteryLife != ulTmp)
-            {
-                pApm->bBatteryLife = (BYTE) ulTmp;
-                fChanged = TRUE;
-            }
+            pApm->bBatteryStatus = (BYTE)ulTmp;
+            fChanged = TRUE;
+        }
+
+        ulTmp = 0;
+        if (G_Bat[uiI].ulLastFull)
+            ulTmp = (BRemaining*100) / G_Bat[uiI].ulLastFull;
+        if (ulTmp > 100)
+            ulTmp = 100;
+
+        if (pApm->bBatteryLife != ulTmp)
+        {
+            pApm->bBatteryLife = (BYTE) ulTmp;
+            fChanged = TRUE;
         }
     }
@@ -397 +415 @@
     pApm->fAlreadyRead = FALSE;
     return 0;
+}
 
 #undef OBJECT_VALUE
 #undef OBJ_VALUE
-}
 
 /*
@@ -428 +446 @@
 }
 
+/**
+ *@@ AcpiCallbackTemperature:
+ *      ACPI callback helper for CPU Temperature
+ *      Code provided by David Azarewicz
+ */
+
+ACPI_STATUS APIENTRY AcpiCallbackTemperature( ACPI_HANDLE ObjHandle, UINT32 NestingLevel, void *Context, void **ReturnValue )
+{
+    if (G_ahTemp)
+        return AE_OK;
+
+    if (pAcpiTkGetHandle(ObjHandle, "_TMP", &G_ahTemp))
+        G_ahTemp = 0;
+
+    return AE_OK;
+}
+
+/*
+ *@@ acpihGetCpuTemp:
+ *      Code provided by David Azarewicz.
+ */
+ULONG acpihGetCpuTemp(ACPI_API_HANDLE *phACPI)
+{
+    ACPI_STATUS Status;
+    ACPI_BUFFER Result;
+    ACPI_OBJECT Object;
+    ULONG ulTemp = 0;
+
+    /* Make sure all the functions we need have valid pointers. */
+    if (   (pAcpiTkWalkNamespace == NULL)
+        || (pAcpiTkGetHandle == NULL)
+        || (pAcpiTkEvaluateObject == NULL)
+       )
+        return 1;
+
+    if (!G_uiTempWalked)
+    {
+        Status = pAcpiTkWalkNamespace(ACPI_TYPE_THERMAL, ACPI_ROOT_OBJECT,
+                                      ACPI_UINT32_MAX, AcpiCallbackTemperature,
+                                      NULL, NULL);
+        G_uiTempWalked = 1;
+    }
+
+    if (G_ahTemp)
+    {
+        Result.Length = sizeof(Object);
+        Result.Pointer = &Object;
+        Status = pAcpiTkEvaluateObject(G_ahTemp, NULL, NULL, &Result);
+        if (Status == AE_OK)
+            ulTemp = (Object.Integer.Value - 2732) / 10;
+    }
+
+    return ulTemp;
+}
+