--- Gnu-Mach/include/device/device.defs	2020/09/02 04:45:36	1.1.1.2
+++ Gnu-Mach/include/device/device.defs	2020/09/02 04:48:05	1.1.1.3
@@ -45,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(