X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/43866e378188c25dd1e2208016ab3cbeb086ae6c..bca245acd4c03fd752d1a45f011ad495e60fe53d:/osfmk/mach/time_value.h?ds=sidebyside

diff --git a/osfmk/mach/time_value.h b/osfmk/mach/time_value.h
index 3bc09a77b..8cfd37d74 100644
--- a/osfmk/mach/time_value.h
+++ b/osfmk/mach/time_value.h
@@ -1,17 +1,20 @@
 /*
  * Copyright (c) 2000 Apple Computer, 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -19,42 +22,40 @@
  * 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@
  */
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
 
-#ifndef	TIME_VALUE_H_
-#define	TIME_VALUE_H_
-
-#include <sys/appleapiopts.h>
+#ifndef _MACH_TIME_VALUE_H_
+#define _MACH_TIME_VALUE_H_
 
 #include <mach/machine/vm_types.h>
 
@@ -66,52 +67,30 @@ struct time_value {
 	integer_t seconds;
 	integer_t microseconds;
 };
-typedef	struct time_value	time_value_t;
 
-#ifdef	__APPLE_API_UNSTABLE
+typedef struct time_value       time_value_t;
 
 /*
  *	Macros to manipulate time values.  Assume that time values
  *	are normalized (microseconds <= 999999).
  */
-#define	TIME_MICROS_MAX	(1000000)
+#define TIME_MICROS_MAX (1000000)
 
-#define	time_value_add_usec(val, micros)	{	\
-	if (((val)->microseconds += (micros))		\
-		>= TIME_MICROS_MAX) {			\
-	    (val)->microseconds -= TIME_MICROS_MAX;	\
-	    (val)->seconds++;				\
-	}						\
+#define time_value_add_usec(val, micros)        {       \
+	if (((val)->microseconds += (micros))           \
+	        >= TIME_MICROS_MAX) {                   \
+	    (val)->microseconds -= TIME_MICROS_MAX;     \
+	    (val)->seconds++;                           \
+	}                                               \
 }
 
-#define	time_value_add(result, addend)		{		\
-	(result)->microseconds += (addend)->microseconds;	\
-	(result)->seconds += (addend)->seconds;			\
-	if ((result)->microseconds >= TIME_MICROS_MAX) {	\
-	    (result)->microseconds -= TIME_MICROS_MAX;		\
-	    (result)->seconds++;				\
-	}							\
+#define time_value_add(result, addend)          {               \
+	(result)->microseconds += (addend)->microseconds;       \
+	(result)->seconds += (addend)->seconds;                 \
+	if ((result)->microseconds >= TIME_MICROS_MAX) {        \
+	    (result)->microseconds -= TIME_MICROS_MAX;          \
+	    (result)->seconds++;                                \
+	}                                                       \
 }
 
-#endif	/* __APPLE_API_UNSTABLE */
-
-#ifdef	__APPLE_API_OBSOLETE
-
-/*
- *	Time value available through the mapped-time interface.
- *	Read this mapped value with
- *		do {
- *			secs = mtime->seconds;
- *			usecs = mtime->microseconds;
- *		} while (secs != mtime->check_seconds);
- */
-
-typedef struct mapped_time_value {
-	integer_t seconds;
-	integer_t microseconds;
-	integer_t check_seconds;
-} mapped_time_value_t;
-
-#endif	/* __APPLE_API_OBSOLETE */
-
-#endif	/* TIME_VALUE_H_ */
+#endif  /* _MACH_TIME_VALUE_H_ */