xnu-1504.3.12.tar.gz

[apple/xnu.git] / iokit / Kernel / IOInterruptEventSource.cpp

diff --git a/iokit/Kernel/IOInterruptEventSource.cpp b/iokit/Kernel/IOInterruptEventSource.cpp
index 722188c2c58d602bcbd580f513de38fe323b9e17..9694b11307fc1201892732585520c4f5c0349310 100644 (file)
--- a/iokit/Kernel/IOInterruptEventSource.cpp
+++ b/iokit/Kernel/IOInterruptEventSource.cpp
@@ -44,19 +44,19 @@ HISTORY
 #define IOTimeTypeStampS(t)                                            \
 do {                                                                   \
     IOTimeStampStart(IODBG_INTES(t),                                   \
-                     (unsigned int) this, (unsigned int) owner);       \
+                     (uintptr_t) this, (uintptr_t) owner);     \
 } while(0)
 
 #define IOTimeTypeStampE(t)                                            \
 do {                                                                   \
     IOTimeStampEnd(IODBG_INTES(t),                                     \
-                   (unsigned int) this, (unsigned int) owner);         \
+                   (uintptr_t) this, (uintptr_t) owner);               \
 } while(0)
 
 #define IOTimeStampLatency()                                           \
 do {                                                                   \
     IOTimeStampEnd(IODBG_INTES(IOINTES_LAT),                           \
-                   (unsigned int) this, (unsigned int) owner);         \
+                   (uintptr_t) this, (uintptr_t) owner);               \
 } while(0)
 
 #else /* !KDEBUG */
@@ -149,6 +149,7 @@ void IOInterruptEventSource::enable()
     if (provider && intIndex != -1) {
         provider->enableInterrupt(intIndex);
         explicitDisable = false;
+        enabled = true;
     }
 }
 
@@ -157,6 +158,7 @@ void IOInterruptEventSource::disable()
     if (provider && intIndex != -1) {
         provider->disableInterrupt(intIndex);
         explicitDisable = true;
+        enabled = false;
     }
 }
 
@@ -186,7 +188,7 @@ bool IOInterruptEventSource::checkForWork()
         IOTimeStampLatency();
         IOTimeTypeStampS(IOINTES_CLIENT);
             IOTimeStampConstant(IODBG_INTES(IOINTES_ACTION),
-                                (unsigned int) intAction, (unsigned int) owner);
+                                (uintptr_t) intAction, (uintptr_t) owner);
             (*intAction)(owner, this,  numInts);
         IOTimeTypeStampE(IOINTES_CLIENT);
 
@@ -198,7 +200,7 @@ bool IOInterruptEventSource::checkForWork()
         IOTimeStampLatency();
         IOTimeTypeStampS(IOINTES_CLIENT);
             IOTimeStampConstant(IODBG_INTES(IOINTES_ACTION),
-                                (unsigned int) intAction, (unsigned int) owner);
+                                (uintptr_t) intAction, (uintptr_t) owner);
              (*intAction)(owner, this, -numInts);
         IOTimeTypeStampE(IOINTES_CLIENT);