xnu-1504.15.3.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 db8fe7a581521f41e59d6049fd4dfad8ff0071df..05e76bc0e6d52c33a58cfeb4cd69e6204dc8da9f 100644 (file)
--- a/osfmk/device/device_init.c
+++ b/osfmk/device/device_init.c
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_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 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.

  * 
  * 

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

  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -55,10 +61,21 @@
  *
  *     Initialize device service as part of kernel task.
  */
  *
  *     Initialize device service as part of kernel task.
  */

+
+#include <mach/mach_types.h>
+#include <mach/port.h>
+
+#include <ipc/ipc_types.h>

 #include <ipc/ipc_port.h>
 #include <ipc/ipc_space.h>
 #include <ipc/ipc_port.h>
 #include <ipc/ipc_space.h>

+
+#include <kern/kern_types.h>
+#include <kern/host.h>
+#include <kern/ipc_kobject.h>
+#include <kern/startup.h>

 #include <kern/task.h>
 #include <kern/misc_protos.h>
 #include <kern/task.h>
 #include <kern/misc_protos.h>

+

 #include <device/device_types.h>
 #include <device/device_port.h>
 
 #include <device/device_types.h>
 #include <device/device_port.h>
 


@@ -72,8 +89,8 @@ device_service_create(void)
            panic("can't allocate master device port");
 
        ipc_kobject_set(master_device_port, 1, IKOT_MASTER_DEVICE);
            panic("can't allocate master device port");
 
        ipc_kobject_set(master_device_port, 1, IKOT_MASTER_DEVICE);

-       host_set_io_master(host_priv_self(),
-                          ipc_port_make_send(master_device_port));
+       kernel_set_special_port(host_priv_self(), HOST_IO_MASTER_PORT,
+                               ipc_port_make_send(master_device_port));

 
 #if 0
        ds_init();
 
 #if 0
        ds_init();