Check both PS2 and SMBus power states

Author: averycblack

VoodooRMI/Transports/SMBus/RMISMBus.cpp

@@ -58,12 +58,14 @@ bool RMISMBus::start(IOService *provider)
     IOService *ps2 = OSDynamicCast(IOService, device_nub->getProperty("PS/2 Parent"));
     if (ps2) {
         (void) ps2->registerInterestedDriver(this);
-    } else {
-        PMinit();
-        device_nub->joinPMtree(this);
-        registerPowerDriver(this, RMIPowerStates, 2);
+        ps2PowerDriver = true;
     }
 
+    // Receive power notifications for sleep/wake
+    PMinit();
+    device_nub->joinPMtree(this);
+    registerPowerDriver(this, RMIPowerStates, 2);
+    
     setProperty(RMIBusSupported, kOSBooleanTrue);
     registerService(kIOServiceAsynchronous);
     return true;
@@ -279,9 +281,36 @@ IOReturn RMISMBus::setPowerState(unsigned long whichState, IOService* whatDevice
     if (whatDevice != this)
         return kIOPMAckImplied;
 
-    if (whichState == RMI_POWER_OFF) {
-        messageClient(kIOMessageRMI4Sleep, bus);
+    IOLogInfo("Received SMBus Power State Change: 0x%lx", whichState);
+    smbusAwake = whichState == RMI_POWER_ON;
+    return processPowerState(whichState);
+}
+
+IOReturn RMISMBus::powerStateDidChangeTo(IOPMPowerFlags capabilities, unsigned long stateNumber, IOService *whatDevice) {
+    unsigned long newState;
+    
+    IOLogInfo("Received PS2 Power State Change: 0x%lx", capabilities);
+    ps2Awake = capabilities & kIOPMDeviceUsable;
+    if (capabilities & kIOPMDeviceUsable) {
+        newState = RMI_POWER_ON;
     } else {
+        newState = RMI_POWER_OFF;
+    }
+    
+    return processPowerState(newState);
+}
+
+IOReturn RMISMBus::processPowerState(unsigned long whichState) {
+    if (ps2PowerDriver && ps2Awake != smbusAwake) {
+        IOLogDebug("PS2 Power State (%b) != SMB Power State (%b) - Waiting!",
+                   ps2Awake, smbusAwake);
+        return kIOPMAckImplied;
+    }
+    
+    if (whichState == RMI_POWER_OFF && vrmiAwake) {
+        messageClient(kIOMessageRMI4Sleep, bus);
+        vrmiAwake = false;
+    } else if (whichState == RMI_POWER_ON && !vrmiAwake) {
         // Put trackpad in SMBus mode again
         int retval = reset();
         if (retval < 0) {
@@ -295,21 +324,11 @@ IOReturn RMISMBus::setPowerState(unsigned long whichState, IOService* whatDevice
             IOLogError("Failed to resume trackpad!");
             return kIOPMAckImplied;
         }
-    }
-
-    return kIOPMAckImplied;
-}
-
-IOReturn RMISMBus::powerStateDidChangeTo(IOPMPowerFlags capabilities, unsigned long stateNumber, IOService *whatDevice) {
-    unsigned long newState;
-    IOLogInfo("Received PS2 Power State Change: 0x%lx", capabilities);
-    if (capabilities & kIOPMDeviceUsable) {
-        newState = RMI_POWER_ON;
-    } else {
-        newState = RMI_POWER_OFF;
+        
+        vrmiAwake = true;
     }
 
-    return setPowerState(newState, this);
+    return kIOPMAckImplied;
 }
 
 OSDictionary *RMISMBus::createConfig() {

VoodooRMI/Transports/SMBus/RMISMBus.hpp

@@ -51,7 +51,13 @@ class RMISMBus : public RMITransport {
     struct mapping_table_entry mapping_table[RMI_SMB2_MAP_SIZE];
     UInt8 table_index {0};
 
+    bool ps2PowerDriver {false};
+    bool ps2Awake {true};
+    bool smbusAwake {true};
+    bool vrmiAwake {true};
+    
     bool rmiStart();
+    IOReturn processPowerState(unsigned long whichState);
     int rmi_smb_get_version();
     int rmi_smb_get_command_code(UInt16 rmiaddr, int bytecount,
                                  bool isread, UInt8 *commandcode);