Merge branch 'master' of https://github.com/jafd/OS-X-ACPI-Battery-Dr…

…iver
RehabMan · Aug 27, 2017 · 4181a3d · 4181a3d
2 parents 91f259a + 583f1ce
commit 4181a3d
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
-Build
+build/*
+!build/readme.txt
 DerivedData
 Distribute
 ACPIBatteryManager.xcodeproj/project.xcworkspace/xcuserdata

diff --git a/AppleSmartBatteryManager/AppleSmartBattery.cpp b/AppleSmartBatteryManager/AppleSmartBattery.cpp
@@ -356,6 +356,8 @@ bool AppleSmartBattery::start(IOService *provider)
     setProperty( kIOPMPSPostDishargeWaitSecondsKey, kPostDischargeWaitSeconds, NUM_BITS);
 
     // zero out battery state with argument (do_set == true)
+    fStartupFastPoll = 10;
+    fPollingInterval = kQuickPollInterval;
     clearBatteryState(false);
 
     // some DSDT implementations aren't ready to read the EC yet, so avoid false reading
@@ -452,6 +454,16 @@ bool AppleSmartBattery::pollBatteryState(int path)
     fPollTimer->cancelTimeout();
     if (!fPollingOverridden)
     {
+        // at startup, polling is quick for slow to respond ACPI implementations
+        if (fStartupFastPoll)
+        {
+            DebugLog("fStartupFastPoll=%d\n", fStartupFastPoll);
+            --fStartupFastPoll;
+            if (!fStartupFastPoll)
+                fPollingInterval = kDefaultPollInterval;
+        }
+
+        DebugLog("fRealAC=%d, fACConnected=%d\n", fRealAC, fACConnected);
         if (-1 == fRealAC || fRealAC == fACConnected)
         {
             // Restart timer with standard polling interval
@@ -1809,7 +1821,8 @@ IOReturn AppleSmartBattery::setBatteryBST(OSArray *acpibat_bst)
 
 		DebugLog("Battery is charged.\n");
 	}
-
+
+    fStartupFastPoll = 0;
 	if (!fPollingOverridden && fMaxCapacity) {
 		/*
 		 * Conditionally set polling interval to 1 second if we're

diff --git a/AppleSmartBatteryManager/AppleSmartBattery.h b/AppleSmartBatteryManager/AppleSmartBattery.h
@@ -324,7 +324,6 @@ class EXPORT AppleSmartBattery : public IOPMPowerSource
     UInt32 convertWattsToAmps(UInt32 watts, bool useDesignVoltage);
 
 private:
-
 	UInt32   fPowerUnit;
 	UInt32   fDesignVoltage;
 	UInt32   fCurrentVoltage;
@@ -359,6 +358,7 @@ class EXPORT AppleSmartBattery : public IOPMPowerSource
 	UInt32  fManufactureDate;
 
     int fRealAC;
+    int fStartupFastPoll;
 
 public:
 
@@ -370,4 +370,4 @@ class EXPORT AppleSmartBattery : public IOPMPowerSource
 
 };
 
-#endif
+#endif
diff --git a/README.md b/README.md
@@ -83,6 +83,11 @@ http://www.tonymacx86.com/hp-probook/69472-battery-manager-fix-boot-without-batt
 - Fix problem with Activity Monitor "Energy" tab, by changing class names to AppleSmartBatteryManager and AppleSmartBattery
 
 
+2017-04-28 v1.70.3
+
+- Add quick polling for the first 10 seconds of startup for the case the EC/ACPI does not respond correctly at startup.  This quick poll will be cancelled once a battery status is succesfully acquired, or after the 10 seconds.
+
+
 2016-11-18 v1.70.2
 
 - Fix problem where incorrect _BST code returns status of "discharging" when at full charge, AC adapter still plugged in.

diff --git a/SSDT-BATC.dsl b/SSDT-BATC.dsl
@@ -58,12 +58,12 @@ DefinitionBlock ("", "SSDT", 2, "hack", "BATC", 0)
     Scope(_SB.PCI0.LPC.EC)
     {
         External(BAT0, DeviceObj)
-        External(BAT0._HID, StrObj)
+        External(BAT0._HID, IntObj)
         External(BAT0._STA, MethodObj)
         External(BAT0._BIF, MethodObj)
         External(BAT0._BST, MethodObj)
         External(BAT1, DeviceObj)
-        External(BAT1._HID, StrObj)
+        External(BAT1._HID, IntObj)
         External(BAT1._STA, MethodObj)
         External(BAT1._BIF, MethodObj)
         External(BAT1._BST, MethodObj)

diff --git a/build/readme.txt b/build/readme.txt
@@ -0,0 +1 @@
+Locaton for build products