Loading...
iokit/Kernel/IOLocks.cpp xnu-12377.101.15 xnu-6153.41.3
--- xnu/xnu-12377.101.15/iokit/Kernel/IOLocks.cpp
+++ xnu/xnu-6153.41.3/iokit/Kernel/IOLocks.cpp
@@ -57,18 +57,6 @@
 }
 
 void
-IOLockInlineInit( IOLock *lock )
-{
-	lck_mtx_init(lock, IOLockGroup, LCK_ATTR_NULL);
-}
-
-void
-IOLockInlineDestroy( IOLock * lock)
-{
-	lck_mtx_destroy( lock, IOLockGroup);
-}
-
-void
 IOLockFree( IOLock * lock)
 {
 	lck_mtx_free( lock, IOLockGroup);
@@ -94,24 +82,10 @@
 	           (wait_interrupt_t) interType, __OSAbsoluteTime(deadline));
 }
 
-int
-IOLockSleepWithInheritor( IOLock *lock, UInt32 lck_sleep_action,
-    void *event, thread_t inheritor, UInt32 interType, uint64_t deadline)
-{
-	return (int) lck_mtx_sleep_with_inheritor(lock, (lck_sleep_action_t) lck_sleep_action, (event_t) event, inheritor,
-	           (wait_interrupt_t) interType, deadline);
-}
-
 void
 IOLockWakeup(IOLock * lock, void *event, bool oneThread)
 {
 	thread_wakeup_prim((event_t) event, oneThread, THREAD_AWAKENED);
-}
-
-void
-IOLockWakeupAllWithInheritor(IOLock * lock, void *event)
-{
-	wakeup_all_with_inheritor((event_t) event, THREAD_AWAKENED);
 }
 
 
@@ -174,7 +148,7 @@
 		return NULL;
 	}
 
-	lock = IOMallocType( _IORecursiveLock );
+	lock = IONew( _IORecursiveLock, 1 );
 	if (!lock) {
 		return NULL;
 	}
@@ -200,7 +174,7 @@
 	_IORecursiveLock * lock = (_IORecursiveLock *)_lock;
 
 	lck_mtx_destroy(&lock->mutex, lock->group);
-	IOFreeType( lock, _IORecursiveLock );
+	IODelete( lock, _IORecursiveLock, 1 );
 }
 
 lck_mtx_t *
@@ -329,18 +303,6 @@
 }
 
 void
-IORWLockInlineInit( IORWLock *lock )
-{
-	lck_rw_init(lock, IOLockGroup, LCK_ATTR_NULL);
-}
-
-void
-IORWLockInlineDestroy( IORWLock * lock)
-{
-	lck_rw_destroy( lock, IOLockGroup);
-}
-
-void
 IORWLockFree( IORWLock * lock)
 {
 	lck_rw_free( lock, IOLockGroup);