xnu-1504.3.12.tar.gz

[apple/xnu.git] / iokit / Kernel / IOServicePMPrivate.h

diff --git a/iokit/Kernel/IOServicePMPrivate.h b/iokit/Kernel/IOServicePMPrivate.h
index 227715d5fba6c1a0e9ee3d89ddb0048b7b6adf7c..772ac518cc41573c0af9ae70ab9d98eafab24960 100644 (file)
--- a/iokit/Kernel/IOServicePMPrivate.h
+++ b/iokit/Kernel/IOServicePMPrivate.h
@@ -66,6 +66,9 @@ private:
     // Power flags supplied by all parents (domain).
     unsigned long           HeadNoteDomainFlags;
 
+    // Power flags supplied by domain accounting for parent changes.
+    IOPMPowerFlags          HeadNoteDomainTargetFlags;
+
     // Connection attached to the changing parent.
     IOPowerConnection *     HeadNoteParentConnection;
     
@@ -205,6 +208,7 @@ private:
 #define fHeadNotePowerState         pwrMgt->HeadNotePowerState
 #define fHeadNotePowerArrayEntry    pwrMgt->HeadNotePowerArrayEntry
 #define fHeadNoteDomainFlags        pwrMgt->HeadNoteDomainFlags
+#define fHeadNoteDomainTargetFlags  pwrMgt->HeadNoteDomainTargetFlags
 #define fHeadNoteParentConnection   pwrMgt->HeadNoteParentConnection
 #define fHeadNoteParentFlags        pwrMgt->HeadNoteParentFlags
 #define fHeadNotePendingAcks        pwrMgt->HeadNotePendingAcks
@@ -257,7 +261,7 @@ private:
 #define fRemoveInterestSet          pwrMgt->RemoveInterestSet
 #define fStrictTreeOrder            pwrMgt->StrictTreeOrder
 #define fNotifyChildArray           pwrMgt->NotifyChildArray
-#define fIdleTimerStopped                      pwrMgt->IdleTimerStopped
+#define fIdleTimerStopped           pwrMgt->IdleTimerStopped
 #define fAdjustPowerScheduled       pwrMgt->AdjustPowerScheduled
 #define fActivityTicklePowerState   pwrMgt->ActivityTicklePowerState
 #define fPMVars                     pwrMgt->PMVars
@@ -371,9 +375,9 @@ class IOPMRequest : public IOCommand
 protected:
     IOService *          fTarget;        // request target
     IOPMRequest *        fRequestNext;   // the next request in the chain
-       IOPMRequest *            fRequestRoot;   // the root request in the issue tree
+    IOPMRequest *        fRequestRoot;   // the root request in the issue tree
     IOItemCount          fWorkWaitCount; // execution blocked if non-zero
-       IOItemCount                      fFreeWaitCount; // completion blocked if non-zero      
+    IOItemCount          fFreeWaitCount; // completion blocked if non-zero
     uint32_t             fType;          // request type
 
     IOPMCompletionAction fCompletionAction;
@@ -401,12 +405,12 @@ public:
         return fRequestNext;
     }
 
-       inline IOPMRequest * getRootRequest( void ) const
-       {
+    inline IOPMRequest * getRootRequest( void ) const
+    {
         if (fRequestRoot) return fRequestRoot;
         if (fCompletionAction) return (IOPMRequest *) this;
-               return 0;
-       }
+        return 0;
+    }
 
     inline uint32_t      getType( void ) const
     {