--- Gnu-Mach/device/device_init.c	2020/09/02 04:36:57	1.1
+++ Gnu-Mach/device/device_init.c	2020/09/02 04:47:52	1.1.1.3
@@ -31,42 +31,35 @@
  */
 #include <ipc/ipc_port.h>
 #include <ipc/ipc_space.h>
+#include <kern/debug.h>
 #include <kern/task.h>
+#include <xen/xen.h>
 
 #include <device/device_types.h>
 #include <device/device_port.h>
+#include <device/tty.h>
+#include <device/ds_routines.h>
+#include <device/net_io.h>
+#include <device/chario.h>
 
 
-
-extern void	ds_init();
-extern void	dev_lookup_init();
-extern void	net_io_init();
-extern void	device_pager_init();
-extern void	chario_init(void);
-#ifdef FIPC
-extern void 	fipc_init();
-#endif
-
-extern void	io_done_thread();
-extern void	net_thread();
-
 ipc_port_t	master_device_port;
 
 void
-device_service_create()
+device_service_create(void)
 {
 	master_device_port = ipc_port_alloc_kernel();
 	if (master_device_port == IP_NULL)
 	    panic("can't allocate master device port");
 
-	ds_init();
+	mach_device_init();
+#ifdef MACH_HYP
+	hyp_dev_init();
+#endif
 	dev_lookup_init();
 	net_io_init();
 	device_pager_init();
 	chario_init();
-#ifdef FIPC
-	fipc_init();
-#endif
 
 	(void) kernel_thread(kernel_task, io_done_thread, 0);
 	(void) kernel_thread(kernel_task, net_thread, 0);