xnu-1504.7.4.tar.gz

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

diff --git a/iokit/Kernel/IOSyncer.cpp b/iokit/Kernel/IOSyncer.cpp
index 815cc3b1f63868a3bd80fc91b77a17cc200c7c5e..8379cc7cafcd5a8d9702121410dceedc6a387afc 100644 (file)
--- a/iokit/Kernel/IOSyncer.cpp
+++ b/iokit/Kernel/IOSyncer.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@
  */
 /* IOSyncer.cpp created by wgulland on 2000-02-02 */
 
@@ -76,14 +82,14 @@ void IOSyncer::free()
     OSObject::free();
 }
 
-IOReturn IOSyncer::wait(bool autoRelease = true)
+IOReturn IOSyncer::wait(bool autoRelease)
 {
     IOInterruptState is = IOSimpleLockLockDisableInterrupt(guardLock);
 
     if (threadMustStop) {
        assert_wait((void *) &threadMustStop, false);
        IOSimpleLockUnlockEnableInterrupt(guardLock, is);
-        thread_block(0);
+        thread_block(THREAD_CONTINUE_NULL);
     }
     else
         IOSimpleLockUnlockEnableInterrupt(guardLock, is);
@@ -96,8 +102,7 @@ IOReturn IOSyncer::wait(bool autoRelease = true)
     return result;
 }
 
-void IOSyncer::signal(IOReturn res = kIOReturnSuccess,
-                                       bool autoRelease = true)
+void IOSyncer::signal(IOReturn res, bool autoRelease)
 {
     fResult = res;
     privateSignal();