--- Gnu-Mach/include/device/device.defs	2020/09/02 04:36:57	1.1
+++ Gnu-Mach/include/device/device.defs	2020/09/02 04:48:05	1.1.1.3
@@ -32,10 +32,6 @@
  *	block and character device interfaces to the kernel.
  */
 
-#ifdef	MACH_KERNEL
-simport <kern/compat_xxx_defs.h>;	/* for obsolete routines */
-#endif
-
 subsystem
 #if	KERNEL_SERVER
 	  KernelServer
@@ -49,14 +45,29 @@ subsystem
 serverprefix	ds_;
 
 type reply_port_t = MACH_MSG_TYPE_MAKE_SEND_ONCE | polymorphic
-	ctype: mach_port_t;
+	ctype: mach_port_t
+#ifndef	KERNEL_SERVER
+#ifdef	MACH_PAYLOAD_TO_PORT
+		intranpayload: mach_port_t MACH_PAYLOAD_TO_PORT
+#endif	/* MACH_PAYLOAD_TO_PORT */
+#endif	/* KERNEL_SERVER */
+;
 
 routine device_open(
 		master_port	: mach_port_t;
 	sreplyport reply_port	: reply_port_t;
 		mode		: dev_mode_t;
 		name		: dev_name_t;
-	out	device		: device_t
+	out	device		: device_t =
+					MACH_MSG_TYPE_PORT_SEND
+					ctype: mach_port_t
+#if	KERNEL_SERVER
+		outtran: mach_port_t convert_device_to_port(device_t)
+#else
+#ifdef	DEVICE_OUTTRAN
+		outtran: DEVICE_OUTTRAN
+#endif
+#endif	/* KERNEL_SERVER */
 	);
 
 routine device_close(
@@ -99,27 +110,9 @@ routine	device_read_inband(
 	out	data		: io_buf_ptr_inband_t
 	);
 
-/* obsolete */
-routine	xxx_device_set_status(
-		device		: device_t;
-	in	flavor		: dev_flavor_t;
-	in	status		: dev_status_t, IsLong
-	);
-
-/* obsolete */
-routine	xxx_device_get_status(
-		device		: device_t;
-	in	flavor		: dev_flavor_t;
-	out	status		: dev_status_t, IsLong
-	);
-
-/* obsolete */
-routine xxx_device_set_filter(
-		device		: device_t;
-	in	receive_port	: mach_port_send_t;
-	in	priority	: int;
-	in	filter		: filter_array_t, IsLong
-	);
+skip;	/* old xxx_device_set_status */
+skip;	/* old xxx_device_get_status */
+skip;	/* old xxx_device_set_filter*/
 
 routine device_map(
 		device		: device_t;