--- xnu/xnu-344.2/iokit/Kernel/IOLocks.cpp
+++ xnu/xnu-792.25.20/iokit/Kernel/IOLocks.cpp
@@ -27,6 +27,8 @@
  */
 
 
+#define	IOLOCKS_CPP	1
+
 #include <IOKit/system.h>
 
 #include <IOKit/IOReturn.h>
@@ -34,27 +36,49 @@
 #include <IOKit/assert.h>
 
 extern "C" {
-#include <kern/simple_lock.h>
-#include <machine/machine_routines.h>
+#include <kern/locks.h>
+
+void	IOLockInitWithState( IOLock * lock, IOLockState state)
+{
+    if( state == kIOLockStateLocked)
+        lck_mtx_lock( lock);
+}
 
 IOLock * IOLockAlloc( void )
 {
-    return( mutex_alloc(ETAP_IO_AHA) );
+    return( lck_mtx_alloc_init(IOLockGroup, LCK_ATTR_NULL) );
 }
 
 void	IOLockFree( IOLock * lock)
 {
-    mutex_free( lock );
-}
-
-void	IOLockInitWithState( IOLock * lock, IOLockState state)
-{
-    if( state == kIOLockStateLocked)
-        IOLockLock( 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);
+}   
+
 
 struct _IORecursiveLock {
-    mutex_t  *	mutex;
+    lck_mtx_t   *mutex;
     thread_t	thread;
     UInt32	count;
 };
@@ -67,7 +91,7 @@
     if( !lock)
         return( 0 );
 
-    lock->mutex = mutex_alloc(ETAP_IO_AHA);
+    lock->mutex = lck_mtx_alloc_init(IOLockGroup, LCK_ATTR_NULL);
     if( lock->mutex) {
         lock->thread = 0;
         lock->count  = 0;
@@ -83,8 +107,13 @@
 {
     _IORecursiveLock * lock = (_IORecursiveLock *)_lock;
 
-    mutex_free( lock->mutex );
+    lck_mtx_free( lock->mutex , IOLockGroup);
     IODelete( lock, _IORecursiveLock, 1);
+}
+
+lck_mtx_t * IORecursiveLockGetMachLock( IORecursiveLock * lock)
+{
+    return( lock->mutex);
 }
 
 void IORecursiveLockLock( IORecursiveLock * _lock)
@@ -94,7 +123,7 @@
     if( lock->thread == IOThreadSelf())
         lock->count++;
     else {
-        mutex_lock( lock->mutex );
+        lck_mtx_lock( lock->mutex );
         assert( lock->thread == 0 );
         assert( lock->count == 0 );
         lock->thread = IOThreadSelf();
@@ -110,7 +139,7 @@
         lock->count++;
 	return( true );
     } else {
-        if( mutex_try( lock->mutex )) {
+        if( lck_mtx_try_lock( lock->mutex )) {
             assert( lock->thread == 0 );
             assert( lock->count == 0 );
             lock->thread = IOThreadSelf();
@@ -129,7 +158,7 @@
 
     if( 0 == (--lock->count)) {
         lock->thread = 0;
-        mutex_unlock( lock->mutex );
+        lck_mtx_unlock( lock->mutex );
     }
 }
 
@@ -151,7 +180,7 @@
     
     lock->count = 0;
     lock->thread = 0;
-    res = thread_sleep_mutex((event_t) event, lock->mutex, (int) interType);
+    res = lck_mtx_sleep(lock->mutex, LCK_SLEEP_DEFAULT, (event_t) event, (wait_interrupt_t) interType);
 
     // Must re-establish the recursive lock no matter why we woke up
     // otherwise we would potentially leave the return path corrupted.
@@ -173,16 +202,17 @@
 
 IORWLock * IORWLockAlloc( void )
 {
-    IORWLock * lock;
-
-    lock = lock_alloc( true, ETAP_IO_AHA, ETAP_IO_AHA);
-
-    return( lock);
+    return(  lck_rw_alloc_init(IOLockGroup, LCK_ATTR_NULL)  );
 }
 
 void	IORWLockFree( IORWLock * lock)
 {
-    lock_free( lock );
+    lck_rw_free( lock, IOLockGroup);
+}
+
+lck_rw_t * IORWLockGetMachLock( IORWLock * lock)
+{
+    return( (lck_rw_t *)lock);
 }
 
 
@@ -192,23 +222,22 @@
 
 IOSimpleLock * IOSimpleLockAlloc( void )
 {
-    IOSimpleLock *	lock;
-
-    lock = (IOSimpleLock *) IOMalloc( sizeof(IOSimpleLock));
-    if( lock)
-	IOSimpleLockInit( lock );
-
-    return( lock );
+    return( lck_spin_alloc_init( IOLockGroup, LCK_ATTR_NULL) );
 }
 
 void IOSimpleLockInit( IOSimpleLock * lock)
 {
-    simple_lock_init( (simple_lock_t) lock, ETAP_IO_AHA );
+    lck_spin_init( lock, IOLockGroup, LCK_ATTR_NULL);
 }
 
 void IOSimpleLockFree( IOSimpleLock * lock )
 {
-    IOFree( lock, sizeof(IOSimpleLock));
+    lck_spin_free( lock, IOLockGroup);
+}
+
+lck_spin_t * IOSimpleLockGetMachLock( IOSimpleLock * lock)
+{
+    return( (lck_spin_t *)lock);
 }
 
 } /* extern "C" */