X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/6601e61aa18bf4f09af135ff61fc7f4771d23b06..440d4c6cfad24426bfddca7518f16c17f4e443f7:/osfmk/kern/lock.h?ds=sidebyside

diff --git a/osfmk/kern/lock.h b/osfmk/kern/lock.h
index 4cb10d325..8366e26a6 100644
--- a/osfmk/kern/lock.h
+++ b/osfmk/kern/lock.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000-2005 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@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -68,47 +74,6 @@ __BEGIN_DECLS
 
 #ifndef	MACH_KERNEL_PRIVATE
 
-typedef struct __mutex__ mutex_t;
-
-#else	/* MACH_KERNEL_PRIVATE */
-
-#define	decl_mutex_data(class,name)	class mutex_t name;
-#define mutex_addr(m)			(&(m))
-
-extern void			mutex_init(
-						mutex_t		*mutex,
-						unsigned short	tag);
-
-#endif	/* MACH_KERNEL_PRIVATE */
-
-extern mutex_t		*mutex_alloc(
-						unsigned short	tag);
-
-extern void			mutex_free(
-						mutex_t		*mutex);
-
-extern void			mutex_lock(
-						mutex_t		*mutex);
-
-extern void			mutex_unlock(
-						mutex_t		*mutex);
-
-extern boolean_t	mutex_try(
-						mutex_t		*mutex);
-
-extern void			mutex_pause(void);
-
-#define MA_OWNED        0x01
-#define MA_NOTOWNED     0x02
- 
-void 				_mutex_assert (
-						mutex_t		*mutex,
-						unsigned int	what);
-
-#define mutex_assert(a, b)	_mutex_assert(a, b)
-
-#ifndef	MACH_KERNEL_PRIVATE
-
 typedef struct __lock__ lock_t;
 
 #else	/* MACH_KERNEL_PRIVATE */
@@ -154,19 +119,6 @@ extern wait_result_t	thread_sleep_usimple_lock(
 							usimple_lock_t		lock,
 							wait_interrupt_t	interruptible);
 
-/* Sleep, unlocking and then relocking a mutex in the process */
-extern wait_result_t	thread_sleep_mutex(
-							event_t				event,
-							mutex_t				*mutex,
-							wait_interrupt_t	interruptible);
-										
-/* Sleep with a deadline, unlocking and then relocking a mutex in the process */
-extern wait_result_t	thread_sleep_mutex_deadline(
-							event_t				event,
-							mutex_t				*mutex,
-							uint64_t			deadline,
-							wait_interrupt_t	interruptible);
-
 /* Sleep, unlocking and then relocking a write lock in the process */
 extern wait_result_t	thread_sleep_lock_write(
 							event_t				event,