--- xnu/xnu-1504.7.4/iokit/Kernel/IOInterruptEventSource.cpp
+++ xnu/xnu-517/iokit/Kernel/IOInterruptEventSource.cpp
@@ -1,19 +1,16 @@
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
  * 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. 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.
+ * 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.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -23,7 +20,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
  */
 /*
 Copyright (c) 1998 Apple Computer, Inc.  All rights reserved.
@@ -44,19 +41,19 @@
 #define IOTimeTypeStampS(t)						\
 do {									\
     IOTimeStampStart(IODBG_INTES(t),					\
-                     (uintptr_t) this, (uintptr_t) owner);	\
+                     (unsigned int) this, (unsigned int) owner);	\
 } while(0)
 
 #define IOTimeTypeStampE(t)						\
 do {									\
     IOTimeStampEnd(IODBG_INTES(t),					\
-                   (uintptr_t) this, (uintptr_t) owner);		\
+                   (unsigned int) this, (unsigned int) owner);		\
 } while(0)
 
 #define IOTimeStampLatency()						\
 do {									\
     IOTimeStampEnd(IODBG_INTES(IOINTES_LAT),				\
-                   (uintptr_t) this, (uintptr_t) owner);		\
+                   (unsigned int) this, (unsigned int) owner);		\
 } while(0)
 
 #else /* !KDEBUG */
@@ -103,12 +100,12 @@
 
             autoDisable = (intType == kIOInterruptTypeLevel);
             if (autoDisable) {
-                intHandler = OSMemberFunctionCast(IOInterruptAction,
-		    this, &IOInterruptEventSource::disableInterruptOccurred);
+                intHandler = (IOInterruptAction)
+                &IOInterruptEventSource::disableInterruptOccurred;
             }
             else
-                intHandler = OSMemberFunctionCast(IOInterruptAction,
-		    this, &IOInterruptEventSource::normalInterruptOccurred);
+                intHandler = (IOInterruptAction)
+                    &IOInterruptEventSource::normalInterruptOccurred;
 
             res = (kIOReturnSuccess == inProvider->registerInterrupt
                                         (inIntIndex, this, intHandler));
@@ -149,7 +146,6 @@
     if (provider && intIndex != -1) {
         provider->enableInterrupt(intIndex);
         explicitDisable = false;
-        enabled = true;
     }
 }
 
@@ -158,7 +154,6 @@
     if (provider && intIndex != -1) {
         provider->disableInterrupt(intIndex);
         explicitDisable = true;
-        enabled = false;
     }
 }
 
@@ -188,7 +183,7 @@
         IOTimeStampLatency();
         IOTimeTypeStampS(IOINTES_CLIENT);
             IOTimeStampConstant(IODBG_INTES(IOINTES_ACTION),
-                                (uintptr_t) intAction, (uintptr_t) owner);
+                                (unsigned int) intAction, (unsigned int) owner);
             (*intAction)(owner, this,  numInts);
         IOTimeTypeStampE(IOINTES_CLIENT);
 
@@ -200,7 +195,7 @@
         IOTimeStampLatency();
         IOTimeTypeStampS(IOINTES_CLIENT);
             IOTimeStampConstant(IODBG_INTES(IOINTES_ACTION),
-                                (uintptr_t) intAction, (uintptr_t) owner);
+                                (unsigned int) intAction, (unsigned int) owner);
              (*intAction)(owner, this, -numInts);
         IOTimeTypeStampE(IOINTES_CLIENT);