X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/0b4e3aa066abc0728aacb4bbeb86f53f9737156e..43866e378188c25dd1e2208016ab3cbeb086ae6c:/osfmk/ppc/lock.h

diff --git a/osfmk/ppc/lock.h b/osfmk/ppc/lock.h
index 8748bf8ac..007e2e6c3 100644
--- a/osfmk/ppc/lock.h
+++ b/osfmk/ppc/lock.h
@@ -3,19 +3,22 @@
  *
  * @APPLE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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.
+ * 
+ * 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@
  */
@@ -56,23 +59,41 @@
 #ifndef	_PPC_LOCK_H_
 #define	_PPC_LOCK_H_
 
+#include <sys/appleapiopts.h>
+
+#ifdef __APPLE_API_PRIVATE
+
 #include <kern/macro_help.h>
 #include <kern/assert.h>
 
 extern unsigned int LockTimeOut;			/* Number of hardware ticks of a lock timeout */
 
-#if defined(MACH_KERNEL_PRIVATE) && !(NCPUS == 1 && !ETAP_LOCK_TRACE && !USLOCK_DEBUG)
-extern void                     fast_usimple_lock(usimple_lock_t);
-extern void                     fast_usimple_unlock(usimple_lock_t);
-extern unsigned int             fast_usimple_lock_try(usimple_lock_t);
+#if defined(MACH_KERNEL_PRIVATE)
+
+#include <cpus.h>
+
+#if !(NCPUS == 1 || ETAP_LOCK_TRACE || USLOCK_DEBUG)
+
+#include <ppc/hw_lock_types.h>
+
+#define simple_lock_init(l,t)   hw_lock_init(l)
+#define __slock_held_func__(l)  hw_lock_held(l)
+
+extern void                     fast_usimple_lock(simple_lock_t);
+extern void                     fast_usimple_unlock(simple_lock_t);
+extern unsigned int             fast_usimple_lock_try(simple_lock_t);
 
-#define simple_lock_init(l,t)   usimple_lock_init(l,t)
 #define simple_lock(l)          fast_usimple_lock(l)
 #define simple_unlock(l)        fast_usimple_unlock(l)
 #define simple_lock_try(l)      fast_usimple_lock_try(l)  
 #define simple_lock_addr(l)     (&(l))
-#define __slock_held_func__(l)  usimple_lock_held(l)
+#define thread_sleep_simple_lock(l, e, i) \
+				thread_sleep_fast_usimple_lock((l), (e), (i))
+
+#endif /* !(NCPUS == 1 || ETAP_LOCK_TRACE || USLOCK_DEBUG) */
+
+#endif /* MACH_KERNEL_PRIVATE */
 
-#endif
+#endif /* __APPLE_API_PRIVATE */
 
 #endif	/* _PPC_LOCK_H_ */