aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mach/Makefile30
-rw-r--r--mach/bootprivport.c64
2 files changed, 18 insertions, 76 deletions
diff --git a/mach/Makefile b/mach/Makefile
index f13c285fd9..674250c9ad 100644
--- a/mach/Makefile
+++ b/mach/Makefile
@@ -36,29 +36,34 @@ routines = $(mach-syscalls) $(mach-shortcuts) \
mig-alloc mig-dealloc mig-reply \
msg-destroy msgserver \
mach_error errstring error_compat errsystems \
- devstream bootprivport setup-thread $(lock)
+ devstream setup-thread $(lock)
+
# The RPC interfaces go in a separate library.
interface-library := libmachuser
-user-interfaces := $(addprefix mach/,mach_interface mach_port mach_host \
- memory_object_user \
- memory_object_default \
- exc mach4 \
- default_pager \
- )\
- $(addprefix device/,device device_request)
+
# We produce mach_interface.h from mach.defs because there is already a
# <mach/mach.h> that is not the interface header (thanks CMU).
+mach-interface-list := $(patsubst mach,mach_interface,$(mach-interface-list))
mach/mach_interface.defs = mach/mach.defs
+
# Similarly for memory_object_user vs. memory_object
+mach-interface-list := $(patsubst memory_object,memory_object_user,\
+ $(mach-interface-list))
mach/memory_object_user.defs = mach/memory_object.defs
+
+user-interfaces := $(addprefix mach/,$(mach-interface-list) \
+ mach_port mach_host exc \
+ )\
+ $(addprefix device/,device device_request)
+
server-interfaces := mach/exc
+
# It is important that we do not use the wildcard function to expand
# `err_*.sub'. Leaving the wildcard allows Make-dist to find all matching
# files in all sysdep directories.
distribute += Machrules syscalls.awk shortcut.awk \
errorlib.h err_*.sub errsystems.awk
-
# Clear any environment value.
generated =
@@ -103,7 +108,7 @@ ifndef mach-shortcuts
# Forget about mach_interface.defs for this run. On the next run,
# $(mach-shortcuts) will be set, and that will change how
# mach_interface.defs is processed: it will get the -D flags below.
-user-interfaces := $(filter-out mach/mach_interface \
+user-interfaces := $(filter-out $(mach-interface-list:%=mach/%) \
mach/mach_port mach/mach_host mach/mach4 \
device/device_request,\
$(user-interfaces))
@@ -114,7 +119,8 @@ MIGFLAGS-mach/mach4=-DMACH_PCSAMPLE
# Make the MiG stubs for $(mach-shortcuts) be CALL_rpc.
migdefines += $(foreach call,$(mach-shortcuts),-D$(call)=$(call)_rpc)
-mach/mach_interface.uh mach/mach_host.uh mach/mach_port.uh: $(objpfx)mach-syscalls.mk
+$(mach-interface-list:%=mach/%.uh) \
+ mach/mach_host.uh mach/mach_port.uh: $(objpfx)mach-syscalls.mk
ifdef mach-shortcuts
$(mach-shortcuts:%=$(objpfx)%.c): $(objpfx)%.c: shortcut.awk \
@@ -127,7 +133,7 @@ endif # mach-shortcuts
# Generate mach-shortcuts.h, which will contain the prototypes for the
# shortcutted kernel RPC functions.
-$(objpfx)mach-shortcuts.h: $(objpfx)mach/mach_interface.h \
+$(objpfx)mach-shortcuts.h: $(mach-interface-list:%=$(objpfx)mach/%.h) \
$(objpfx)mach/mach_host.h \
$(objpfx)mach/mach_port.h
# The first line gets us one paragraph per line, with @s separating real lines.
diff --git a/mach/bootprivport.c b/mach/bootprivport.c
deleted file mode 100644
index 7114caa95f..0000000000
--- a/mach/bootprivport.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright (C) 1993, 1997 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#include <mach.h>
-
-kern_return_t
-__mach_get_priv_ports (mach_port_t *host_priv_ptr,
- mach_port_t *device_master_ptr)
-{
- kern_return_t err;
- mach_port_t bootstrap, reply;
-
- struct
- {
- mach_msg_header_t hdr;
- mach_msg_type_t host_priv_type;
- mach_port_t host_priv;
- mach_msg_type_t dev_master_type;
- mach_port_t dev_master;
- } msg;
-
- if (err = task_get_bootstrap_port (mach_task_self (), &bootstrap))
- return err;
-
- /* We cannot simply use a MiG-generated user stub to do this,
- because the return message does not contain a return code datum. */
- reply = __mach_reply_port ();
- msg.hdr.msgh_bits = MACH_MSGH_BITS (MACH_MSG_TYPE_COPY_SEND,
- MACH_MSG_TYPE_MAKE_SEND_ONCE);
- msg.hdr.msgh_size = 0;
- msg.hdr.msgh_remote_port = bootstrap;
- msg.hdr.msgh_local_port = reply;
- msg.hdr.msgh_kind = MACH_MSGH_KIND_NORMAL;
- msg.hdr.msgh_id = 999999;
- err = __mach_msg (&msg.hdr,
- MACH_SEND_MSG|MACH_RCV_MSG|MACH_RCV_TIMEOUT,
- sizeof (msg.hdr), sizeof (msg), reply,
- 500, MACH_PORT_NULL); /* XXX timeout is arbitrary */
- mach_port_deallocate (mach_task_self (), bootstrap);
- mach_port_deallocate (mach_task_self (), reply);
-
- if (err == KERN_SUCCESS)
- {
- *host_priv_ptr = msg.host_priv;
- *device_master_ptr = msg.dev_master;
- }
-
- return err;
-}