diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-04-10 18:48:14 +0200 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-04-12 09:52:09 +0200 |
| commit | 41da689280091dcabd153b77627818b0a89645bf (patch) | |
| tree | faadcb61de079b61dea81d2f4e8871e31048a70e | |
| parent | d49d0ac8d97e30a9b3a9140af6e9f402d39654c2 (diff) | |
boot: remove the ourdevice hack
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.
* boot/Makefile: Remove the ourdevice hack.
* boot/boot.c: Adjust the include accordingly.
| -rw-r--r-- | boot/Makefile | 6 | ||||
| -rw-r--r-- | boot/boot.c | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/boot/Makefile b/boot/Makefile index 0d883b06..2d52f3ff 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 0dbe1c20..ed290148 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" |