X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/55e303ae13a4cf49d70f2294092726f2fffb9ef2..060df5ea7c632b1ac8cc8aac1fb59758165c2084:/osfmk/ppc/lock.h?ds=sidebyside

diff --git a/osfmk/ppc/lock.h b/osfmk/ppc/lock.h
index cb7e07aed..0628f554f 100644
--- a/osfmk/ppc/lock.h
+++ b/osfmk/ppc/lock.h
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 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
- * 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
@@ -20,7 +23,7 @@
  * 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
@@ -56,53 +59,28 @@
  * 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_rw_t	lock_t;
+#else
+typedef	lck_rw_ext_t	lock_t;
+#endif	/* !MACH_LDEBUG */
 
-#define __slock_held_func__(l)  hw_lock_held(l)
-
-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) */
-
-#endif /* MACH_KERNEL_PRIVATE */
+extern unsigned int LockTimeOut;			/* Number of hardware ticks of a lock timeout */
 
-#endif /* __APPLE_API_PRIVATE */
+#endif	/* MACH_KERNEL_PRIVATE */
 
 #endif	/* _PPC_LOCK_H_ */
+
+#endif	/* KERNEL_PRIVATE */