xnu-1504.7.4.tar.gz

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

diff --git a/iokit/Kernel/IOFilterInterruptEventSource.cpp b/iokit/Kernel/IOFilterInterruptEventSource.cpp
index 0869ec7decb5797825f60bf87aba92cd96598459..47a3b8a143c03fe531ed5ec2d3136cef798d4767 100644 (file)
--- a/iokit/Kernel/IOFilterInterruptEventSource.cpp
+++ b/iokit/Kernel/IOFilterInterruptEventSource.cpp
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * 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.
+ * 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
 Copyright (c) 1999 Apple Computer, Inc.  All rights reserved.
@@ -36,19 +42,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 */
@@ -74,9 +80,9 @@ OSMetaClassDefineReservedUnused(IOFilterInterruptEventSource, 7);
  * Implement the call throughs for the private protection conversion
  */
 bool IOFilterInterruptEventSource::init(OSObject *inOwner,
-                                        Action inAction = 0,
-                                        IOService *inProvider = 0,
-                                        int inIntIndex = 0)
+                                        Action inAction,
+                                        IOService *inProvider,
+                                        int inIntIndex)
 {
     return false;
 }
@@ -95,7 +101,7 @@ IOFilterInterruptEventSource::init(OSObject *inOwner,
                                    Action inAction,
                                    Filter inFilterAction,
                                    IOService *inProvider,
-                                   int inIntIndex = 0)
+                                   int inIntIndex)
 {
     if ( !super::init(inOwner, inAction, inProvider, inIntIndex) )
         return false;
@@ -112,13 +118,13 @@ IOFilterInterruptEventSource *IOFilterInterruptEventSource
                              Action inAction,
                              Filter inFilterAction,
                              IOService *inProvider,
-                             int inIntIndex = 0)
+                             int inIntIndex)
 {
     IOFilterInterruptEventSource *me = new IOFilterInterruptEventSource;
 
     if (me
     && !me->init(inOwner, inAction, inFilterAction, inProvider, inIntIndex)) {
-        me->free();
+        me->release();
         return 0;
     }
 
@@ -155,7 +161,7 @@ IOTimeTypeStampS(IOINTES_INTCTXT);
 
 IOTimeTypeStampS(IOINTES_INTFLTR);
     IOTimeStampConstant(IODBG_INTES(IOINTES_FILTER),
-                        (unsigned int) filterAction, (unsigned int) owner);
+                        (uintptr_t) filterAction, (uintptr_t) owner);
     filterRes = (*filterAction)(owner, this);
 IOTimeTypeStampE(IOINTES_INTFLTR);
 
@@ -174,7 +180,7 @@ IOTimeTypeStampS(IOINTES_INTCTXT);
 
 IOTimeTypeStampS(IOINTES_INTFLTR);
     IOTimeStampConstant(IODBG_INTES(IOINTES_FILTER),
-                        (unsigned int) filterAction, (unsigned int) owner);
+                        (uintptr_t) filterAction, (uintptr_t) owner);
     filterRes = (*filterAction)(owner, this);
 IOTimeTypeStampE(IOINTES_INTFLTR);