--- Gnu-Mach/include/device/device_reply.defs	2020/09/02 04:36:57	1.1
+++ Gnu-Mach/include/device/device_reply.defs	2020/09/02 04:48:05	1.1.1.3
@@ -1,25 +1,25 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -51,16 +51,22 @@ userprefix	ds_;
 #if	SEQNOS
 serverprefix seqnos_;
 serverdemux seqnos_device_reply_server;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 
 type reply_port_t = polymorphic|MACH_MSG_TYPE_PORT_SEND_ONCE
-	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 */
+;
 
 simpleroutine	device_open_reply(
 	    reply_port		: reply_port_t;
 #if	SEQNOS
 	msgseqno seqno		: mach_port_seqno_t;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 	in  return_code		: kern_return_t;
 	in  device_port		: mach_port_make_send_t
 	);
@@ -71,7 +77,7 @@ simpleroutine	device_write_reply(
 	    reply_port		: reply_port_t;
 #if	SEQNOS
 	msgseqno seqno		: mach_port_seqno_t;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 	in  return_code		: kern_return_t;
 	in  bytes_written	: int
 	);
@@ -80,7 +86,7 @@ simpleroutine	device_write_reply_inband(
 	    reply_port		: reply_port_t;
 #if	SEQNOS
 	msgseqno seqno		: mach_port_seqno_t;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 	in  return_code		: kern_return_t;
 	in  bytes_written	: int
 	);
@@ -89,7 +95,7 @@ simpleroutine	device_read_reply(
 	    reply_port		: reply_port_t;
 #if	SEQNOS
 	msgseqno seqno		: mach_port_seqno_t;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 	in  return_code		: kern_return_t;
 	in  data		: io_buf_ptr_t, dealloc
 	);
@@ -98,7 +104,7 @@ simpleroutine	device_read_reply_inband(
 	    reply_port		: reply_port_t;
 #if	SEQNOS
 	msgseqno seqno		: mach_port_seqno_t;
-#endif	SEQNOS
+#endif	/* SEQNOS */
 	in  return_code		: kern_return_t;
 	in  data		: io_buf_ptr_inband_t
 	);