Changeset 409 for branches/branch-1-0/src/helpers/acpih.c

Timestamp:

Mar 1, 2012, 9:19:16 AM (13 years ago)

Author:

rlw

Message:

fix ACPI crash, improve ACPI code - from Steve Levine

File:

• branches/branch-1-0/src/helpers/acpih.c (modified) (6 diffs)

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

@@ -128 +128 @@
     else
     {
+        char cTmp;                      // Required to ensure code not optimized away
+        ULONG ulMemSize, ulMemFlags;
+
         G_ulCount++;
+        /* Force the shutdown function to be in memory.
+         * This is probably not the best place to do this, but it is the easiest.
+         * The function code may or may not cross page boundary and older versions
+         * of acpi32.dll placed the function as the last function in the DLL,
+         * so we need to check if the page exists before attempting to force it
+         * into memory.
+         * @@added V1.0.9 (2012-02-23) [dazarewicz]: additional ACPI support
+         */
+        cTmp = *((volatile char *)pAcpiGoToSleep); /* Ensure paged in */
+
+        ulMemSize = 1;
+        if (DosQueryMem(((char *)pAcpiGoToSleep) + 4096, &ulMemSize, &ulMemFlags) == NO_ERROR)
+        {
+            if (ulMemFlags & PAG_COMMIT)
+                cTmp = *(((volatile char *)pAcpiGoToSleep) + 4096);     /* Ensure paged in */
+        }
         return(pAcpiStartApi(phACPI));
     }
@@ -244 +263 @@
 #   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)
     {
+        // Have _PSR
         Result.Length = sizeof(Object);
         Result.Pointer = Object;
         Status = pAcpiTkEvaluateObject(G_ahAC, NULL, NULL, &Result);
-        if (Status != AE_OK) ulTmp = 2;
-        if (Object[0].Type != ACPI_TYPE_INTEGER) ulTmp = 2;
-
-        ulTmp = OBJECT_VALUE(0);
-        if (pApm->fUsingAC != ulTmp)
-        {
-            pApm->fUsingAC = ulTmp;
+        if (Status != AE_OK)
+            ulTmp = 2;
+        else if (Object[0].Type != ACPI_TYPE_INTEGER)
+            ulTmp = 2;
+        else
+            ulTmp = (UINT32)OBJECT_VALUE(0);
+        if (pApm->fUsingAC != (BYTE)ulTmp)
+        {
+            pApm->fUsingAC = (BYTE)ulTmp;
             fChanged = TRUE;
         }
@@ -278 +302 @@
 
         Obj = Result.Pointer;
-        Obj = (ACPI_OBJECT *)Obj[0].Package.Elements;
-        LastFull = (UINT32)OBJECT_VALUE(2);
+        Obj = (ACPI_OBJECT *)Obj[0].Package.Elements;   // _BIF package
+        LastFull = (UINT32)OBJ_VALUE(2);
         if (LastFull == 0xffffffff)
         {
@@ -296 +320 @@
 
         Obj = Result.Pointer;
-        Obj = (ACPI_OBJECT *)Obj[0].Package.Elements;
-
-        if (OBJECT_VALUE(2) != 0xffffffff)
-        {
-            BRemaining = (UINT32)OBJECT_VALUE(2);
-        }
-
-        if (OBJECT_VALUE(0) != 0xffffffff)
+        Obj = (ACPI_OBJECT *)Obj[0].Package.Elements;   // Battery status package
+
+        // If voltage known
+        if ((UINT32)OBJ_VALUE(2) != 0xffffffff)
+            BRemaining = (UINT32)OBJ_VALUE(2);
+
+        // If battery units are mWh or mAh
+        if ((UINT32)OBJ_VALUE(0) != 0xffffffff)
         {
             if (BRemaining > (LastFull >> 1)) // > 50% is high. < 50% is low
-            {
                 ulTmp = 1; // High
-            }
             else
-            {
                 ulTmp = 2; // Low
-            }
-
-            if (OBJECT_VALUE(0) & 4)
-            {
+
+            if (OBJ_VALUE(0) & 4)
                 ulTmp = 2; // Critical
-            }
+
             // If battery charging - it can't be critical
-            if (OBJECT_VALUE(0) & 2)
-            {
+            if (OBJ_VALUE(0) & 2)
                 ulTmp = 3; // Charging
-            }
+
             if (pApm->bBatteryStatus != ulTmp)
             {
-                pApm->bBatteryStatus = ulTmp;
+                pApm->bBatteryStatus = (BYTE)ulTmp;
                 fChanged = TRUE;
             }
@@ -334 +352 @@
         if (pApm->bBatteryLife != ulTmp)
         {
-            pApm->bBatteryLife = ulTmp;
+            pApm->bBatteryLife = (BYTE)ulTmp;
             fChanged = TRUE;
         }
@@ -345 +363 @@
 
 #   undef OBJECT_VALUE
+#   undef OBJ_VALUE
 }