xnu-7195.60.75.tar.gz

[apple/xnu.git] / osfmk / kern / ipc_clock.c

diff --git a/osfmk/kern/ipc_clock.c b/osfmk/kern/ipc_clock.c
index a8524dbe5e6be5c3f8289d9589069a8cd9770de7..58c5a73877157a23a123bca9fef702b8bdeffbd5 100644 (file)
--- a/osfmk/kern/ipc_clock.c
+++ b/osfmk/kern/ipc_clock.c
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @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.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * @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. 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,
  * 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.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * 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_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -47,18 +53,20 @@
  */
 void
 ipc_clock_init(
-       clock_t         clock)
+       clock_t         clock)
 {
-       ipc_port_t      port;
+       ipc_port_t      port;
 
        port = ipc_port_alloc_kernel();
-       if (port == IP_NULL)
+       if (port == IP_NULL) {
                panic("ipc_clock_init");
+       }
        clock->cl_service = port;
 
        port = ipc_port_alloc_kernel();
-       if (port == IP_NULL)
+       if (port == IP_NULL) {
                panic("ipc_clock_init");
+       }
        clock->cl_control = port;
 }
 
@@ -69,12 +77,12 @@ ipc_clock_init(
  */
 void
 ipc_clock_enable(
-       clock_t         clock)
+       clock_t         clock)
 {
        ipc_kobject_set(clock->cl_service,
-                       (ipc_kobject_t) clock, IKOT_CLOCK);
+           (ipc_kobject_t) clock, IKOT_CLOCK);
        ipc_kobject_set(clock->cl_control,
-                       (ipc_kobject_t) clock, IKOT_CLOCK_CTRL);
+           (ipc_kobject_t) clock, IKOT_CLOCK_CTRL);
 }
 
 /*
@@ -88,20 +96,20 @@ ipc_clock_enable(
  */
 clock_t
 convert_port_to_clock(
-       ipc_port_t      port)
+       ipc_port_t      port)
 {
-       clock_t         clock = CLOCK_NULL;
+       clock_t         clock = CLOCK_NULL;
 
        if (IP_VALID(port)) {
                ip_lock(port);
                if (ip_active(port) &&
                    ((ip_kotype(port) == IKOT_CLOCK) ||
-                    (ip_kotype(port) == IKOT_CLOCK_CTRL))) {
-                       clock = (clock_t) port->ip_kobject;
+                   (ip_kotype(port) == IKOT_CLOCK_CTRL))) {
+                       clock = (clock_t)ip_get_kobject(port);
                }
                ip_unlock(port);
        }
-       return (clock);
+       return clock;
 }
 
 /*
@@ -115,19 +123,19 @@ convert_port_to_clock(
  */
 clock_t
 convert_port_to_clock_ctrl(
-       ipc_port_t      port)
+       ipc_port_t      port)
 {
-       clock_t         clock = CLOCK_NULL;
+       clock_t         clock = CLOCK_NULL;
 
        if (IP_VALID(port)) {
                ip_lock(port);
                if (ip_active(port) &&
                    (ip_kotype(port) == IKOT_CLOCK_CTRL)) {
-                       clock = (clock_t) port->ip_kobject;
+                       clock = (clock_t) ip_get_kobject(port);
                }
                ip_unlock(port);
        }
-       return (clock);
+       return clock;
 }
 
 /*
@@ -140,12 +148,12 @@ convert_port_to_clock_ctrl(
  */
 ipc_port_t
 convert_clock_to_port(
-       clock_t         clock)
+       clock_t         clock)
 {
-       ipc_port_t      port;
+       ipc_port_t      port;
 
        port = ipc_port_make_send(clock->cl_service);
-       return (port);
+       return port;
 }
 
 /*
@@ -158,12 +166,12 @@ convert_clock_to_port(
  */
 ipc_port_t
 convert_clock_ctrl_to_port(
-       clock_t         clock)
+       clock_t         clock)
 {
-       ipc_port_t      port;
+       ipc_port_t      port;
 
        port = ipc_port_make_send(clock->cl_control);
-       return (port);
+       return port;
 }
 
 /*
@@ -175,17 +183,20 @@ clock_t
 port_name_to_clock(
        mach_port_name_t clock_name)
 {
-       clock_t         clock = CLOCK_NULL;
-       ipc_space_t     space;
-       ipc_port_t      port;
+       clock_t         clock = CLOCK_NULL;
+       ipc_space_t     space;
+       ipc_port_t      port;
 
-       if (clock_name == 0)
-               return (clock);
+       if (clock_name == 0) {
+               return clock;
+       }
        space = current_space();
-       if (ipc_port_translate_send(space, clock_name, &port) != KERN_SUCCESS)
-               return (clock);
-       if (ip_active(port) && (ip_kotype(port) == IKOT_CLOCK))
-               clock = (clock_t) port->ip_kobject;
+       if (ipc_port_translate_send(space, clock_name, &port) != KERN_SUCCESS) {
+               return clock;
+       }
+       if (ip_kotype(port) == IKOT_CLOCK) {
+               clock = (clock_t) ip_get_kobject(port);
+       }
        ip_unlock(port);
-       return (clock);
+       return clock;
 }