xnu-792.17.14.tar.gz

[apple/xnu.git] / osfmk / ppc / lock.h

diff --git a/osfmk/ppc/lock.h b/osfmk/ppc/lock.h
index ec40b5f436c6f6e804c4cad7dc03ecd52e0b91c8..376ff499141d154019e356307b85ced95d4b954f 100644 (file)
--- a/osfmk/ppc/lock.h
+++ b/osfmk/ppc/lock.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_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.
+ * 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. 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (C) 1998 Apple Computer
@@ -53,21 +59,36 @@
  * the rights to redistribute these changes.
  */
 
-#ifndef        _PPC_HW_LOCK_H_
-#define        _PPC_HW_LOCK_H_
+#ifdef KERNEL_PRIVATE
+
+#ifndef        _PPC_LOCK_H_
+#define        _PPC_LOCK_H_
+
+#ifdef  MACH_KERNEL_PRIVATE
 
 #include <kern/macro_help.h>
 #include <kern/assert.h>
+#include <mach_ldebug.h>
+#include <ppc/locks.h>
 
-#define        NEED_ATOMIC 1
+#if     !MACH_LDEBUG
+typedef        lck_mtx_t       mutex_t;
+#else
+typedef        lck_mtx_ext_t   mutex_t;
+#endif /* !MACH_LDEBUG */
 
-#define mutex_try      _mutex_try
-#define mutex_lock(m)                          \
-MACRO_BEGIN                                    \
-       assert(assert_wait_possible());         \
-       _mutex_lock((m));                       \
-MACRO_END
+#if     !MACH_LDEBUG
+typedef        lck_rw_t        lock_t;
+#else
+typedef        lck_rw_ext_t    lock_t;
+#endif /* !MACH_LDEBUG */
 
 extern unsigned int LockTimeOut;                       /* Number of hardware ticks of a lock timeout */
 
-#endif /* _PPC_HW_LOCK_H_ */
+#define        mutex_unlock(l)         mutex_unlock_rwcmb(l)
+
+#endif /* MACH_KERNEL_PRIVATE */
+
+#endif /* _PPC_LOCK_H_ */
+
+#endif /* KERNEL_PRIVATE */