--- xnu/xnu-1504.3.12/iokit/Kernel/IOInterruptEventSource.cpp
+++ xnu/xnu-792/iokit/Kernel/IOInterruptEventSource.cpp
@@ -1,29 +1,23 @@
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_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. 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.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * 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
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  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 +38,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 */
@@ -149,7 +143,6 @@
     if (provider && intIndex != -1) {
         provider->enableInterrupt(intIndex);
         explicitDisable = false;
-        enabled = true;
     }
 }
 
@@ -158,7 +151,6 @@
     if (provider && intIndex != -1) {
         provider->disableInterrupt(intIndex);
         explicitDisable = true;
-        enabled = false;
     }
 }
 
@@ -188,7 +180,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 +192,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);