summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog9
-rw-r--r--Makefile.in2
-rw-r--r--bogus/net_atm.h1
-rw-r--r--kern/syscall_sw.c20
-rw-r--r--kern/task.c16
-rw-r--r--kern/task.h12
-rw-r--r--kern/thread.c18
-rw-r--r--kern/thread.h5
8 files changed, 10 insertions, 73 deletions
diff --git a/ChangeLog b/ChangeLog
index aa2addf..c6851e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,15 @@
`DEVELOPMENT' for details. Partly based on suggestions by
Gianluca Guida <glguida@gmail.com>.
+ * bogus/net_atm.h: Remove file.
+ * Makefile.in (bogus-files): Remove `net_atm.h'.
+ * kern/syscall_sw.c: Don't include <net_atm.h> anymore and adopt all
+ users of NET_ATM as if it were always defined to `0'.
+ * kern/task.c: Likewise.
+ * kern/task.h: Likewise.
+ * kern/thread.c: Likewise.
+ * kern/thread.h: Likewise.
+
* util/about_to_die.c: Remove file.
* util/config.h: Likewise.
* util/cpu.c: Likewise.
diff --git a/Makefile.in b/Makefile.in
index 3a96568..b86b91f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -77,7 +77,7 @@ topfiles = ChangeLog ChangeLog.0 ChangeLog.00 Drivers.macros Makefile.in \
# All the source in each directory.
# Old crud from a previous configure scheme
-bogus-files = bootstrap_symbols.h cpus.h fast_tas.h hw_footprint.h net_atm.h \
+bogus-files = bootstrap_symbols.h cpus.h fast_tas.h hw_footprint.h \
power_save.h simple_clock.h stat_time.h xpr_debug.h \
$(patsubst %,mach_%.h,assert counters debug fixpri host ipc_compat \
ipc_debug ipc_test kdb ldebug lock_mon machine_routines mp_debug \
diff --git a/bogus/net_atm.h b/bogus/net_atm.h
deleted file mode 100644
index 103a8b2..0000000
--- a/bogus/net_atm.h
+++ /dev/null
@@ -1 +0,0 @@
-#define NET_ATM 0
diff --git a/kern/syscall_sw.c b/kern/syscall_sw.c
index 490b5ed..e922b5f 100644
--- a/kern/syscall_sw.c
+++ b/kern/syscall_sw.c
@@ -28,7 +28,6 @@
*/
#include <mach_ipc_compat.h>
-#include <net_atm.h>
#include <mach/port.h>
#include <mach/kern_return.h>
@@ -204,24 +203,6 @@ mach_trap_t mach_trap_table[] = {
MACH_TRAP(kern_invalid, 0), /* 78 */
MACH_TRAP(kern_invalid, 0), /* 79 */
-#if NET_ATM
- MACH_TRAP(mk_update,3), /* 80 */
- MACH_TRAP(mk_lookup,2), /* 81 */
- MACH_TRAP_STACK(mk_endpoint_allocate,4), /* 82 */
- MACH_TRAP_STACK(mk_endpoint_deallocate,1), /* 83 */
- MACH_TRAP(mk_buffer_allocate,2), /* 84 */
- MACH_TRAP(mk_buffer_deallocate,2), /* 85 */
- MACH_TRAP_STACK(mk_connection_open,4), /* 86 */
- MACH_TRAP_STACK(mk_connection_accept,3), /* 87 */
- MACH_TRAP_STACK(mk_connection_close,1), /* 88 */
- MACH_TRAP_STACK(mk_multicast_add,4), /* 89 */
- MACH_TRAP_STACK(mk_multicast_drop,4), /* 90 */
- MACH_TRAP(mk_endpoint_status,3), /* 91 */
- MACH_TRAP_STACK(mk_send,3), /* 92 */
- MACH_TRAP_STACK(mk_receive,2), /* 93 */
- MACH_TRAP_STACK(mk_rpc,4), /* 94 */
- MACH_TRAP_STACK(mk_select,3), /* 95 */
-#else /* NET_ATM */
MACH_TRAP(kern_invalid, 0), /* 80 */
MACH_TRAP(kern_invalid, 0), /* 81 */
MACH_TRAP(kern_invalid, 0), /* 82 */
@@ -238,7 +219,6 @@ mach_trap_t mach_trap_table[] = {
MACH_TRAP(kern_invalid, 0), /* 93 */
MACH_TRAP(kern_invalid, 0), /* 94 */
MACH_TRAP(kern_invalid, 0), /* 95 */
-#endif /* NET_ATM */
#ifdef FIPC
MACH_TRAP(syscall_fipc_send, 4), /* 96 */
diff --git a/kern/task.c b/kern/task.c
index 7b0e0e6..59b11ee 100644
--- a/kern/task.c
+++ b/kern/task.c
@@ -35,7 +35,6 @@
#include <mach_pcsample.h>
#include <norma_task.h>
#include <fast_tas.h>
-#include <net_atm.h>
#include <mach/machine/vm_types.h>
#include <mach/vm_param.h>
@@ -54,10 +53,6 @@
#include <vm/vm_kern.h> /* for kernel_map, ipc_kernel_map */
#include <machine/machspl.h> /* for splsched */
-#if NET_ATM
-#include <chips/nw_mk.h>
-#endif
-
#if NORMA_TASK
#define task_create task_create_local
#endif /* NORMA_TASK */
@@ -157,10 +152,6 @@ kern_return_t task_create(
ipc_task_init(new_task, parent_task);
-#if NET_ATM
- new_task->nw_ep_owned = 0;
-#endif
-
new_task->total_user_time.seconds = 0;
new_task->total_user_time.microseconds = 0;
new_task->total_system_time.seconds = 0;
@@ -291,13 +282,6 @@ kern_return_t task_terminate(
cur_task = current_task();
cur_thread = current_thread();
-#if NET_ATM
- /*
- * Shut down networking.
- */
- mk_endpoint_collect(task);
-#endif
-
/*
* Deactivate task so that it can't be terminated again,
* and so lengthy operations in progress will abort.
diff --git a/kern/task.h b/kern/task.h
index df6560c..f4feb7f 100644
--- a/kern/task.h
+++ b/kern/task.h
@@ -36,7 +36,6 @@
#include <norma_task.h>
#include <fast_tas.h>
-#include <net_atm.h>
#include <mach/boolean.h>
#include <mach/port.h>
@@ -51,13 +50,6 @@
#include <kern/syscall_emulation.h>
#include <vm/vm_map.h>
-#if NET_ATM
-typedef struct nw_ep_owned {
- unsigned int ep;
- struct nw_ep_owned *next;
-} nw_ep_owned_s, *nw_ep_owned_t;
-#endif
-
struct task {
/* Synchronization/destruction information */
decl_simple_lock_data(,lock) /* Task's lock */
@@ -113,10 +105,6 @@ struct task {
vm_offset_t fast_tas_base[TASK_FAST_TAS_NRAS];
vm_offset_t fast_tas_end[TASK_FAST_TAS_NRAS];
#endif /* FAST_TAS */
-
-#if NET_ATM
- nw_ep_owned_t nw_ep_owned;
-#endif /* NET_ATM */
};
#define task_lock(task) simple_lock(&(task)->lock)
diff --git a/kern/thread.c b/kern/thread.c
index 04c19ce..f1dcc52 100644
--- a/kern/thread.c
+++ b/kern/thread.c
@@ -38,7 +38,6 @@
#include <mach_pcsample.h>
#include <simple_clock.h>
#include <mach_debug.h>
-#include <net_atm.h>
#include <mach/std_types.h>
#include <mach/policy.h>
@@ -66,10 +65,6 @@
#include <machine/machspl.h> /* for splsched */
#include <machine/thread.h> /* for MACHINE_STACK */
-#if NET_ATM
-#include <chips/nw_mk.h>
-#endif
-
thread_t active_threads[NCPUS];
vm_offset_t active_stacks[NCPUS];
@@ -448,10 +443,6 @@ kern_return_t thread_create(
ipc_thread_init(new_thread);
-#if NET_ATM
- new_thread->nw_ep_waited = 0;
-#endif
-
/*
* Find the processor set for the parent task.
*/
@@ -862,9 +853,6 @@ kern_return_t thread_terminate(
* reference to itself.
*/
ipc_thread_terminate(thread);
-#if NET_ATM
- mk_waited_collect(thread);
-#endif
thread_deallocate(thread);
return KERN_SUCCESS;
}
@@ -903,9 +891,6 @@ thread_force_terminate(
(void) thread_halt(thread, TRUE);
ipc_thread_terminate(thread);
-#if NET_ATM
- mk_waited_collect(thread);
-#endif
#if MACH_HOST
thread_unfreeze(thread);
@@ -1147,9 +1132,6 @@ void thread_halt_self(void)
* reaper thread.
*/
ipc_thread_terminate(thread);
-#if NET_ATM
- mk_waited_collect(thread);
-#endif
thread_hold(thread);
diff --git a/kern/thread.h b/kern/thread.h
index 9958e2b..b6c801f 100644
--- a/kern/thread.h
+++ b/kern/thread.h
@@ -38,7 +38,6 @@
#include <hw_footprint.h>
#include <mach_fixpri.h>
#include <mach_host.h>
-#include <net_atm.h>
#include <mach/boolean.h>
#include <mach/thread_info.h>
@@ -220,10 +219,6 @@ struct thread {
#if NCPUS > 1
processor_t last_processor; /* processor this last ran on */
#endif /* NCPUS > 1 */
-
-#if NET_ATM
- nw_ep_owned_t nw_ep_waited;
-#endif /* NET_ATM */
};
/* typedef of thread_t is in kern/kern_types.h */
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 01:49:47 +0000