X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/e5568f75972dfc723778653c11cb6b4dc825716a..6601e61aa18bf4f09af135ff61fc7f4771d23b06:/osfmk/ppc/lock.h?ds=sidebyside

diff --git a/osfmk/ppc/lock.h b/osfmk/ppc/lock.h
index 0e36a9589..dde4dbbcc 100644
--- a/osfmk/ppc/lock.h
+++ b/osfmk/ppc/lock.h
@@ -53,53 +53,36 @@
  * the rights to redistribute these changes.
  */
 
+#ifdef	KERNEL_PRIVATE
+
 #ifndef	_PPC_LOCK_H_
 #define	_PPC_LOCK_H_
 
-#include <sys/appleapiopts.h>
-
-#ifdef __APPLE_API_PRIVATE
+#ifdef  MACH_KERNEL_PRIVATE
 
 #include <kern/macro_help.h>
 #include <kern/assert.h>
-#include <mach/etap_events.h>
-#include <mach/etap.h>
-
-extern unsigned int LockTimeOut;			/* Number of hardware ticks of a lock timeout */
-
-#if defined(MACH_KERNEL_PRIVATE)
-
-#include <cpus.h>
-
-#if !(NCPUS == 1 || ETAP_LOCK_TRACE || USLOCK_DEBUG)
+#include <mach_ldebug.h>
+#include <ppc/locks.h>
 
-#include <ppc/hw_lock_types.h>
+#if     !MACH_LDEBUG
+typedef	lck_mtx_t	mutex_t;
+#else
+typedef	lck_mtx_ext_t	mutex_t;
+#endif	/* !MACH_LDEBUG */
 
-#define __slock_held_func__(l)  hw_lock_held(l)
+#if     !MACH_LDEBUG
+typedef	lck_rw_t	lock_t;
+#else
+typedef	lck_rw_ext_t	lock_t;
+#endif	/* !MACH_LDEBUG */
 
-extern void                     ppc_usimple_lock_init(simple_lock_t,etap_event_t);
-extern void                     ppc_usimple_lock(simple_lock_t);
-extern void                     ppc_usimple_unlock_rwmb(simple_lock_t);
-extern void                     ppc_usimple_unlock_rwcmb(simple_lock_t);
-extern unsigned int             ppc_usimple_lock_try(simple_lock_t);
-
-#define	MACHINE_SIMPLE_LOCK
-
-#define simple_lock_init(l,t)	ppc_usimple_lock_init(l,t)
-#define simple_lock(l)			ppc_usimple_lock(l)
-#define simple_unlock(l)		ppc_usimple_unlock_rwcmb(l)
-#define simple_unlock_rwmb(l)		ppc_usimple_unlock_rwmb(l)
-#define simple_lock_try(l)		ppc_usimple_lock_try(l)  
-#define simple_lock_addr(l)		(&(l))
-#define thread_sleep_simple_lock(l, e, i) \
-				thread_sleep_fast_usimple_lock((l), (e), (i))
-
-#define mutex_unlock(l)		mutex_unlock_rwcmb(l)
-
-#endif /* !(NCPUS == 1 || ETAP_LOCK_TRACE || USLOCK_DEBUG) */
+extern unsigned int LockTimeOut;			/* Number of hardware ticks of a lock timeout */
 
-#endif /* MACH_KERNEL_PRIVATE */
+#define	mutex_unlock(l)		mutex_unlock_rwcmb(l)
 
-#endif /* __APPLE_API_PRIVATE */
+#endif	/* MACH_KERNEL_PRIVATE */
 
 #endif	/* _PPC_LOCK_H_ */
+
+#endif	/* KERNEL_PRIVATE */