--- Gnu-Mach/device/device_init.c	2020/09/02 04:36:57	1.1.1.1
+++ Gnu-Mach/device/device_init.c	2020/09/02 04:45:31	1.1.1.2
@@ -31,21 +31,19 @@
  */
 #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>
 
 
-
-extern void	ds_init();
+extern void	mach_device_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();
@@ -59,14 +57,14 @@ device_service_create()
 	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);