xnu-517.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 3ac2e415ccea0502bb720215b50032ad9d77f5da..20d008c85149e4d34d603f8df668f2e617493ed3 100644 (file)
--- a/osfmk/kern/mk_timer.h
+++ b/osfmk/kern/mk_timer.h
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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.
+ * 
+ * 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,
  * 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_LICENSE_HEADER_END@
  */


@@ -40,7 +43,7 @@ struct mk_timer {
        decl_simple_lock_data(,lock)
        call_entry_data_t       call_entry;
        uint64_t                        time_of_arming;
        decl_simple_lock_data(,lock)
        call_entry_data_t       call_entry;
        uint64_t                        time_of_arming;

-       boolean_t                       is_dead:1,
+       uint32_t                        is_dead:1,

                                                is_armed:1;
        int                                     active;
        ipc_port_t                      port;
                                                is_armed:1;
        int                                     active;
        ipc_port_t                      port;


@@ -51,7 +54,7 @@ typedef struct mk_timer               *mk_timer_t, mk_timer_data_t;
 void           mk_timer_port_destroy(
                                ipc_port_t                              port);
 
 void           mk_timer_port_destroy(
                                ipc_port_t                              port);
 

-void           mk_timer_initialize(void);
+void           mk_timer_init(void);

 
 #endif /* MACH_KERNEL_PRIVATE */
 
 
 #endif /* MACH_KERNEL_PRIVATE */