xnu-1228.9.59.tar.gz

[apple/xnu.git] / iokit / IOKit / IOSharedLock.h

diff --git a/iokit/IOKit/IOSharedLock.h b/iokit/IOKit/IOSharedLock.h
index 0f9e7bf33c39e1aef33d8e5047cb45688b9dc861..eadfc407d3fea441815bf0519a313fb0ecd80927 100644 (file)
--- a/iokit/IOKit/IOSharedLock.h
+++ b/iokit/IOKit/IOSharedLock.h
@@ -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) 1998 Apple Computer, Inc.  All rights reserved. 
@@ -55,9 +61,12 @@ extern "C" {
 typedef volatile int           IOSharedLockData;
 typedef IOSharedLockData    *   IOSharedLock;
 
-#define IOSpinLockInit(l)      (*(l) = (IOSpinLockData)0)
+#define IOSpinLockInit(l)      (*(l) = (IOSharedLockData)0)
 
+#ifndef KERNEL
 extern void IOSpinLock(IOSharedLock l);
+#endif
+
 extern void IOSpinUnlock(IOSharedLock l);
 extern boolean_t IOTrySpinLock(IOSharedLock l);
 
@@ -70,7 +79,10 @@ typedef ev_lock_data_t           *   ev_lock_t;
 // needs isync?
 //#define ev_is_locked(l)      (*(l) != (ev_lock_data_t)0)
 
+#ifndef KERNEL
 extern void ev_lock(ev_lock_t l);              // Spin lock!
+#endif
+
 extern void ev_unlock(ev_lock_t l);
 extern boolean_t ev_try_lock(ev_lock_t l);