xnu-344.23.tar.gz

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

diff --git a/osfmk/ppc/lock.h b/osfmk/ppc/lock.h
index cb7e07aed39448e22b450ad2a08996df36364ea7..e5ba906b849c7e31f10e98023762aacf5a696d47 100644 (file)
--- a/osfmk/ppc/lock.h
+++ b/osfmk/ppc/lock.h
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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. 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
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -65,8 +62,6 @@
 
 #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 */
 
@@ -78,27 +73,20 @@ extern unsigned int LockTimeOut;                    /* Number of hardware ticks of a lock timeout
 
 #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                     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
+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)  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 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 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 */