X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/d7e50217d7adf6e52786a38bcaa4cd698cb9a79e..b7266188b87f3620ec3f9f717e57194a7dd989fe:/iokit/Kernel/IOInterruptEventSource.cpp?ds=inline

diff --git a/iokit/Kernel/IOInterruptEventSource.cpp b/iokit/Kernel/IOInterruptEventSource.cpp
index cbdd0aa6a..9694b1130 100644
--- a/iokit/Kernel/IOInterruptEventSource.cpp
+++ b/iokit/Kernel/IOInterruptEventSource.cpp
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
 Copyright (c) 1998 Apple Computer, Inc.  All rights reserved.
@@ -41,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 */
@@ -75,9 +78,9 @@ OSMetaClassDefineReservedUnused(IOInterruptEventSource, 6);
 OSMetaClassDefineReservedUnused(IOInterruptEventSource, 7);
 
 bool IOInterruptEventSource::init(OSObject *inOwner,
-				  Action inAction = 0,
-				  IOService *inProvider = 0,
-				  int inIntIndex = 0)
+				  Action inAction,
+				  IOService *inProvider,
+				  int inIntIndex)
 {
     bool res = true;
 
@@ -100,12 +103,12 @@ bool IOInterruptEventSource::init(OSObject *inOwner,
 
             autoDisable = (intType == kIOInterruptTypeLevel);
             if (autoDisable) {
-                intHandler = (IOInterruptAction)
-                &IOInterruptEventSource::disableInterruptOccurred;
+                intHandler = OSMemberFunctionCast(IOInterruptAction,
+		    this, &IOInterruptEventSource::disableInterruptOccurred);
             }
             else
-                intHandler = (IOInterruptAction)
-                    &IOInterruptEventSource::normalInterruptOccurred;
+                intHandler = OSMemberFunctionCast(IOInterruptAction,
+		    this, &IOInterruptEventSource::normalInterruptOccurred);
 
             res = (kIOReturnSuccess == inProvider->registerInterrupt
                                         (inIntIndex, this, intHandler));
@@ -126,7 +129,7 @@ IOInterruptEventSource::interruptEventSource(OSObject *inOwner,
     IOInterruptEventSource *me = new IOInterruptEventSource;
 
     if (me && !me->init(inOwner, inAction, inProvider, inIntIndex)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -146,6 +149,7 @@ void IOInterruptEventSource::enable()
     if (provider && intIndex != -1) {
         provider->enableInterrupt(intIndex);
         explicitDisable = false;
+        enabled = true;
     }
 }
 
@@ -154,6 +158,7 @@ void IOInterruptEventSource::disable()
     if (provider && intIndex != -1) {
         provider->disableInterrupt(intIndex);
         explicitDisable = true;
+        enabled = false;
     }
 }
 
@@ -183,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);
 
@@ -195,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);