2006-03-20 Thomas Schwinge <tschwinge@gnu.org>

* DEVELOPMENT: Document the NORMA removal.

2006-03-20  Leonardo Lopes Pereira  <leonardolopespereira@gmail.com>

	Remove unused and unsupported code.  Consult the file `DEVELOPMENT'
	for details.

	[patch #4982]
	* bogus/norma_device.h: Remove file.
	* bogus/norma_ether.h: Likewise.
	* bogus/norma_ipc.h: Likewise.
	* bogus/norma_task.h: Likewise.
	* bogus/norma_vm.h: Likewise.
	* include/mach/mach_norma.defs: Likewise.
	* include/mach/norma_task.defs: Likewise.
	* include/mach/norma_special_ports.h: Likewise.
	* Makefile.in (bogus-files): Remove `norma_device.h', `norma_ether.h',
	`norma_ipc.h', `norma_task.h' and `norma_vm.h'.
	(mach-headers): Remove `mach_norma.defs', `norma_task.defs' and
	`norma_special_ports.h'.
	* device/ds_routines.c: Don't include <norma_device.h> anymore and
	adopt all users of NORMA_DEVICE as if it were always defined to `0'.
	* device/net_io.c: Likewise for <norma_ether.h>, NORMA_ETHER.
	* kern/machine.c: Likewise.
	* ddb/db_command.c: Likevise for <norma_ipc.h>, NORMA_IPC.
	* ipc/ipc_init.c: Likewise.
	* ipc/ipc_kmsg.c: Likewise.
	* ipc/ipc_kmsg.h: Likewise.
	* ipc/ipc_mqueue.c: Likewise.
	* ipc/ipc_notify.c: Likewise.
	* ipc/ipc_port.c: Likewise.
	* ipc/ipc_port.h: Likewise.
	* ipc/ipc_space.c: Likewise.
	* ipc/ipc_space.h: Likewise.
	* ipc/mach_msg.c: Likewise.
	* kern/ast.c: Likewise.
	* kern/debug.c: Likewise.
	* kern/exception.c: Likewise.
	* kern/startup.c: Likewise.
	* vm/memory_object.c: Likewise.
	* vm/vm_map.c: Likewise.
	* kern/ipc_kobject.c: Likewise for <norma_task.h>, NORMA_TASK.
	* kern/task.c: Likewise.
	* kern/task.h: Likewise.
	* ddb/db_command.c: Likewise for <norma_vm.h>, NORMA_VM.
	* device/dev_pager.c: Likewise.
	* include/mach/mach_types.defs: Likewise.
	* include/mach/mach_types.h: Likewise.
	* include/mach/memory_object_default.defs: Likewise.
	* include/mach/memory_object.defs: Likewise.
	* ipc/ipc_kmsg.c: Likewise.
	* kern/ipc_kobject.c: Likewise.
	* kern/ipc_mig.c: Likewise.
	* kern/startup.c: Likewise.
	* vm/memory_object.c: Likewise.
	* vm/vm_object.c: Likewise.
	* vm/vm_object.h: Likewise.
	* vm/vm_pageout.c: Likewise.

1 files changed, 0 insertions, 44 deletions

diff --git a/ipc/mach_msg.c b/ipc/mach_msg.c
index ab132af..2ae250c 100644
--- a/ipc/mach_msg.c
+++ b/ipc/mach_msg.c
@@ -37,7 +37,6 @@
  */
 
 #include <mach_ipc_compat.h>
-#include <norma_ipc.h>
 
 #include <mach/kern_return.h>
 #include <mach/port.h>
@@ -635,14 +634,6 @@ mach_msg_trap(msg, option, send_size, rcv_size, rcv_name, time_out, notify)
 				goto kernel_send;
 			}
 
-#if	NORMA_IPC
-			if (IP_NORMA_IS_PROXY(dest_port)) {
-				ip_unlock(dest_port);
-				ip_unlock(reply_port);
-				goto norma_send;
-		        }
-#endif	/* NORMA_IPC */
-
 			if (dest_port->ip_msgcount >= dest_port->ip_qlimit)
 				goto abort_request_send_receive;
 
@@ -754,13 +745,6 @@ mach_msg_trap(msg, option, send_size, rcv_size, rcv_name, time_out, notify)
 			/* make sure we can queue to the destination */
 
 			assert(dest_port->ip_receiver != ipc_space_kernel);
-#if	NORMA_IPC
-			if (IP_NORMA_IS_PROXY(dest_port)) {
-				is_write_unlock(space);
-				ip_unlock(dest_port);
-				goto norma_send;
-			}
-#endif	/* NORMA_IPC */
 
 			/* optimized ipc_entry_lookup/ipc_mqueue_copyin */
 
@@ -859,9 +843,6 @@ mach_msg_trap(msg, option, send_size, rcv_size, rcv_name, time_out, notify)
 
 		assert(ip_active(dest_port));
 		assert(dest_port->ip_receiver != ipc_space_kernel);
-#if	NORMA_IPC
-		assert(! IP_NORMA_IS_PROXY(dest_port));
-#endif	/* NORMA_IPC */
 		assert((dest_port->ip_msgcount < dest_port->ip_qlimit) ||
 		       (MACH_MSGH_BITS_REMOTE(kmsg->ikm_header.msgh_bits) ==
 						MACH_MSG_TYPE_PORT_SEND_ONCE));
@@ -1341,9 +1322,6 @@ mach_msg_trap(msg, option, send_size, rcv_size, rcv_name, time_out, notify)
 		}
 
 		if (ip_active(dest_port) &&
-#if	NORMA_IPC
-		    (! IP_NORMA_IS_PROXY(dest_port)) &&
-#endif	/* NORMA_IPC */
 		    ((dest_port->ip_msgcount < dest_port->ip_qlimit) ||
 		     (MACH_MSGH_BITS_REMOTE(kmsg->ikm_header.msgh_bits) ==
 					MACH_MSG_TYPE_PORT_SEND_ONCE)))
@@ -1380,28 +1358,6 @@ mach_msg_trap(msg, option, send_size, rcv_size, rcv_name, time_out, notify)
 		ip_unlock(dest_port);
 		goto slow_send;
 
-#if	NORMA_IPC
-	    norma_send:
-		/*
-		 *	Nothing is locked.  We have acquired kmsg, but
-		 *	we still need to send it and receive a reply.
-		 */
-
-		mr = norma_ipc_send(kmsg);
-		if (mr != MACH_MSG_SUCCESS) {
-			mr |= ipc_kmsg_copyout_pseudo(kmsg, space,
-						      current_map());
-
-			assert(kmsg->ikm_marequest == IMAR_NULL);
-			(void) ipc_kmsg_put(msg, kmsg,
-					    kmsg->ikm_header.msgh_size);
-			thread_syscall_return(mr);
-			/*NOTREACHED*/
-		}
-
-		goto slow_get_rcv_port;
-#endif	/* NORMA_IPC */
-
 	    kernel_send:
 		/*
 		 *	Special case: send message to kernel services.