From 4a30056e280dc695827f14892de2aa1bbd4298a8 Mon Sep 17 00:00:00 2001 From: Justus Winter <4winter@informatik.uni-hamburg.de> Date: Fri, 21 Nov 2014 14:00:12 +0100 Subject: fix dde pp patch --- debian/patches/dde-protected-payloads.patch | 213 ---------------------------- 1 file changed, 213 deletions(-) (limited to 'debian/patches') diff --git a/debian/patches/dde-protected-payloads.patch b/debian/patches/dde-protected-payloads.patch index 58fbe8fc..ec47b43f 100644 --- a/debian/patches/dde-protected-payloads.patch +++ b/debian/patches/dde-protected-payloads.patch @@ -55,38 +55,6 @@ index f692236..0656014 100644 #define NOTIFY_DESTRUCTOR \ end_using_port_info (port_info_t) #define NOTIFY_IMPORTS \ -diff --git a/eth-filter.multi-thread/filter.c b/eth-filter.multi-thread/filter.c -index ec3efe9..5a6d589 100644 ---- a/eth-filter.multi-thread/filter.c -+++ b/eth-filter.multi-thread/filter.c -@@ -315,27 +315,6 @@ do_mach_notify_dead_name (mach_port_t notify, - } - - /* Implementation of device interface */ --kern_return_t --ds_xxx_device_set_status (device_t device, dev_flavor_t flavor, -- dev_status_t status, size_t statu_cnt) --{ -- return D_INVALID_OPERATION; --} -- --kern_return_t --ds_xxx_device_get_status (device_t device, dev_flavor_t flavor, -- dev_status_t status, size_t *statuscnt) --{ -- return D_INVALID_OPERATION; --} -- --kern_return_t --ds_xxx_device_set_filter (device_t device, mach_port_t rec, -- int pri, filter_array_t filt, size_t len) --{ -- return D_INVALID_OPERATION; --} -- - kern_return_t - ds_device_open (mach_port_t master_port, mach_port_t reply_port, - mach_msg_type_name_t reply_portPoly, diff --git a/eth-filter/filter.c b/eth-filter/filter.c index 482b080..13dd03b 100644 --- a/eth-filter/filter.c @@ -588,187 +556,6 @@ index 2403c29..55eca31 100644 #define DEVICE_DESTRUCTOR \ end_using_device (vether_device_t) #define DEVICE_IMPORTS \ -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 ; /* for obsolete routines */ --#endif -- --subsystem --#if KERNEL_SERVER -- KernelServer --#endif -- device 2800; -- --#include --#include --#include -- --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 -- cgit v1.2.3