Changeset 410

Timestamp:

Mar 1, 2012, 8:47:20 PM (13 years ago)

Author:

pr

Message:

Fix formatting.

File:

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

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

@@ -17 +17 @@
 
 /*
- *      Copyright (C) 2006-2009 Paul Ratcliffe.
+ *      Copyright (C) 2006-2012 Paul Ratcliffe.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -96 +96 @@
             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)
             {
@@ -116 +116 @@
 
             // @@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);
+            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);
         }
     }
@@ -148 +153 @@
                 cTmp = *(((volatile char *)pAcpiGoToSleep) + 4096);     /* Ensure paged in */
         }
+
         return(pAcpiStartApi(phACPI));
     }
@@ -200 +206 @@
 ACPI_STATUS AcpiCallbackWidget( ACPI_HANDLE ObjHandle, UINT32 NestingLevel, void *Context, void **ReturnValue )
 {
-    ACPI_STATUS Status;
-    ACPI_DEVICE_INFO *pDevInfo;
-
-    pDevInfo = NULL;
-    Status = pAcpiTkGetObjectInfoAlloc( ObjHandle, &pDevInfo );
+    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)
+        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;
+            if (Status)
+                G_ahAC = 0;
+
             return AE_DEPTH;
         }
 
-        if (strncmp(pDevInfo->HardwareId.String, "PNP0C0A", 7)==0)
+        if (strncmp(pDevInfo->HardwareId.String, "PNP0C0A", 7) == 0)
         { /* Smart battery */
-            if (G_uiBatteryCount >= MAX_BATTERY_COUNT) return AE_DEPTH;
-            G_ahBat[G_uiBatteryCount] = ObjHandle;
-            G_uiBatteryCount++;
+            if (G_uiBatteryCount < MAX_BATTERY_COUNT)
+                G_ahBat[G_uiBatteryCount++] = ObjHandle;
+
             return AE_DEPTH;
         }
     }
 
-    if (pDevInfo) pAcpiTkOsFree(pDevInfo);
+    if (pDevInfo)
+        pAcpiTkOsFree(pDevInfo);
 
     return AE_OK;
@@ -249 +260 @@
     BOOL fChanged;
 
-    if (pAcpiTkWalkNamespace==NULL) return 1;
-    if (pApm==NULL) return 1;
+    if (pAcpiTkWalkNamespace == NULL)
+        return 1;
+
+    if (pApm == NULL)
+        return 1;
 
     if (!G_uiAlreadyWalked)
     {
-        Status = pAcpiTkWalkNamespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX, AcpiCallbackWidget, pApm, NULL);
+        Status = pAcpiTkWalkNamespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
+                                      ACPI_UINT32_MAX, AcpiCallbackWidget,
+                                      pApm, NULL);
         G_uiAlreadyWalked = 1;
     }
@@ -261 +277 @@
 
     // 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
+#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)
@@ -277 +293 @@
         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;
+            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;
         }
     }
 
-    for (uiI=0; uiI<G_uiBatteryCount; uiI++)
-    {
-        if (G_ahBat[uiI] == 0) continue;
+    for (uiI=0; uiI < G_uiBatteryCount; uiI++)
+    {
+        if (G_ahBat[uiI] == 0)
+            continue;
 
         Result.Length = sizeof(Object);
@@ -348 +367 @@
         }
 
-        ulTmp = (BRemaining*100)/LastFull;
-        if (ulTmp > 100) ulTmp = 100;
+        ulTmp = (BRemaining*100) / LastFull;
+        if (ulTmp > 100)
+            ulTmp = 100;
+
         if (pApm->bBatteryLife != ulTmp)
         {
-            pApm->bBatteryLife = (BYTE)ulTmp;
+            pApm->bBatteryLife = (BYTE) ulTmp;
             fChanged = TRUE;
         }
     }
 
-    if (pfChanged) *pfChanged = fChanged;
+    if (pfChanged)
+        *pfChanged = fChanged;
+
     pApm->fAlreadyRead = FALSE;
-
     return 0;
 
-#   undef OBJECT_VALUE
-#   undef OBJ_VALUE
+#undef OBJECT_VALUE
+#undef OBJ_VALUE
 }
 
@@ -383 +405 @@
     {
         Apm.bBatteryStatus = 0xff;
-        if (!acpihGetPowerStatus(&Apm, NULL)) brc = (Apm.bBatteryStatus != 0xFF);
+        if (!acpihGetPowerStatus(&Apm, NULL))
+            brc = (Apm.bBatteryStatus != 0xFF);
+
         acpihClose(&hACPI);
     }
@@ -389 +413 @@
     return brc;
 }
+