xnu-6153.141.1.tar.gz

[apple/xnu.git] / osfmk / device / device_init.c

diff --git a/osfmk/device/device_init.c b/osfmk/device/device_init.c
index 8bf42dbfaff5a39d7f2981bea492a2534be13b33..8b1fedd41154e8ba2b66df288b51655b48d7f29e 100644 (file)
--- a/osfmk/device/device_init.c
+++ b/osfmk/device/device_init.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2004 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
@@ -11,10 +11,10 @@
  * 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,
@@ -22,34 +22,34 @@
  * 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@
  */
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 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.
  */
@@ -57,9 +57,9 @@
  */
 /*
  *     Author: David B. Golub, Carnegie Mellon University
- *     Date:   8/89
+ *     Date:   8/89
  *
- *     Initialize device service as part of kernel task.
+ *      Initialize device service as part of kernel task.
  */
 
 #include <mach/mach_types.h>
@@ -79,7 +79,7 @@
 #include <device/device_types.h>
 #include <device/device_port.h>
 
-ipc_port_t     master_device_port;
+ipc_port_t      master_device_port;
 void           *master_device_kobject;
 
 lck_grp_attr_t * dev_lck_grp_attr;
@@ -90,17 +90,16 @@ lck_mtx_t iokit_obj_to_port_binding_lock;
 void
 device_service_create(void)
 {
-       master_device_port = ipc_port_alloc_kernel();
-       if (master_device_port == IP_NULL)
-           panic("can't allocate master device port");
+       master_device_port = ipc_kobject_alloc_port(
+               (ipc_kobject_t)&master_device_kobject, IKOT_MASTER_DEVICE,
+               IPC_KOBJECT_ALLOC_NONE);
 
-       ipc_kobject_set(master_device_port, (ipc_kobject_t)&master_device_kobject, IKOT_MASTER_DEVICE);
        kernel_set_special_port(host_priv_self(), HOST_IO_MASTER_PORT,
-                               ipc_port_make_send(master_device_port));
+           ipc_port_make_send(master_device_port));
 
        /* allocate device lock group attribute and group */
-       dev_lck_grp_attr= lck_grp_attr_alloc_init();
-       dev_lck_grp = lck_grp_alloc_init("device",  dev_lck_grp_attr);
+       dev_lck_grp_attr = lck_grp_attr_alloc_init();
+       dev_lck_grp = lck_grp_alloc_init("device", dev_lck_grp_attr);
 
        /* Allocate device lock attribute */
        dev_lck_attr = lck_attr_alloc_init();