From d426acfa7e141ce1546b2d09cd9dd098e5e6c5e7 Mon Sep 17 00:00:00 2001
From: Justus Winter <4winter@informatik.uni-hamburg.de>
Date: Fri, 11 Apr 2014 14:43:36 +0200
Subject: libmachdev: fix receiver lookups

Previously, the device definitions were filtered using sed to replace
the device_t type with mach_port_send_t to make the device argument of
device_open polymorphic.  Rather than doing that, which makes it
impossible to use translation functions, the definition of device_open
has been amended.

* libmachdev/Makefile: Remove ourdevice hack that changes
device_t to mach_port_send_t.
* libmachdev/device.defs (device_open): Make the device parameter
polymorphic like it was done in gnumach.
* libmachdev/ds_routines.c (port_bucket): Drop static qualifier so
that it can be used in the intrans function.
(dev_class): Likewise.
(ds_*): Fix all device_t receiver lookups.
* libmachdev/mig-decls.h: New file.
* libmachdev/mig-mutate.h: Add mutators.
---
 libmachdev/Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'libmachdev/Makefile')

diff --git a/libmachdev/Makefile b/libmachdev/Makefile
index e0064610..a47bf325 100644
--- a/libmachdev/Makefile
+++ b/libmachdev/Makefile
@@ -20,7 +20,7 @@ makemode := library
 libname = libmachdev
 
 SRCS = deviceUser.c machUser.c net.c ds_routines.c queue.c trivfs_server.c \
-       device_replyUser.c ourdeviceServer.c notifyServer.c misc.c block.c
+       device_replyUser.c deviceServer.c notifyServer.c misc.c block.c
 LCLHDRS = dev_hdr.h device_emul.h ds_routines.h vm_param.h \
 	  util.h queue.h io_req.h if_ether.h machdev.h linux-errno.h \
 	  errno-base.h
@@ -32,8 +32,5 @@ MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h
 
 include ../Makeconf
 
-ourdevice.defs: device.defs
-	$(CPP) $(CPPFLAGS) -x c $< | sed -e '/out[ 	]*device[ 	]*:[ 	]*device_t/s/device_t/mach_port_send_t/' > $@
-
 $(libname).so.$(hurd-version):
 	echo "INPUT ( $(libname).a )" > $@
-- 
cgit v1.2.3