Changeset 414

Timestamp:

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

Author:

pr

Message:

ACPI sleep mods. from Steven.

Files:

• branches/branch-1-0/include/helpers/acpih.h (modified) (3 diffs)
• branches/branch-1-0/src/helpers/acpih.c (modified) (12 diffs)
• trunk/include/helpers/acpih.h (modified) (3 diffs)
• trunk/src/helpers/acpih.c (modified) (10 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)
         {

trunk/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
@@ -27 +27 @@
 #endif
 
+// @@changed V1.0.9 (2012-02-20) [slevine]: sync with current ACPI toolkit, code by David Azarewicz
+
 #ifndef ACPIH_HEADER_INCLUDED
     #define ACPIH_HEADER_INCLUDED
 
+    #pragma pack(4)
+    #include <acpi.h>
+    #include <acpiapi.h>
+    #pragma pack()
     /*
      * Power state values
      */
 
-    #define ACPI_STATE_UNKNOWN              (UCHAR) 0xFF
-
-    #define ACPI_STATE_S0                   (UCHAR) 0
-    #define ACPI_STATE_S1                   (UCHAR) 1
-    #define ACPI_STATE_S2                   (UCHAR) 2
-    #define ACPI_STATE_S3                   (UCHAR) 3
-    #define ACPI_STATE_S4                   (UCHAR) 4
-    #define ACPI_STATE_S5                   (UCHAR) 5
-    #define ACPI_S_STATES_MAX               ACPI_STATE_S5
-    #define ACPI_S_STATE_COUNT              6
-
-    #pragma pack(1)
-
-    typedef struct _VersionAcpi_
-    {
-        ULONG  Major;
-        ULONG  Minor;
-    } ACPI_VERSION;
-
-    typedef struct _AcpiApiHandle_
-    {
-        HFILE           AcpiDrv;                 // Handle to ACPICA driver
-        ACPI_VERSION    PSD;                     // Version PSD
-        ACPI_VERSION    Driver;                  // Version ACPICA driver
-        ACPI_VERSION    DLL;                     // Version acpi32.dll
-        ULONG           StartAddrPSD;            // Start address PSD (for testcase)
-        ULONG           AddrCommApp;             // Address DosCommApp from PSD (which not write IBM)
-        ULONG           StartAddrDriver;         // Start address ACPICA (for testcase)
-        ULONG           AddrFindPSD;             // Address function for find PSD (find CommApp)
-        ULONG           IRQNumber;               // Number use IRQ
-        void            *Internal;               // For internal DLL use
-    } ACPI_API_HANDLE, *PACPI_API_HANDLE;
-
-    /* ******************************************************************
-     *
-     *   ACPI helper APIs
-     *
-     ********************************************************************/
-
-    #pragma pack()
-
-    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);
+    typedef APIRET APIENTRY ACPITKGETHANDLE(ACPI_HANDLE, ACPI_STRING, ACPI_HANDLE *);
+    typedef APIRET APIENTRY ACPITKOSFREE(PVOID);
+    typedef APIRET APIENTRY ACPITKWALKNAMESPACE(ACPI_OBJECT_TYPE, ACPI_HANDLE, UINT32,ACPI_WALK_CALLBACK, PVOID, void **);
+    typedef APIRET APIENTRY ACPITKEVALUATEOBJECT(ACPI_HANDLE, ACPI_STRING, ACPI_OBJECT_LIST *, ACPI_BUFFER *);
+
     APIRET APIENTRY acpihOpen(ACPI_API_HANDLE *phACPI);
+    typedef APIRET APIENTRY ACPIHOPEN(ACPI_API_HANDLE *);
+    typedef ACPIHOPEN *PACPIHOPEN;
 
     VOID APIENTRY acpihClose(ACPI_API_HANDLE *phACPI);
@@ -93 +68 @@
     APIRET APIENTRY acpihGoToSleep(ACPI_API_HANDLE *phACPI, UCHAR ucState);
 
+    APIRET APIENTRY acpihGetPowerStatus(PAPM, PBOOL);
+    typedef APIRET APIENTRY ACPIHGETPOWERSTATUS(PAPM, PBOOL);
+    typedef ACPIHGETPOWERSTATUS *PACPIHGETPOWERSTATUS;
+
+    BOOL acpihHasBattery(VOID);
+
     #define ORD_ACPISTARTAPI    16
     #define ORD_ACPIENDAPI      17
     #define ORD_ACPIGOTOSLEEP   19
+    #define ORD_ACPITKGETOBJECTINFOALLOC 85
+    #define ORD_ACPITKGETHANDLE 65
+    #define ORD_ACPITKOSFREE 66
+    #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

trunk/src/helpers/acpih.c

@@ -17 +17 @@
 
 /*
- *      Copyright (C) 2006-2009 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 @@
 #include "setup.h"                      // code generation and debugging options
 
+#include "helpers\apmh.h"               // @@added V1.0.9 (2012-02-20) [slevine]
 #include "helpers\acpih.h"
 #include "helpers\standards.h"
@@ -51 +52 @@
 HMODULE       G_hmodACPI = NULLHANDLE;
 ULONG         G_ulCount = 0;
+// @@added V1.0.9 (2012-02-20) [slevine]: additional ACPI support, code from David Azarewicz
+ACPI_HANDLE   G_ahAC = 0;
+#define MAX_BATTERY_COUNT 4
+ACPI_HANDLE   G_ahBat[MAX_BATTERY_COUNT];
+ULONG         G_uiBatteryCount = 0;
+ULONG         G_uiAlreadyWalked = 0;
 
 ACPISTARTAPI  *pAcpiStartApi = NULL;
@@ -56 +63 @@
 ACPIGOTOSLEEP *pAcpiGoToSleep = NULL;
 
+ACPITKGETOBJECTINFOALLOC *pAcpiTkGetObjectInfoAlloc = NULL;
+ACPITKGETHANDLE *pAcpiTkGetHandle = NULL;
+ACPITKOSFREE *pAcpiTkOsFree = NULL;
+ACPITKWALKNAMESPACE *pAcpiTkWalkNamespace = NULL;
+ACPITKEVALUATEOBJECT *pAcpiTkEvaluateObject = NULL;
+// @@added V1.0.9 (2012-12-10) [slevine]: additional ACPI support
+ACPITKPREPARETOSLEEP *pAcpiTkPrepareToSleep = NULL;
+
 /*
  *@@category: Helpers\Control program helpers\ACPI
@@ -71 +86 @@
 
     if (!G_hmodACPI)
+    {
         if (!(arc = DosLoadModule(NULL,
                                   0,
@@ -82 +98 @@
             if (!arc)
                 arc = DosQueryProcAddr(G_hmodACPI,
-                                   ORD_ACPIENDAPI,
-                                   NULL,
-                                   (PFN *) &pAcpiEndApi);
+                                       ORD_ACPIENDAPI,
+                                       NULL,
+                                       (PFN *) &pAcpiEndApi);
 
             if (!arc)
                 arc = DosQueryProcAddr(G_hmodACPI,
-                                   ORD_ACPIGOTOSLEEP,
-                                   NULL,
-                                   (PFN *) &pAcpiGoToSleep);
+                                       ORD_ACPIGOTOSLEEP,
+                                       NULL,
+                                       (PFN *) &pAcpiGoToSleep);
             if (arc)
             {
@@ -100 +116 @@
                 return(arc);
             }
-        }
+
+            // @@added V1.0.9 (2012-02-20) [slevine]: additional ACPI support, code from David Azarewicz
+            DosQueryProcAddr(G_hmodACPI, ORD_ACPITKGETOBJECTINFOALLOC,
+                             NULL, (PFN *) &pAcpiTkGetObjectInfoAlloc);
+            DosQueryProcAddr(G_hmodACPI, ORD_ACPITKGETHANDLE,
+                             NULL, (PFN *) &pAcpiTkGetHandle);
+            DosQueryProcAddr(G_hmodACPI, ORD_ACPITKOSFREE,
+                             NULL, (PFN *) &pAcpiTkOsFree);
+            DosQueryProcAddr(G_hmodACPI, ORD_ACPITKWALKNAMESPACE,
+                             NULL, (PFN *) &pAcpiTkWalkNamespace);
+            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);
+        }
+    }
 
     if (arc)
@@ -107 +139 @@
     {
         G_ulCount++;
+
+        // @@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.
+         */
+        if (pAcpiTkPrepareToSleep)
+            pAcpiTkPrepareToSleep(ACPI_STATE_S5);
+
         return(pAcpiStartApi(phACPI));
     }
@@ -131 +172 @@
         pAcpiEndApi = NULL;
         pAcpiGoToSleep = NULL;
+        // @@added V1.0.9 (2012-12-10) [slevine]: additional ACPI support
+        pAcpiTkPrepareToSleep = NULL;
     }
 }
@@ -147 +190 @@
 }
 
+
+/**
+ *@@ AcpiCallbackWidget:
+ *      ACPI callback helper for battery and power status queries.
+ *      Code provided by David Azarewicz
+ *@@added V1.0.9 (2012-02-20) [slevine]: code from David Azarewicz
+ */
+
+#define AE_DEPTH AE_OK
+
+ACPI_STATUS AcpiCallbackWidget( ACPI_HANDLE ObjHandle, UINT32 NestingLevel, void *Context, void **ReturnValue )
+{
+    ACPI_DEVICE_INFO *pDevInfo = NULL;
+    ACPI_STATUS Status = pAcpiTkGetObjectInfoAlloc(ObjHandle, &pDevInfo);
+
+    if (Status == AE_OK)
+    {
+        if (pDevInfo->Type != ACPI_TYPE_DEVICE)
+            return AE_DEPTH;
+
+        if (!(pDevInfo->Valid & ACPI_VALID_HID))
+            return AE_DEPTH;
+
+        if (!pDevInfo->HardwareId.String)
+            return AE_DEPTH;
+
+        if (strncmp(pDevInfo->HardwareId.String, "ACPI0003", 8) == 0)
+        { /* AC Power */
+            Status = pAcpiTkGetHandle(ObjHandle, "_PSR", &G_ahAC);
+            if (Status)
+                G_ahAC = 0;
+
+            return AE_DEPTH;
+        }
+
+        if (strncmp(pDevInfo->HardwareId.String, "PNP0C0A", 7) == 0)
+        { /* Smart battery */
+            if (G_uiBatteryCount < MAX_BATTERY_COUNT)
+                G_ahBat[G_uiBatteryCount++] = ObjHandle;
+
+            return AE_DEPTH;
+        }
+    }
+
+    if (pDevInfo)
+        pAcpiTkOsFree(pDevInfo);
+
+    return AE_OK;
+}
+
+/**
+ *@@ acpihGetPowerStatus:
+ *      Returns power and battery status in caller provided buffers.
+ *      Returns zero if success, non-zero if fail.
+ *      Code provided by David Azarewicz
+ *@@added V1.0.9 (2012-02-20) [slevine]: code from David Azarewicz
+ */
+
+APIRET acpihGetPowerStatus(PAPM pApm, PBOOL pfChanged)
+{
+    ACPI_STATUS Status;
+    ACPI_BUFFER Result;
+    ACPI_OBJECT *Obj, Object[20];
+    UINT32 uiI;
+    ULONG ulTmp, BRemaining, LastFull;
+    BOOL fChanged;
+
+    /* 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;
+
+    if (!G_uiAlreadyWalked)
+    {
+        Status = pAcpiTkWalkNamespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
+                                      ACPI_UINT32_MAX, AcpiCallbackWidget,
+                                      pApm, NULL);
+        G_uiAlreadyWalked = 1;
+    }
+
+    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)
+    {
+        // Have _PSR
+        Result.Length = sizeof(Object);
+        Result.Pointer = Object;
+        Status = pAcpiTkEvaluateObject(G_ahAC, NULL, NULL, &Result);
+        if (Status != AE_OK)
+            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);
+
+        if (pApm->fUsingAC != (BYTE) ulTmp)
+        {
+            pApm->fUsingAC = (BYTE) ulTmp;
+            fChanged = TRUE;
+        }
+    }
+
+    for (uiI=0; uiI < G_uiBatteryCount; uiI++)
+    {
+        if (G_ahBat[uiI] == 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;
+            continue;
+        }
+
+        Obj = Result.Pointer;
+        Obj = (ACPI_OBJECT *)Obj[0].Package.Elements;   // Battery info package
+        LastFull = (UINT32)OBJ_VALUE(2);
+        if (LastFull == 0xffffffff)
+        {
+            G_ahBat[uiI] = 0;
+            continue;
+        }
+
+        Result.Length = sizeof(Object);
+        Result.Pointer = Object;
+        // Get battery status
+        Status = pAcpiTkEvaluateObject(G_ahBat[uiI], "_BST", NULL, &Result);
+        if (Status != AE_OK)
+        {
+            G_ahBat[uiI] = 0;
+            continue;
+        }
+
+        Obj = Result.Pointer;
+        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 not, it is a percentage
+        if ((UINT32)OBJ_VALUE(0) != 0xffffffff)
+        {
+            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 = (BRemaining*100) / LastFull;
+        if (ulTmp > 100)
+            ulTmp = 100;
+
+        if (pApm->bBatteryLife != ulTmp)
+        {
+            pApm->bBatteryLife = (BYTE) ulTmp;
+            fChanged = TRUE;
+        }
+    }
+
+    if (pfChanged)
+        *pfChanged = fChanged;
+
+    pApm->fAlreadyRead = FALSE;
+    return 0;
+
+#undef OBJECT_VALUE
+#undef OBJ_VALUE
+}
+
+/*
+ *@@ acpihHasBattery:
+ *      quick'n'dirty helper which returns TRUE only
+ *      if ACPI is supported on the system and the
+ *      system actually has a battery (i.e. is a laptop).
+ *      Code provided by David Azarewicz.
+ * @@added V1.0.9 (2012-02-20) [slevine]: code from David Azarewicz
+ */
+BOOL acpihHasBattery(VOID)
+{
+    BOOL brc = FALSE;
+    ACPI_API_HANDLE hACPI;
+    APM Apm;
+
+    if (!acpihOpen(&hACPI))
+    {
+        Apm.bBatteryStatus = 0xff;
+        if (!acpihGetPowerStatus(&Apm, NULL))
+            brc = (Apm.bBatteryStatus != 0xFF);
+
+        acpihClose(&hACPI);
+    }
+
+    return brc;
+}
+