Changeset 414 for branches

Timestamp:

Feb 26, 2013, 3:44:10 AM (12 years ago)

Author:

pr

Message:

ACPI sleep mods. from Steven.

Location:

branches/branch-1-0

Files:

• include/helpers/acpih.h (modified) (3 diffs)
• src/helpers/acpih.c (modified) (12 diffs)

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

@@ -11 +11 @@
  */
 
-/*      Copyright (C) 2006 Paul Ratcliffe.
+/*      Copyright (C) 2006-2013 Paul Ratcliffe.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -40 +40 @@
      */
 
-    APIRET APIENTRY AcpiStartApi(ACPI_API_HANDLE *);
+    // Extracted from acpi.h actype.h etc.
     typedef APIRET APIENTRY ACPISTARTAPI(ACPI_API_HANDLE *);
     typedef ACPISTARTAPI *PACPISTARTAPI;
 
-    APIRET APIENTRY AcpiEndApi(ACPI_API_HANDLE *);
     typedef APIRET APIENTRY ACPIENDAPI(ACPI_API_HANDLE *);
     typedef ACPIENDAPI *PACPIENDAPI;
 
-    APIRET APIENTRY AcpiGoToSleep(ACPI_API_HANDLE *, UCHAR);
     typedef APIRET APIENTRY ACPIGOTOSLEEP(ACPI_API_HANDLE *, UCHAR);
     typedef ACPIGOTOSLEEP *PACPIGOTOSLEEP;
+
+    // @@added V1.0.9 (2012-12-10) [slevine]: sync with current ACPI toolkit
+    typedef ACPI_STATUS APIENTRY ACPITKPREPARETOSLEEP(UINT8);
+    typedef ACPITKPREPARETOSLEEP *PACPITKPREPARETOSLEEP;
 
     typedef APIRET APIENTRY ACPITKGETOBJECTINFOALLOC(ACPI_HANDLE *, PVOID);
@@ -80 +82 @@
     #define ORD_ACPITKWALKNAMESPACE 56
     #define ORD_ACPITKEVALUATEOBJECT 50
+    // @@added V1.0.9 (2012-12-10) [slevine]: sync with current ACPI toolkit
+    #define ORD_ACPITKPREPARETOSLEEP 89
 
 #endif

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

@@ -17 +17 @@
 
 /*
- *      Copyright (C) 2006-2012 Paul Ratcliffe.
+ *      Copyright (C) 2006-2013 Paul Ratcliffe.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -68 +68 @@
 ACPITKWALKNAMESPACE *pAcpiTkWalkNamespace = NULL;
 ACPITKEVALUATEOBJECT *pAcpiTkEvaluateObject = NULL;
+// @@added V1.0.9 (2012-12-10) [slevine]: additional ACPI support
+ACPITKPREPARETOSLEEP *pAcpiTkPrepareToSleep = NULL;
 
 /*
@@ -126 +128 @@
             DosQueryProcAddr(G_hmodACPI, ORD_ACPITKEVALUATEOBJECT,
                              NULL, (PFN *) &pAcpiTkEvaluateObject);
+            // @@added V1.0.9 (2012-12-10) [slevine]: additional ACPI support
+            DosQueryProcAddr(G_hmodACPI, ORD_ACPITKPREPARETOSLEEP,
+                             NULL, (PFN *) &pAcpiTkPrepareToSleep);
         }
     }
@@ -133 +138 @@
     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
+
+        // @@added V1.0.9 (2012-12-10) [slevine]: use AcpiTkPrepareToSleep rather than workaround
+        /* This function does not exist in older versions of acpi
+         * As a result the shutdown attempt will usually hang because
+         * the required code has not been committed into memory.
          */
-        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 */
-        }
+        if (pAcpiTkPrepareToSleep)
+            pAcpiTkPrepareToSleep(ACPI_STATE_S5);
 
         return(pAcpiStartApi(phACPI));
@@ -178 +172 @@
         pAcpiEndApi = NULL;
         pAcpiGoToSleep = NULL;
+        // @@added V1.0.9 (2012-12-10) [slevine]: additional ACPI support
+        pAcpiTkPrepareToSleep = NULL;
     }
 }
@@ -251 +247 @@
  *@@added V1.0.9 (2012-02-20) [slevine]: code from David Azarewicz
  */
+
 APIRET acpihGetPowerStatus(PAPM pApm, PBOOL pfChanged)
 {
@@ -260 +257 @@
     BOOL fChanged;
 
-    if (pAcpiTkWalkNamespace == NULL)
-        return 1;
-
-    if (pApm == NULL)
+    /* Make sure all the functions we need have valid pointers.
+     * @@added V1.0.9 (2012-02-25) [dazarewicz]: additional ACPI support
+     */
+    if (   (pAcpiTkWalkNamespace == NULL)
+        || (pAcpiTkGetObjectInfoAlloc == NULL)
+        || (pAcpiTkGetHandle == NULL)
+        || (pAcpiTkOsFree == NULL)
+        || (pAcpiTkEvaluateObject == NULL)
+        || (pApm == NULL)
+       )
         return 1;
 
@@ -292 +295 @@
         Status = pAcpiTkEvaluateObject(G_ahAC, NULL, NULL, &Result);
         if (Status != AE_OK)
-            ulTmp = 2;
-        else
-            if (Object[0].Type != ACPI_TYPE_INTEGER)
-                ulTmp = 2;
+            ulTmp = 2;                  // assume on backup power
+        else if (Object[0].Type != ACPI_TYPE_INTEGER)
+            ulTmp = 2;                  // assume on backup power
             else
                 ulTmp = (UINT32)OBJECT_VALUE(0);
@@ -313 +315 @@
         Result.Length = sizeof(Object);
         Result.Pointer = Object;
+        // Get battery info
         Status = pAcpiTkEvaluateObject(G_ahBat[uiI], "_BIF", NULL, &Result);
         if (Status != AE_OK)
@@ -321 +324 @@
 
         Obj = Result.Pointer;
-        Obj = (ACPI_OBJECT *)Obj[0].Package.Elements;   // _BIF package
+        Obj = (ACPI_OBJECT *)Obj[0].Package.Elements;   // Battery info package
         LastFull = (UINT32)OBJ_VALUE(2);
         if (LastFull == 0xffffffff)
@@ -331 +334 @@
         Result.Length = sizeof(Object);
         Result.Pointer = Object;
+        // Get battery status
         Status = pAcpiTkEvaluateObject(G_ahBat[uiI], "_BST", NULL, &Result);
         if (Status != AE_OK)
@@ -346 +350 @@
 
         // If battery units are mWh or mAh
+        // If not, it is a percentage
         if ((UINT32)OBJ_VALUE(0) != 0xffffffff)
         {