diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/mach/mach_norma.defs | 120 | ||||
| -rw-r--r-- | include/mach/mach_types.defs | 5 | ||||
| -rw-r--r-- | include/mach/mach_types.h | 5 | ||||
| -rw-r--r-- | include/mach/memory_object.defs | 7 | ||||
| -rw-r--r-- | include/mach/memory_object_default.defs | 7 | ||||
| -rw-r--r-- | include/mach/norma_special_ports.h | 84 | ||||
| -rw-r--r-- | include/mach/norma_task.defs | 43 |
7 files changed, 0 insertions, 271 deletions
diff --git a/include/mach/mach_norma.defs b/include/mach/mach_norma.defs deleted file mode 100644 index 01b3872..0000000 --- a/include/mach/mach_norma.defs +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Mach Operating System - * Copyright (c) 1991 Carnegie Mellon University - * 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 ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS 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. - */ - -subsystem -#if KERNEL_USER - KernelUser -#endif -#if KERNEL_SERVER - KernelServer -#endif - mach_norma 555000; -#ifdef KERNEL_USER -userprefix r_; -#endif - -#include <mach/std_types.defs> -#include <mach/mach_types.defs> - -skip; - -/* - * Specify a node upon which children tasks will be created. - * This call exists only to allow testing with unmodified servers. - * Server developers should use norma_task_create instead. - */ -routine task_set_child_node( - target_task : task_t; - child_node : int); - -/* - * THIS CALL WILL BE ELIMINATED. - * Use norma_port_location_hint(,mach_task_self(),) instead. - */ -routine norma_node_self( - host : host_t; - out node : int); - -skip; - -skip; - -skip; - -/* - * (Used to be called task_create_remote.) - * Create a task on the given node, possibly inheriting memory. - * Same inheritance semantics as task_create, including inheritance - * of initial ports and emulation library. - * Setting child_node to node_self forces local task creation. - */ -routine norma_task_create( - target_task : task_t; - inherit_memory : boolean_t; - child_node : int; - out child_task : task_t); - -/* - * Get a given special port for a given node. - * Norma special ports are defined in norma_special_ports.h; - * examples include the master device port. - * There are a limited number of slots available for system servers. - * - * XXX MAX_SPECIAL_ID should be defined in norma_special_ports.h, - * XXX not just in norma/ipc_special.c! - * (MAX_SPECIAL_ID specifies total number of slots available) - */ -routine norma_get_special_port( - host_priv : host_priv_t; - node : int; - which : int; - out port : mach_port_t); - -/* - * Set a given special port for a given node. - * See norma_get_special_port. - */ -routine norma_set_special_port( - host_priv : host_priv_t; - which : int; - port : mach_port_t); - -skip; - -skip; - -skip; - -/* - * Return best guess of port's current location. - * Guaranteed to be a node where the port once was. - * Guaranteed to be accurate if port has never moved. - * Can be used to determine residence node for hosts, tasks, threads, etc. - */ -routine norma_port_location_hint( - task : task_t; - port : mach_port_t; - out node : int); diff --git a/include/mach/mach_types.defs b/include/mach/mach_types.defs index 6952272..53c2529 100644 --- a/include/mach/mach_types.defs +++ b/include/mach/mach_types.defs @@ -48,7 +48,6 @@ #include <mach/std_types.defs> #if KERNEL_SERVER -#include <norma_vm.h> #endif /* KERNEL_SERVER */ type mach_port_status_t = struct[9] of integer_t; @@ -134,11 +133,7 @@ type memory_object_t = mach_port_t type memory_object_control_t = mach_port_t ctype: mach_port_t #if KERNEL_SERVER -#if NORMA_VM - intran: mach_xmm_obj_t xmm_kobj_lookup(mach_port_t) -#else /* NORMA_VM */ intran: vm_object_t vm_object_lookup(mach_port_t) -#endif /* NORMA_VM */ #endif /* KERNEL_SERVER */ ; diff --git a/include/mach/mach_types.h b/include/mach/mach_types.h index 1fa3292..f6ceac3 100644 --- a/include/mach/mach_types.h +++ b/include/mach/mach_types.h @@ -61,11 +61,6 @@ processor_set_name_array_t */ #include <kern/syscall_emulation.h> /* for emulation_vector_t */ -#include <norma_vm.h> -#if NORMA_VM -typedef struct xmm_obj *mach_xmm_obj_t; -extern mach_xmm_obj_t xmm_kobj_lookup(); -#endif /* NORMA_VM */ #else /* MACH_KERNEL */ typedef mach_port_t task_t; typedef task_t *task_array_t; diff --git a/include/mach/memory_object.defs b/include/mach/memory_object.defs index 198b70c..ea7989a 100644 --- a/include/mach/memory_object.defs +++ b/include/mach/memory_object.defs @@ -39,13 +39,6 @@ subsystem #endif /* KERNEL_SERVER */ memory_object 2200; -#ifdef KERNEL -#include <norma_vm.h> -#if NORMA_VM -userprefix k_; -#endif /* NORMA_VM */ -#endif /* KERNEL */ - #include <mach/std_types.defs> #include <mach/mach_types.defs> diff --git a/include/mach/memory_object_default.defs b/include/mach/memory_object_default.defs index d39fa9a..0eac271 100644 --- a/include/mach/memory_object_default.defs +++ b/include/mach/memory_object_default.defs @@ -37,13 +37,6 @@ subsystem #endif /* KERNEL_USER */ memory_object_default 2250; -#ifdef MACH_KERNEL -#include <norma_vm.h> -#if NORMA_VM -userprefix k_; -#endif /* NORMA_VM */ -#endif /* MACH_KERNEL */ - #include <mach/std_types.defs> #include <mach/mach_types.defs> diff --git a/include/mach/norma_special_ports.h b/include/mach/norma_special_ports.h deleted file mode 100644 index e911467..0000000 --- a/include/mach/norma_special_ports.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Mach Operating System - * Copyright (c) 1991 Carnegie Mellon University - * 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 ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS 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. - */ -/* - * File: mach/norma_special_ports.h - * - * Defines codes for remote access to special ports. These are NOT - * port identifiers - they are only used for the norma_get_special_port - * and norma_set_special_port routines. - */ - -#ifndef _MACH_NORMA_SPECIAL_PORTS_H_ -#define _MACH_NORMA_SPECIAL_PORTS_H_ - -#define MAX_SPECIAL_KERNEL_ID 3 -#define MAX_SPECIAL_ID 32 - -/* - * Provided by kernel - */ -#define NORMA_DEVICE_PORT 1 -#define NORMA_HOST_PORT 2 -#define NORMA_HOST_PRIV_PORT 3 - -/* - * Not provided by kernel - */ -#define NORMA_NAMESERVER_PORT (1 + MAX_SPECIAL_KERNEL_ID) - -/* - * Definitions for ease of use. - * - * In the get call, the host parameter can be any host, but will generally - * be the local node host port. In the set call, the host must the per-node - * host port for the node being affected. - */ - -#define norma_get_device_port(host, node, port) \ - (norma_get_special_port((host), (node), NORMA_DEVICE_PORT, (port))) - -#define norma_set_device_port(host, port) \ - (norma_set_special_port((host), NORMA_DEVICE_PORT, (port))) - -#define norma_get_host_port(host, node, port) \ - (norma_get_special_port((host), (node), NORMA_HOST_PORT, (port))) - -#define norma_set_host_port(host, port) \ - (norma_set_special_port((host), NORMA_HOST_PORT, (port))) - -#define norma_get_host_priv_port(host, node, port) \ - (norma_get_special_port((host), (node), NORMA_HOST_PRIV_PORT, (port))) - -#define norma_set_host_priv_port(host, port) \ - (norma_set_special_port((host), NORMA_HOST_PRIV_PORT, (port))) - -#define norma_get_nameserver_port(host, node, port) \ - (norma_get_special_port((host), (node), NORMA_NAMESERVER_PORT, (port))) - -#define norma_set_nameserver_port(host, port) \ - (norma_set_special_port((host), NORMA_NAMESERVER_PORT, (port))) - -#endif /* _MACH_NORMA_SPECIAL_PORTS_H_ */ diff --git a/include/mach/norma_task.defs b/include/mach/norma_task.defs deleted file mode 100644 index 1ae5972..0000000 --- a/include/mach/norma_task.defs +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Mach Operating System - * Copyright (c) 1991 Carnegie Mellon University - * 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 ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS 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. - */ - -subsystem -#if KERNEL_USER - KernelUser -#endif KERNEL_USER -#if KERNEL_SERVER - KernelServer -#endif KERNEL_SERVER - norma_task 666000; - -#include <mach/std_types.defs> -#include <mach/mach_types.defs> - -routine norma_task_create( - norma_task_server : mach_port_t; - target_task : mach_port_t; - inherit_memory : boolean_t; - out child_task : mach_port_t); |