--- xnu/xnu-792.25.20/iokit/Kernel/IOLocks.cpp
+++ xnu/xnu-517.3.7/iokit/Kernel/IOLocks.cpp
@@ -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.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 
+ * 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@
  */
@@ -27,8 +30,6 @@
  */
 
 
-#define	IOLOCKS_CPP	1
-
 #include <IOKit/system.h>
 
 #include <IOKit/IOReturn.h>
@@ -36,49 +37,27 @@
 #include <IOKit/assert.h>
 
 extern "C" {
-#include <kern/locks.h>
+#include <kern/simple_lock.h>
+#include <machine/machine_routines.h>
+
+IOLock * IOLockAlloc( void )
+{
+    return( mutex_alloc(ETAP_IO_AHA) );
+}
+
+void	IOLockFree( IOLock * lock)
+{
+    mutex_free( lock );
+}
 
 void	IOLockInitWithState( IOLock * lock, IOLockState state)
 {
     if( state == kIOLockStateLocked)
-        lck_mtx_lock( lock);
-}
-
-IOLock * IOLockAlloc( void )
-{
-    return( lck_mtx_alloc_init(IOLockGroup, LCK_ATTR_NULL) );
-}
-
-void	IOLockFree( IOLock * lock)
-{
-    lck_mtx_free( lock, IOLockGroup);
-}
-
-lck_mtx_t * IOLockGetMachLock( IOLock * lock)
-{
-    return( (lck_mtx_t *)lock);
-}
-
-int	IOLockSleep( IOLock * lock, void *event, UInt32 interType)
-{
-    return (int) lck_mtx_sleep(lock, LCK_SLEEP_DEFAULT, (event_t) event, (wait_interrupt_t) interType);
-}
-
-int	IOLockSleepDeadline( IOLock * lock, void *event,
-                                AbsoluteTime deadline, UInt32 interType)
-{
-    return (int) lck_mtx_sleep_deadline(lock, LCK_SLEEP_DEFAULT, (event_t) event,
-    					(wait_interrupt_t) interType, __OSAbsoluteTime(deadline));
-}
-
-void	IOLockWakeup(IOLock * lock, void *event, bool oneThread)
-{   
-	thread_wakeup_prim((event_t) event, oneThread, THREAD_AWAKENED);
-}   
-
+        IOLockLock( lock);
+}
 
 struct _IORecursiveLock {
-    lck_mtx_t   *mutex;
+    mutex_t  *	mutex;
     thread_t	thread;
     UInt32	count;
 };
@@ -91,7 +70,7 @@
     if( !lock)
         return( 0 );
 
-    lock->mutex = lck_mtx_alloc_init(IOLockGroup, LCK_ATTR_NULL);
+    lock->mutex = mutex_alloc(ETAP_IO_AHA);
     if( lock->mutex) {
         lock->thread = 0;
         lock->count  = 0;
@@ -107,13 +86,8 @@
 {
     _IORecursiveLock * lock = (_IORecursiveLock *)_lock;
 
-    lck_mtx_free( lock->mutex , IOLockGroup);
+    mutex_free( lock->mutex );
     IODelete( lock, _IORecursiveLock, 1);
-}
-
-lck_mtx_t * IORecursiveLockGetMachLock( IORecursiveLock * lock)
-{
-    return( lock->mutex);
 }
 
 void IORecursiveLockLock( IORecursiveLock * _lock)
@@ -123,7 +97,7 @@
     if( lock->thread == IOThreadSelf())
         lock->count++;
     else {
-        lck_mtx_lock( lock->mutex );
+        mutex_lock( lock->mutex );
         assert( lock->thread == 0 );
         assert( lock->count == 0 );
         lock->thread = IOThreadSelf();
@@ -139,7 +113,7 @@
         lock->count++;
 	return( true );
     } else {
-        if( lck_mtx_try_lock( lock->mutex )) {
+        if( mutex_try( lock->mutex )) {
             assert( lock->thread == 0 );
             assert( lock->count == 0 );
             lock->thread = IOThreadSelf();
@@ -158,7 +132,7 @@
 
     if( 0 == (--lock->count)) {
         lock->thread = 0;
-        lck_mtx_unlock( lock->mutex );
+        mutex_unlock( lock->mutex );
     }
 }
 
@@ -180,7 +154,7 @@
     
     lock->count = 0;
     lock->thread = 0;
-    res = lck_mtx_sleep(lock->mutex, LCK_SLEEP_DEFAULT, (event_t) event, (wait_interrupt_t) interType);
+    res = thread_sleep_mutex((event_t) event, lock->mutex, (int) interType);
 
     // Must re-establish the recursive lock no matter why we woke up
     // otherwise we would potentially leave the return path corrupted.
@@ -202,17 +176,16 @@
 
 IORWLock * IORWLockAlloc( void )
 {
-    return(  lck_rw_alloc_init(IOLockGroup, LCK_ATTR_NULL)  );
+    IORWLock * lock;
+
+    lock = lock_alloc( true, ETAP_IO_AHA, ETAP_IO_AHA);
+
+    return( lock);
 }
 
 void	IORWLockFree( IORWLock * lock)
 {
-    lck_rw_free( lock, IOLockGroup);
-}
-
-lck_rw_t * IORWLockGetMachLock( IORWLock * lock)
-{
-    return( (lck_rw_t *)lock);
+    lock_free( lock );
 }
 
 
@@ -222,22 +195,23 @@
 
 IOSimpleLock * IOSimpleLockAlloc( void )
 {
-    return( lck_spin_alloc_init( IOLockGroup, LCK_ATTR_NULL) );
+    IOSimpleLock *	lock;
+
+    lock = (IOSimpleLock *) IOMalloc( sizeof(IOSimpleLock));
+    if( lock)
+	IOSimpleLockInit( lock );
+
+    return( lock );
 }
 
 void IOSimpleLockInit( IOSimpleLock * lock)
 {
-    lck_spin_init( lock, IOLockGroup, LCK_ATTR_NULL);
+    simple_lock_init( (simple_lock_t) lock, ETAP_IO_AHA );
 }
 
 void IOSimpleLockFree( IOSimpleLock * lock )
 {
-    lck_spin_free( lock, IOLockGroup);
-}
-
-lck_spin_t * IOSimpleLockGetMachLock( IOSimpleLock * lock)
-{
-    return( (lck_spin_t *)lock);
+    IOFree( lock, sizeof(IOSimpleLock));
 }
 
 } /* extern "C" */