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 803ec162cbd881dacb59e644a95f648898626ce1..eadfc407d3fea441815bf0519a313fb0ecd80927 100644 (file)
--- a/iokit/IOKit/IOSharedLock.h
+++ b/iokit/IOKit/IOSharedLock.h
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_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
  * 
  * 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.
+ * 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.
+ * 
+ * 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
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * 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. 
  */
 /*
  * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 


@@ -58,9 +61,12 @@ extern "C" {
 typedef volatile int           IOSharedLockData;
 typedef IOSharedLockData    *   IOSharedLock;
 
 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);
 extern void IOSpinLock(IOSharedLock l);

+#endif
+

 extern void IOSpinUnlock(IOSharedLock l);
 extern boolean_t IOTrySpinLock(IOSharedLock l);
 
 extern void IOSpinUnlock(IOSharedLock l);
 extern boolean_t IOTrySpinLock(IOSharedLock l);
 


@@ -73,7 +79,10 @@ typedef ev_lock_data_t           *   ev_lock_t;
 // needs isync?
 //#define ev_is_locked(l)      (*(l) != (ev_lock_data_t)0)
 
 // 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!
 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);
 
 extern void ev_unlock(ev_lock_t l);
 extern boolean_t ev_try_lock(ev_lock_t l);