From ec9defc2912e86a7e682ec6e37aac102fa69d94d Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Mon, 20 Mar 2006 11:31:36 +0000 Subject: 2006-03-20 Thomas Schwinge * DEVELOPMENT: Document the NORMA removal. 2006-03-20 Leonardo Lopes Pereira 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 anymore and adopt all users of NORMA_DEVICE as if it were always defined to `0'. * device/net_io.c: Likewise for , NORMA_ETHER. * kern/machine.c: Likewise. * ddb/db_command.c: Likevise for , 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. * kern/task.c: Likewise. * kern/task.h: Likewise. * ddb/db_command.c: Likewise for , 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. --- device/dev_pager.c | 5 ----- device/ds_routines.c | 38 -------------------------------------- device/net_io.c | 11 ----------- 3 files changed, 54 deletions(-) (limited to 'device') diff --git a/device/dev_pager.c b/device/dev_pager.c index d37c57b5..60e9f954 100644 --- a/device/dev_pager.c +++ b/device/dev_pager.c @@ -29,7 +29,6 @@ * * Device pager. */ -#include #include #include @@ -350,11 +349,7 @@ kern_return_t device_pager_data_request( register vm_object_t object; vm_offset_t device_map_page(void *,vm_offset_t); -#if NORMA_VM - object = vm_object_lookup(pager); -#else /* NORMA_VM */ object = vm_object_lookup(pager_request); -#endif /* NORMA_VM */ if (object == VM_OBJECT_NULL) { (void) r_memory_object_data_error(pager_request, offset, length, diff --git a/device/ds_routines.c b/device/ds_routines.c index 101dd328..1286001d 100644 --- a/device/ds_routines.c +++ b/device/ds_routines.c @@ -28,8 +28,6 @@ * Date: 3/89 */ -#include - #include #include #include @@ -128,42 +126,6 @@ ds_device_open(open_port, reply_port, reply_port_type, return (MIG_NO_REPLY); /* no sense in doing anything */ } -#if NORMA_DEVICE - /* - * Map global device name to + local device name. - */ - if (name[0] != '<') { - extern char *dev_forward_name(); - - name = dev_forward_name(name, namebuf, sizeof(namebuf)); - } - /* - * Look for explicit node specifier, e.g., <2>sd0a. - * If found, then forward request to correct device server. - * If not found, then remove '' and process locally. - * - * XXX should handle send-right reply_port as well as send-once XXX - */ - if (name[0] == '<') { - char *n; - int node = 0; - - for (n = &name[1]; *n != '>'; n++) { - if (*n >= '0' && *n <= '9') { - node = 10 * node + (*n - '0'); - } else { - return (D_NO_SUCH_DEVICE); - } - } - if (node == node_self()) { - name = &n[1]; /* skip trailing '>' */ - } else { - forward_device_open_send(remote_device(node), - reply_port, mode, name); - return (MIG_NO_REPLY); - } - } -#endif /* NORMA_DEVICE */ #endif /* ! i386 */ /* diff --git a/device/net_io.c b/device/net_io.c index a98523b7..e17c6797 100644 --- a/device/net_io.c +++ b/device/net_io.c @@ -38,7 +38,6 @@ * It may change a lot real soon. -cmaeda 11 June 1993 */ -#include #include #include @@ -62,10 +61,6 @@ #include #include -#if NORMA_ETHER -#include -#endif /*NORMA_ETHER*/ - #include #if MACH_TTD @@ -647,12 +642,6 @@ net_packet(ifp, kmsg, count, priority) { boolean_t awake; -#if NORMA_ETHER - if (netipc_net_packet(kmsg, count)) { - return; - } -#endif /* NORMA_ETHER */ - #if MACH_TTD /* * Do a quick check to see if it is a kernel TTD packet. -- cgit v1.2.3