Justus Winter, le Fri 11 Apr 2014 09:39:45 +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. > * boot/Makefile: Remove the ourdevice hack. > * boot/boot.c: Adjust the include accordingly. > --- > boot/Makefile | 6 +----- > boot/boot.c | 2 +- > 2 files changed, 2 insertions(+), 6 deletions(-) > > diff --git a/boot/Makefile b/boot/Makefile > index 0d883b0..2d52f3f 100644 > --- a/boot/Makefile > +++ b/boot/Makefile > @@ -20,7 +20,7 @@ makemode := utility > > SRCS = mach-crt0.c boot.c ux.c sigvec.S syscall.S \ > boot_script.c userland-boot.c > -COMMON-OBJS = notifyServer.o ourdeviceServer.o \ > +COMMON-OBJS = notifyServer.o deviceServer.o \ > ioServer.o io_replyUser.o device_replyUser.o \ > termServer.o bootstrapServer.o boot_script.o userland-boot.o > OBJS = boot.o $(COMMON-OBJS) > @@ -39,10 +39,6 @@ include ../Makeconf > > all: boot # uxboot > > -ourdevice.defs: device.defs > - $(CPP) $(CPPFLAGS) -x c $< | sed -e '/out[ ]*device[ ]*:[ > ]*device_t/s/device_t/mach_port_send_t/' > $@ > - > - > uxboot.o: boot.c > $(COMPILE.c) -DUX $< -o $@ > > diff --git a/boot/boot.c b/boot/boot.c > index 0dbe1c2..ed29014 100644 > --- a/boot/boot.c > +++ b/boot/boot.c > @@ -42,7 +42,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA > 02139, USA. */ > #include <version.h> > > #include "notify_S.h" > -#include "ourdevice_S.h" > +#include "device_S.h" > #include "io_S.h" > #include "device_reply_U.h" > #include "io_reply_U.h" > -- > 1.9.1 > -- Samuel Je suis maintenant possesseur d'un ordinateur portable Compaq Armada 1592DT avec port infra-rouge. Auriez-vous connaissance de programmes suceptibles d'utiliser ce port afin de servir de télécommande ? -+- JN in NPC : ben quoi, c'est pas à ça que ça sert ?
