X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/43866e378188c25dd1e2208016ab3cbeb086ae6c..143464d58d2bd6378e74eec636961ceb0d32fb91:/osfmk/mach/semaphore.h

diff --git a/osfmk/mach/semaphore.h b/osfmk/mach/semaphore.h
index 8ac6f1963..36ba3d00f 100644
--- a/osfmk/mach/semaphore.h
+++ b/osfmk/mach/semaphore.h
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * 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.
+ * 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.
+ * 
+ * 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
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
 #ifndef _MACH_SEMAPHORE_H_
@@ -46,26 +49,70 @@
  *					  semaphore_t semaphore);
  */
 
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+
 extern	kern_return_t	semaphore_signal     	(semaphore_t semaphore);
 extern	kern_return_t	semaphore_signal_all 	(semaphore_t semaphore);
-extern	kern_return_t	semaphore_signal_thread	(semaphore_t semaphore,
-						 thread_act_t thread_act);
 
 extern	kern_return_t	semaphore_wait       	(semaphore_t semaphore);
+
+#ifdef	KERNEL
+
+#ifdef	__LP64__
+
+#ifdef	KERNEL_PRIVATE
+
+extern	kern_return_t	semaphore_timedwait    	(semaphore_t semaphore, 
+												 mach_timespec_t wait_time);
+
+#endif	/* KERNEL_PRIVATE */
+
+#else	/* __LP64__ */
+
+extern	kern_return_t	semaphore_timedwait    	(semaphore_t semaphore, 
+												 mach_timespec_t wait_time);
+
+#endif	/* __LP64__ */
+
+extern	kern_return_t	semaphore_wait_deadline	(semaphore_t semaphore,
+												 uint64_t deadline);
+extern	kern_return_t	semaphore_wait_noblock	(semaphore_t semaphore);
+
+#ifdef	XNU_KERNEL_PRIVATE
+
+extern  kern_return_t   semaphore_wait_signal   (semaphore_t wait_semaphore,
+                                                 semaphore_t signal_semaphore);
+
+extern  kern_return_t	semaphore_timedwait_signal(semaphore_t wait_semaphore,
+												   semaphore_t signal_semaphore,
+												   mach_timespec_t wait_time);
+
+extern	kern_return_t	semaphore_signal_thread	(semaphore_t semaphore,
+                                                 thread_t thread);
+
+#endif	/* XNU_KERNEL_PRIVATE */
+
+#else	/* KERNEL */
+
 extern	kern_return_t	semaphore_timedwait    	(semaphore_t semaphore, 
-						 mach_timespec_t wait_time);
+												 mach_timespec_t wait_time);
+
+extern  kern_return_t	semaphore_timedwait_signal(semaphore_t wait_semaphore,
+												   semaphore_t signal_semaphore,
+												   mach_timespec_t wait_time);
 
 extern  kern_return_t   semaphore_wait_signal   (semaphore_t wait_semaphore,
                                                  semaphore_t signal_semaphore);
 
-extern  kern_return_t semaphore_timedwait_signal(semaphore_t wait_semaphore,
-                                                 semaphore_t signal_semaphore,
-                                                 mach_timespec_t wait_time);
+extern	kern_return_t	semaphore_signal_thread	(semaphore_t semaphore,
+                                                 thread_t thread);
 
-#include <sys/appleapiopts.h>
+#endif	/* KERNEL */
 
-#ifdef  __APPLE_API_PRIVATE
-#ifdef  __APPLE_API_EVOLVING
+__END_DECLS
+
+#ifdef	PRIVATE
 
 #define SEMAPHORE_OPTION_NONE		0x00000000
 
@@ -87,14 +134,6 @@ extern  kern_return_t semaphore_timedwait_signal(semaphore_t wait_semaphore,
 #define SEMAPHORE_USE_SAVED_RESULT	0x01000000	/* internal use only */
 #define SEMAPHORE_SIGNAL_RELEASE	0x02000000	/* internal use only */
 
-extern  kern_return_t	semaphore_operator	(int options,
-						 semaphore_t wait_semaphore,
-						 semaphore_t signal_semaphore,
-						 thread_act_t thread,
-						 mach_timespec_t wait_time);
-
-#endif /* __APPLE_API_EVOLVING */
-
-#endif /* __APPLE_API_PRIVATE */
+#endif	/* PRIVATE */
 
-#endif /* _MACH_SEMAPHORE_H_ */
+#endif	/* _MACH_SEMAPHORE_H_ */