Loading...
--- xnu/xnu-792.6.56/iokit/Kernel/IOInterruptEventSource.cpp
+++ xnu/xnu-201/iokit/Kernel/IOInterruptEventSource.cpp
@@ -3,20 +3,19 @@
*
* @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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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.
*
- * 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_LICENSE_HEADER_END@
*/
@@ -73,9 +72,9 @@
OSMetaClassDefineReservedUnused(IOInterruptEventSource, 7);
bool IOInterruptEventSource::init(OSObject *inOwner,
- Action inAction,
- IOService *inProvider,
- int inIntIndex)
+ Action inAction = 0,
+ IOService *inProvider = 0,
+ int inIntIndex = 0)
{
bool res = true;
@@ -98,12 +97,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));
@@ -124,7 +123,7 @@
IOInterruptEventSource *me = new IOInterruptEventSource;
if (me && !me->init(inOwner, inAction, inProvider, inIntIndex)) {
- me->release();
+ me->free();
return 0;
}