xnu-4903.221.2.tar.gz

[apple/xnu.git] / osfmk / kern / mk_timer.h

diff --git a/osfmk/kern/mk_timer.h b/osfmk/kern/mk_timer.h
index e630fdbe9a21870e24aa934c76c83a2d556da3f7..56904a9b3cffa85ca7505967a2af24a83e8daf07 100644 (file)
--- a/osfmk/kern/mk_timer.h
+++ b/osfmk/kern/mk_timer.h
@@ -1,16 +1,19 @@
 /*
  * 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
@@ -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@
  */
 /*
  * Copyright (c) 2000 Apple Computer, Inc.  All rights reserved.
@@ -37,13 +40,12 @@
 #ifdef MACH_KERNEL_PRIVATE
 #include <mach/mach_types.h>
 
-#include <kern/call_entry.h>
+#include <kern/thread_call.h>
 
 struct mk_timer {
-       decl_simple_lock_data(,lock)
-       call_entry_data_t       call_entry;
-       uint64_t                        time_of_arming;
-       boolean_t                       is_dead:1,
+       decl_simple_lock_data(,lock);
+       thread_call_data_t              call_entry;
+       uint32_t                        is_dead:1,
                                                is_armed:1;
        int                                     active;
        ipc_port_t                      port;
@@ -54,7 +56,7 @@ typedef struct mk_timer               *mk_timer_t, mk_timer_data_t;
 void           mk_timer_port_destroy(
                                ipc_port_t                              port);
 
-void           mk_timer_initialize(void);
+void           mk_timer_init(void);
 
 #endif /* MACH_KERNEL_PRIVATE */