fixup dde pp series

1 files changed, 193 insertions, 0 deletions

diff --git a/debian/patches/dde-protected-payloads.patch b/debian/patches/dde-protected-payloads.patch
index ec47b43f..27c57bde 100644
--- a/debian/patches/dde-protected-payloads.patch
+++ b/debian/patches/dde-protected-payloads.patch
@@ -556,6 +556,199 @@ index 2403c29..55eca31 100644
  #define DEVICE_DESTRUCTOR					\
    end_using_device (vether_device_t)
  #define DEVICE_IMPORTS						\
+diff --git a/libmachdev/Makefile b/libmachdev/Makefile
+index a47bf32..734824e 100644
+--- a/libmachdev/Makefile
++++ b/libmachdev/Makefile
+@@ -29,6 +29,7 @@ HURDLIBS = ports trivfs ddekit bpf
+ OTHERLIBS = -lpthread
+ OBJS = $(SRCS:.c=.o) $(MIGSTUBS)
+ MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h
++device-MIGSFLAGS="-DMACH_PAYLOAD_TO_PORT=ports_payload_get_name"
+ 
+ include ../Makeconf
+ 
+diff --git a/libmachdev/device.defs b/libmachdev/device.defs
+deleted file mode 100644
+index 5c16a37..0000000
+--- a/libmachdev/device.defs
++++ /dev/null
+@@ -1,175 +0,0 @@
+-/* 
+- * 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.
+- */
+-/*
+- * File:	device/device.defs
+- * Author:	Douglas Orr
+- *		Feb 10, 1988
+- * Abstract:
+- *	Mach device support.  Mach devices are accessed through
+- *	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
+-#endif
+-		       device 2800;
+-
+-#include <mach/std_types.defs>
+-#include <mach/mach_types.defs>
+-#include <device/device_types.defs>
+-
+-serverprefix	ds_;
+-
+-type reply_port_t = MACH_MSG_TYPE_MAKE_SEND_ONCE | polymorphic
+-	ctype: mach_port_t;
+-
+-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 =
+-					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(
+-		device		: device_t
+-	);
+-
+-routine device_write(
+-		device		: device_t;
+-	sreplyport reply_port	: reply_port_t;
+-	in	mode		: dev_mode_t;
+-	in	recnum		: recnum_t;
+-	in	data		: io_buf_ptr_t;
+-	out	bytes_written	: int
+-	);
+-
+-routine device_write_inband(
+-		device		: device_t;
+-	sreplyport reply_port	: reply_port_t;
+-	in	mode		: dev_mode_t;
+-	in	recnum		: recnum_t;
+-	in	data		: io_buf_ptr_inband_t;
+-	out	bytes_written	: int
+-	);
+-
+-routine	device_read(
+-		device		: device_t;
+-	sreplyport reply_port	: reply_port_t;
+-	in	mode		: dev_mode_t;
+-	in	recnum		: recnum_t;
+-	in	bytes_wanted	: int;
+-	out	data		: io_buf_ptr_t
+-	);
+-
+-routine	device_read_inband(
+-		device		: device_t;
+-	sreplyport reply_port	: reply_port_t;
+-	in	mode		: dev_mode_t;
+-	in	recnum		: recnum_t;
+-	in	bytes_wanted	: int;
+-	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
+-	);
+-
+-routine device_map(
+-		device		: device_t;
+-	in	prot		: vm_prot_t;
+-	in	offset		: vm_offset_t;
+-	in	size		: vm_size_t;
+-	out	pager		: memory_object_t;
+-	in	unmap		: int
+-	);
+-
+-routine	device_set_status(
+-		device		: device_t;
+-	in	flavor		: dev_flavor_t;
+-	in	status		: dev_status_t
+-	);
+-
+-routine	device_get_status(
+-		device		: device_t;
+-	in	flavor		: dev_flavor_t;
+-	out	status		: dev_status_t, CountInOut
+-	);
+-
+-routine device_set_filter(
+-		device		: device_t;
+-	in	receive_port	: mach_port_send_t;
+-	in	priority	: int;
+-	in	filter		: filter_array_t
+-	);
+-
+-routine device_intr_register(
+-		master_port	: mach_port_t;
+-	in	line		: int;
+-	in	id		: int;
+-	in	flags		: int;
+-	in	receive_port	: mach_port_send_t
+-	);
+-
+-/*
+- *	enable/disable the specified line.
+- */
+-routine device_intr_enable(
+-		master_port	: mach_port_t;
+-		line		: int;
+-		status		: char);
 diff --git a/libmachdev/ds_routines.c b/libmachdev/ds_routines.c
 index 6bd5a12..5287bf4 100644
 --- a/libmachdev/ds_routines.c