xnu-2782.10.72.tar.gz

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

diff --git a/iokit/IOKit/IOSharedLock.h b/iokit/IOKit/IOSharedLock.h
index 017630e3d606c75189a381351260b13b7db9c3cc..795007451ea7b8f88170657fdff0e1109400cd33 100644 (file)
--- a/iokit/IOKit/IOSharedLock.h
+++ b/iokit/IOKit/IOSharedLock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2010 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -20,68 +20,18 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
-/*
- * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
- *
- * HISTORY
- *
- */
-
-/*
- * Multiprocessor locks used within the shared memory area between the
- * kernel and event system.  These must work in both user and kernel mode.
- * 
- * These routines are public, for the purpose of writing frame buffer device
- * drivers which handle their own cursors.  Certain architectures define a
- * generic display class which handles cursor drawing and is subclassed by
- * driver writers.  These drivers need not be concerned with the following
- * types and definitions.
- *
- * The ev_lock(), ev_unlock(), and ev_try_lock() functions are available only
- * to drivers built in or dynamically loaded into the kernel, and to DPS
- * drivers built in or dynamically loaded into the Window Server.  They do not
- * exist in any shared library.
- *
- * --> They're now in IOKit user lib.
- */
 
 #ifndef _IOKIT_IOSHAREDLOCK_H
 #define _IOKIT_IOSHAREDLOCK_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// should be 32 bytes on PPC
-typedef volatile int           IOSharedLockData;
-typedef IOSharedLockData    *   IOSharedLock;
-
-#define IOSpinLockInit(l)      (*(l) = (IOSharedLockData)0)
-
-#ifndef KERNEL
-extern void IOSpinLock(IOSharedLock l);
-#endif
+#include <libkern/OSAtomic.h>
 
-extern void IOSpinUnlock(IOSharedLock l);
-extern boolean_t IOTrySpinLock(IOSharedLock l);
+#define IOSharedLockData OSSpinLock
+#define ev_lock_data_t   OSSpinLock
 
-/* exact same stuff & implementation */
-
-typedef IOSharedLockData       ev_lock_data_t;
-typedef ev_lock_data_t     *   ev_lock_t;
-
-#define ev_init_lock(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!
+#ifdef KERNEL
+#define ev_unlock(l)     OSSpinLockUnlock(l)
+#define ev_try_lock(l)   OSSpinLockTry(l)
 #endif
 
-extern void ev_unlock(ev_lock_t l);
-extern boolean_t ev_try_lock(ev_lock_t l);
-
-#ifdef __cplusplus
-}
-#endif
 #endif /* ! _IOKIT_IOSHAREDLOCK_H */