Re: [PATCH 1/8] devnode: remove the ourdevice hack

[Samuel Thibault]

Justus Winter, le Fri 11 Apr 2014 23:09:51 +0200, a écrit :
> 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.

Ack.

> * devnode/Makefile: Remove the ourdevice hack that changes
> device_t to mach_port_send_t.
> * devnode/devnode.c: Likewise.
> ---
>  devnode/Makefile  | 7 ++-----
>  devnode/devnode.c | 2 +-
>  2 files changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/devnode/Makefile b/devnode/Makefile
> index 2c8af58..05b5801 100644
> --- a/devnode/Makefile
> +++ b/devnode/Makefile
> @@ -20,14 +20,11 @@ makemode := server
>  
>  SRCS = devnode.c
>  LCLHDRS = util.h
> -DIST_FILES = ourdevice.defs notify.defs
> +DIST_FILES = device.defs notify.defs
>  HURDLIBS = ports trivfs fshelp shouldbeinlibc
>  target = devnode
> -MIGSTUBS = ourdeviceServer.o notifyServer.o
> +MIGSTUBS = deviceServer.o notifyServer.o
>  MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h
>  OBJS = $(SRCS:.c=.o) $(MIGSTUBS)
>  
>  include ../Makeconf
> -
> -ourdevice.defs: device.defs
> -     $(CPP) $(CPPFLAGS) -x c $< | sed -e '/out[      ]*device[       ]*:[    
> ]*device_t/s/device_t/mach_port_send_t/' > $@
> diff --git a/devnode/devnode.c b/devnode/devnode.c
> index 61fc509..101675d 100644
> --- a/devnode/devnode.c
> +++ b/devnode/devnode.c
> @@ -36,7 +36,7 @@
>  #include <hurd/trivfs.h>
>  #include <hurd/ports.h>
>  
> -#include "ourdevice_S.h"
> +#include "device_S.h"
>  #include "notify_S.h"
>  #include "util.h"
>  
> -- 
> 1.9.1
> 

-- 
Samuel
"...Unix, MS-DOS, and Windows NT (also known as the Good, the Bad, and
the Ugly)."
(By Matt Welsh)