Remove long obsolete RPC routines

* kern/compat_xxx_defs.h: Remove file.
* Makefrag.am (libkernel_a_SOURCES): Remove `kern/compat_xxx_defs.h'.

* include/mach/mach_types.defs (xxx_emulation_vector_t): Remove type.

* device/device.srv: Do not simport <kern/compat_xxx_defs.h>.
* kern/mach.srv: Likewise.
* kern/mach_host.srv: Likewise.

* include/device/device.defs [MACH_KERNEL]: Do not simport
<kern/compat_xxx_defs.h>.
(xxx_device_set_status, xxx_device_get_status)
(xxx_device_set_filter): Replace routine declarations with skip
directives.
* include/mach/mach.defs [MACH_KERNEL]: Do not simport
<kern/compat_xxx_defs.h>.
(xxx_memory_object_lock_request, xxx_task_get_emulation_vector)
(xxx_task_set_emulation_vector, xxx_host_info, xxx_slot_info)
(xxx_cpu_control, xxx_task_info, xxx_thread_get_state)
(xxx_thread_set_state, xxx_thread_info): Replace routine declarations
with skip directive.
* include/mach/mach_host.defs [MACH_KERNEL]: Do not simport
<kern/compat_xxx_defs.h>.
(yyy_host_info, yyy_processor_info, yyy_processor_control)
(xxx_processor_set_default_priv, yyy_processor_set_info): Replace
routine declarations with skip directive.

* kern/ipc_host.c (xxx_processor_set_default_priv): Remove function.
* kern/machine.c (xxx_host_info, xxx_slot_info)
(xxx_cpu_control): Likewise.
* kern/syscall_emulation.c (xxx_task_set_emulation_vector)
(xxx_task_get_emulation_vector): Likewise.
* vm/memory_object.c (xxx_memory_object_lock_request): Likewise.

13 files changed, 20 insertions, 371 deletions

diff --git a/Makefrag.am b/Makefrag.am
index fc82b2c..fbe0906 100644
--- a/Makefrag.am
+++ b/Makefrag.am
@@ -128,7 +128,6 @@ libkernel_a_SOURCES += \
 	kern/ast.h \
 	kern/boot_script.h \
 	kern/bootstrap.c \
-	kern/compat_xxx_defs.h \
 	kern/counters.c \
 	kern/counters.h \
 	kern/cpu_number.h \
diff --git a/device/device.srv b/device/device.srv
index 06aa0be..f63813f 100644
--- a/device/device.srv
+++ b/device/device.srv
@@ -24,6 +24,4 @@
 
 #define KERNEL_SERVER 1
 
-simport <kern/compat_xxx_defs.h>;	/* for obsolete routines */
-
 #include <device/device.defs>
diff --git a/include/device/device.defs b/include/device/device.defs
index 2bbd556..d9234e3 100644
--- a/include/device/device.defs
+++ b/include/device/device.defs
@@ -32,10 +32,6 @@
  *	block and character device interfaces to the kernel.
  */
 
-#ifdef	MACH_KERNEL
-simport <kern/compat_xxx_defs.h>;	/* for obsolete routines */
-#endif
-
 subsystem
 #if	KERNEL_SERVER
 	  KernelServer
@@ -99,27 +95,9 @@ routine	device_read_inband(
 	out	data		: io_buf_ptr_inband_t
 	);
 
-/* obsolete */
-routine	xxx_device_set_status(
-		device		: device_t;
-	in	flavor		: dev_flavor_t;
-	in	status		: dev_status_t, IsLong
-	);
-
-/* obsolete */
-routine	xxx_device_get_status(
-		device		: device_t;
-	in	flavor		: dev_flavor_t;
-	out	status		: dev_status_t, IsLong
-	);
-
-/* obsolete */
-routine xxx_device_set_filter(
-		device		: device_t;
-	in	receive_port	: mach_port_send_t;
-	in	priority	: int;
-	in	filter		: filter_array_t, IsLong
-	);
+skip;	/* old xxx_device_set_status */
+skip;	/* old xxx_device_get_status */
+skip;	/* old xxx_device_set_filter*/
 
 routine device_map(
 		device		: device_t;
diff --git a/include/mach/mach.defs b/include/mach/mach.defs
index 4531a22..5851080 100644
--- a/include/mach/mach.defs
+++ b/include/mach/mach.defs
@@ -30,10 +30,6 @@
  *	Matchmaker definitions file for Mach kernel interface.
  */
 
-#ifdef	MACH_KERNEL
-simport <kern/compat_xxx_defs.h>;	/* for obsolete routines */
-#endif	/* MACH_KERNEL */
-
 subsystem
 #if	KERNEL_USER
 	  KernelUser
@@ -388,16 +384,8 @@ skip;	/* old pager_flush_request */
  *	boolean).  The new routine is backwards compatible at the C
  *	language interface.
  */
-simpleroutine xxx_memory_object_lock_request(
-		memory_control	: memory_object_control_t;
-		offset		: vm_offset_t;
-		size		: vm_size_t;
-		should_clean	: boolean_t;
-		should_flush	: boolean_t;
-		lock_value	: vm_prot_t;
-		reply_to	: mach_port_t =
-			MACH_MSG_TYPE_MAKE_SEND_ONCE|polymorphic);
 
+skip;	/* old xxx_memory_object_lock_request */
 
 simpleroutine memory_object_lock_request(
 		memory_control	: memory_object_control_t;
@@ -409,46 +397,11 @@ simpleroutine memory_object_lock_request(
 		reply_to	: mach_port_t =
 			MACH_MSG_TYPE_MAKE_SEND_ONCE|polymorphic);
 
-/* obsolete */
-routine xxx_task_get_emulation_vector(
-		task		: task_t;
-	out	vector_start	: int;
-	out	emulation_vector: xxx_emulation_vector_t, IsLong);
-
-/* obsolete */
-routine xxx_task_set_emulation_vector(
-		task		: task_t;
-		vector_start	: int;
-		emulation_vector: xxx_emulation_vector_t, IsLong);
-
-/*
- *	Returns information about the host on which the
- *	target object resides.  [This object may be
- *	a task, thread, or memory_object_control port.]
- */
-routine xxx_host_info(
-		target_task	: mach_port_t;
-	out	info		: machine_info_data_t);
-
-/*
- *	Returns information about a particular processor on
- *	the host on which the target task resides.
- */
-routine xxx_slot_info(
-		target_task	: task_t;
-		slot		: int;
-	out	info		: machine_slot_data_t);
-
-/*
- *	Performs control operations (currently only
- *	turning off or on) on a particular processor on
- *	the host on which the target task resides.
- */
-routine xxx_cpu_control(
-		target_task	: task_t;
-		cpu		: int;
-		running		: boolean_t);
-
+skip;	/* old xxx_task_get_emulation_vector */
+skip;	/* old xxx_task_set_emulation_vector */
+skip;	/* old xxx_host_info */
+skip;	/* old xxx_slot_info */
+skip;	/* old xxx_cpu_control */
 skip;	/* old thread_statistics */
 skip;	/* old task_statistics */
 skip;	/* old netport_init */
@@ -491,11 +444,7 @@ routine task_set_special_port(
 		which_port	: int;
 		special_port	: mach_port_t);
 
-/* obsolete */
-routine	xxx_task_info(
-		target_task	: task_t;
-		flavor		: int;
-	out	task_info_out	: task_info_t, IsLong);
+skip;	/* old xxx_task_info */
 
 
 /*
@@ -537,17 +486,8 @@ routine	thread_resume(
 routine thread_abort(
 		target_thread	: thread_t);
 
-/* obsolete */
-routine xxx_thread_get_state(
-		target_thread	: thread_t;
-		flavor		: int;
-	out	old_state	: thread_state_t, IsLong);
-
-/* obsolete */
-routine	xxx_thread_set_state(
-		target_thread	: thread_t;
-		flavor		: int;
-		new_state	: thread_state_t, IsLong);
+skip;	/* old xxx_thread_get_state */
+skip;	/* old xxx_thread_set_state */
 
 /*
  *	Returns the current value of the selected special port
@@ -567,11 +507,7 @@ routine thread_set_special_port(
 		which_port	: int;
 		special_port	: mach_port_t);
 
-/* obsolete */
-routine	xxx_thread_info(
-		target_thread	: thread_t;
-		flavor		: int;
-	out	thread_info_out	: thread_info_t, IsLong);
+skip;	/* old xxx_thread_info */
 
 /*
  *	Establish a user-level handler for the specified
diff --git a/include/mach/mach_host.defs b/include/mach/mach_host.defs
index 85ee4dc..2644146 100644
--- a/include/mach/mach_host.defs
+++ b/include/mach/mach_host.defs
@@ -34,10 +34,6 @@
  *	control.  
  */
 
-#ifdef	MACH_KERNEL
-simport <kern/compat_xxx_defs.h>;	/* for obsolete routines */
-#endif
-
 subsystem
 #if	KERNEL_SERVER
 	  KernelServer
@@ -59,19 +55,8 @@ routine host_processors(
 		host_priv	: host_priv_t;
 	out	processor_list	: processor_array_t);
 
-/* obsolete */
-routine yyy_host_info(
-		host		: host_t;
-		flavor		: int;
-	out	host_info_out	: host_info_t, IsLong);
-
-
-/* obsolete */
-routine yyy_processor_info(
-		processor	: processor_t;
-		flavor		: int;
-	out	host		: host_t;
-	out	processor_info_out: processor_info_t, IsLong);
+skip;	/* old yyy_host_info */
+skip;	/* old yyy_processor_info */
 
 /*
  *	Start processor.
@@ -87,10 +72,7 @@ routine	processor_start(
 routine	processor_exit(
 		processor	: processor_t);
 
-/* obsolete */
-routine yyy_processor_control(
-		processor	: processor_t;
-		processor_cmd	: processor_info_t, IsLong);
+skip;	/* old yyy_processor_control */
 
 /*
  *	Get default processor set for host.
@@ -99,13 +81,7 @@ routine processor_set_default(
 		host		: host_t;
 	out	default_set	: processor_set_name_t);
 
-/*
- *	Get rights to default processor set for host.
- *	Replaced by host_processor_set_priv.
- */
-routine xxx_processor_set_default_priv(
-		host		: host_priv_t;
-	out	default_set	: processor_set_t);
+skip;	/* old xxx_processor_set_default_priv */
 
 /*
  *	Create new processor set.  Returns real port for manipulations,
@@ -122,12 +98,7 @@ routine processor_set_create(
 routine processor_set_destroy(
 		set		: processor_set_t);
 
-/* obsolete */
-routine yyy_processor_set_info(
-		set_name	: processor_set_name_t;
-		flavor		: int;
-	out	host		: host_t;
-	out	info_out	: processor_set_info_t, IsLong);
+skip;	/* old yyy_processor_set_info */
 
 /*
  *	Assign processor to processor set.
diff --git a/include/mach/mach_types.defs b/include/mach/mach_types.defs
index 5e31cdc..607d5d9 100644
--- a/include/mach/mach_types.defs
+++ b/include/mach/mach_types.defs
@@ -228,10 +228,6 @@ type time_value_t		= struct[2] of integer_t;
 
 type emulation_vector_t		= ^array[] of vm_offset_t;
 
-type xxx_emulation_vector_t	= array[*:1024] of vm_offset_t
-					ctype: emulation_vector_t;
-					/* XXX compatibility */
-
 type rpc_signature_info_t	= array[*:1024] of int;
 
 #if	KERNEL_SERVER
diff --git a/kern/compat_xxx_defs.h b/kern/compat_xxx_defs.h
deleted file mode 100644
index 1878bb2..0000000
--- a/kern/compat_xxx_defs.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Mach Operating System
- * Copyright (c) 1991 Carnegie Mellon University.
- * Copyright (c) 1993,1994 The University of Utah and
- * the Computer Systems Laboratory (CSL).
- * All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON, THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF
- * THIS SOFTWARE IN ITS "AS IS" CONDITION, AND DISCLAIM ANY LIABILITY
- * OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF
- * THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-/*
- * Compatibility definitions for the MiG-related changes
- * to various routines.
- *
- * When all user code has been relinked, this file and the xxx_
- * and yyy_ routines MUST be removed!
- */
-
-/* from mach.defs */
-
-#define	xxx_task_info			task_info
-#ifdef MIGRATING_THREADS
-#define	xxx_thread_get_state		act_get_state
-#define	xxx_thread_set_state		act_set_state
-#define	xxx_thread_info			act_info
-#else
-#define	xxx_thread_get_state		thread_get_state
-#define	xxx_thread_set_state		thread_set_state
-#define	xxx_thread_info			thread_info
-#endif /* MIGRATING_THREADS */
-
-/* from mach_host.defs */
-
-#define	yyy_host_info			host_info
-#define	yyy_processor_info		processor_info
-#define	yyy_processor_set_info		processor_set_info
-#define	yyy_processor_control		processor_control
-
-/* from device.defs */
-
-#define	ds_xxx_device_set_status	ds_device_set_status
-#define	ds_xxx_device_get_status	ds_device_get_status
-#define	ds_xxx_device_set_filter	ds_device_set_filter
-
-
-
diff --git a/kern/ipc_host.c b/kern/ipc_host.c
index ea8f03a..cd1c11a 100644
--- a/kern/ipc_host.c
+++ b/kern/ipc_host.c
@@ -199,10 +199,9 @@ ipc_pset_terminate(
 }
 
 /*
- *	processor_set_default, processor_set_default_priv:
+ *	processor_set_default:
  *
- *	Return ports for manipulating default_processor set.  MiG code
- *	differentiates between these two routines.
+ *	Return ports for manipulating default_processor set.
  */
 kern_return_t
 processor_set_default(
@@ -217,19 +216,6 @@ processor_set_default(
 	return KERN_SUCCESS;
 }
 
-kern_return_t
-xxx_processor_set_default_priv(
-	host_t		host,
-	processor_set_t	*pset)
-{
-	if (host == HOST_NULL)
-		return KERN_INVALID_ARGUMENT;
-
-	*pset = &default_pset;
-	pset_reference(*pset);
-	return KERN_SUCCESS;
-}
-
 /*
  *	Routine:	convert_port_to_host
  *	Purpose:
diff --git a/kern/mach.srv b/kern/mach.srv
index 3ed9259..b1cec60 100644
--- a/kern/mach.srv
+++ b/kern/mach.srv
@@ -37,6 +37,4 @@
 #define thread_get_special_port	act_get_special_port
 #endif /* MIGRATING_THREADS */
 
-simport <kern/compat_xxx_defs.h>;	/* for obsolete routines */
-
 #include <mach/mach.defs>
diff --git a/kern/mach_host.srv b/kern/mach_host.srv
index 30d78db..a18ab1c 100644
--- a/kern/mach_host.srv
+++ b/kern/mach_host.srv
@@ -23,8 +23,6 @@
 
 #define KERNEL_SERVER 1
 
-simport <kern/compat_xxx_defs.h>;	/* for obsolete routines */
-
 #ifdef MIGRATING_THREADS
 #define thread_assign		act_thread_assign
 #define thread_assign_default	act_thread_assign_default
diff --git a/kern/machine.c b/kern/machine.c
index bcf394c..c2a19b9 100644
--- a/kern/machine.c
+++ b/kern/machine.c
@@ -67,60 +67,6 @@ queue_head_t	action_queue;	/* assign/shutdown queue */
 decl_simple_lock_data(,action_lock);
 
 /*
- *	xxx_host_info:
- *
- *	Return the host_info structure.  This routine is exported to the
- *	user level.
- */
-kern_return_t xxx_host_info(task, info)
-	task_t		task;
-	machine_info_t	info;
-{
-#ifdef	lint
-	task++;
-#endif	/* lint */
-	*info = machine_info;
-	return(KERN_SUCCESS);
-}
-
-/*
- *	xxx_slot_info:
- *
- *	Return the slot_info structure for the specified slot.  This routine
- *	is exported to the user level.
- */
-kern_return_t xxx_slot_info(task, slot, info)
-	task_t		task;
-	int		slot;
-	machine_slot_t	info;
-{
-#ifdef	lint
-	task++;
-#endif	/* lint */
-	if ((slot < 0) || (slot >= NCPUS))
-		return(KERN_INVALID_ARGUMENT);
-	*info = machine_slot[slot];
-	return(KERN_SUCCESS);
-}
-
-/*
- *	xxx_cpu_control:
- *
- *	Support for user control of cpus.  The user indicates which cpu
- *	he is interested in, and whether or not that cpu should be running.
- */
-kern_return_t xxx_cpu_control(task, cpu, runnable)
-	task_t		task;
-	int		cpu;
-	boolean_t	runnable;
-{
-#ifdef	lint
-	task++; cpu++; runnable++;
-#endif	/* lint */
-	return(KERN_FAILURE);
-}
-
-/*
  *	cpu_up:
  *
  *	Flag specified cpu as up and running.  Called when a processor comes
diff --git a/kern/syscall_emulation.c b/kern/syscall_emulation.c
index 06781d5..c1c3096 100644
--- a/kern/syscall_emulation.c
+++ b/kern/syscall_emulation.c
@@ -336,24 +336,6 @@ task_set_emulation_vector(task, vector_start, emulation_vector,
 }
 
 /*
- *	Compatibility entry.  Vector is passed inline.
- */
-kern_return_t
-xxx_task_set_emulation_vector(task, vector_start, emulation_vector,
-			  emulation_vector_count)
-	task_t 			task;
-	int			vector_start;
-	emulation_vector_t	emulation_vector;
-	unsigned int		emulation_vector_count;
-{
-	return task_set_emulation_vector_internal(
-			task,
-			vector_start,
-			emulation_vector,
-			emulation_vector_count);
-}
-
-/*
  *	task_get_emulation_vector: [Server Entry]
  *
  *	Get the list of emulated system calls for this task.
@@ -460,53 +442,6 @@ task_get_emulation_vector(task, vector_start, emulation_vector,
 }
 
 /*
- *	xxx_task_get_emulation:  [Server Entry]
- *	get the list of emulated system calls for this task.
- *	Compatibility code: return list in-line.
- */
-kern_return_t
-xxx_task_get_emulation_vector(task, vector_start, emulation_vector,
-			  emulation_vector_count)
-	task_t 			task;
-	int			*vector_start;
-	emulation_vector_t	emulation_vector; /* pointer to OUT array */
-	unsigned int		*emulation_vector_count;	/*IN/OUT*/
-{
-	register eml_dispatch_t	eml;
-
-	if (task == TASK_NULL)
-	        return( EML_BAD_TASK );
-
-	task_lock(task);
-
-	eml = task->eml_dispatch;
-	if (eml == EML_DISPATCH_NULL) {
-		task_unlock(task);
-		*vector_start = 0;
-		*emulation_vector_count = 0;
-		return( KERN_SUCCESS );
-	}
-
-	simple_lock(&eml->lock);
-
-	if (*emulation_vector_count < eml->disp_count) {
-		simple_unlock(&eml->lock);
-		task_unlock(task);
-		return( EML_BAD_CNT );
-	}
-
-	*vector_start = eml->disp_min;
-	*emulation_vector_count = eml->disp_count;
-	memcpy(emulation_vector, eml->disp_vector,
-	       *emulation_vector_count * sizeof(vm_offset_t));
-	simple_unlock(&eml->lock);
-
-	task_unlock(task);
-
-	return( KERN_SUCCESS );
-}
-
-/*
  *   task_set_emulation:  [Server Entry]
  *   set up for user space emulation of syscalls within this task.
  */
diff --git a/vm/memory_object.c b/vm/memory_object.c
index 57dde76..e281c6a 100644
--- a/vm/memory_object.c
+++ b/vm/memory_object.c
@@ -891,34 +891,6 @@ MACRO_END
 	return (KERN_SUCCESS);
 }
 
-/*
- *	Old version of memory_object_lock_request.
- */
-kern_return_t
-xxx_memory_object_lock_request(object, offset, size,
-			should_clean, should_flush, prot,
-			reply_to, reply_to_type)
-	register vm_object_t	object;
-	register vm_offset_t	offset;
-	register vm_size_t	size;
-	boolean_t		should_clean;
-	boolean_t		should_flush;
-	vm_prot_t		prot;
-	ipc_port_t		reply_to;
-	mach_msg_type_name_t	reply_to_type;
-{
-	register int		should_return;
-
-	if (should_clean)
-		should_return = MEMORY_OBJECT_RETURN_DIRTY;
-	else
-		should_return = MEMORY_OBJECT_RETURN_NONE;
-
-	return(memory_object_lock_request(object,offset,size,
-		      should_return, should_flush, prot,
-		      reply_to, reply_to_type));
-}
-
 kern_return_t
 memory_object_set_attributes_common(object, object_ready, may_cache,
 				    copy_strategy, use_old_pageout)