* device/net_io.c [MACH_TTD]: Remove code.
* i386/i386/trap.c [MACH_TTD]: Likewise.
* i386/i386at/autoconf.c [MACH_TTD]: Likewise.
---
device/net_io.c | 29 -----------------------------
i386/i386/trap.c | 28 ----------------------------
i386/i386at/autoconf.c | 7 -------
3 files changed, 64 deletions(-)
diff --git a/device/net_io.c b/device/net_io.c
index f2c4c06..1e3b109 100644
--- a/device/net_io.c
+++ b/device/net_io.c
@@ -66,15 +66,6 @@
#include <machine/machspl.h>
-#if MACH_TTD
-#include <ttd/ttd_stub.h>
-#endif /* MACH_TTD */
-
-#if MACH_TTD
-int kttd_async_counter= 0;
-#endif /* MACH_TTD */
-
-
/*
* Packet Buffer Management
*
@@ -675,26 +666,6 @@ net_packet(
{
boolean_t awake;
-#if MACH_TTD
- /*
- * Do a quick check to see if it is a kernel TTD packet.
- *
- * Only check if KernelTTD is enabled, ie. the current
- * device driver supports TTD, and the bootp succeded.
- */
- if (kttd_enabled && kttd_handle_async(kmsg)) {
- /*
- * Packet was a valid ttd packet and
- * doesn't need to be passed up to filter.
- * The ttd code put the used kmsg buffer
- * back onto the free list.
- */
- if (kttd_debug)
- printf("**%x**", kttd_async_counter++);
- return;
- }
-#endif /* MACH_TTD */
-
kmsg->ikm_header.msgh_remote_port = (mach_port_t) ifp;
net_kmsg(kmsg)->net_rcv_msg_packet_count = count;
diff --git a/i386/i386/trap.c b/i386/i386/trap.c
index 3121d79..04c5d64 100644
--- a/i386/i386/trap.c
+++ b/i386/i386/trap.c
@@ -82,11 +82,6 @@ thread_kdb_return(void)
}
#endif /* MACH_KDB */
-#if MACH_TTD
-extern boolean_t kttd_enabled;
-boolean_t debug_all_traps_with_kttd = TRUE;
-#endif /* MACH_TTD */
-
void
user_page_fault_continue(kern_return_t kr)
{
@@ -322,10 +317,6 @@ dump_ss(regs);
else
printf("trap %d", type);
printf(", eip 0x%lx\n", regs->eip);
-#if MACH_TTD
- if (kttd_enabled && kttd_trap(type, code, regs))
- return;
-#endif /* MACH_TTD */
#if MACH_KDB
if (kdb_trap(type, code, regs))
return;
@@ -383,12 +374,6 @@ printf("user trap %d error %d sub %08x\n", type, code,
subcode);
break;
case T_DEBUG:
-#if MACH_TTD
- if (kttd_enabled && kttd_in_single_step()) {
- if (kttd_trap(type, regs->err, regs))
- return 0;
- }
-#endif /* MACH_TTD */
#if MACH_KDB
if (db_in_single_step()) {
if (kdb_trap(type, regs->err, regs))
@@ -400,11 +385,6 @@ printf("user trap %d error %d sub %08x\n", type, code,
subcode);
break;
case T_INT3:
-#if MACH_TTD
- if (kttd_enabled && kttd_trap(type, regs->err, regs))
- return 0;
- break;
-#endif /* MACH_TTD */
#if MACH_KDB
{
boolean_t db_find_breakpoint_here();
@@ -522,10 +502,6 @@ printf("user trap %d error %d sub %08x\n", type, code,
subcode);
return 0;
default:
-#if MACH_TTD
- if (kttd_enabled && kttd_trap(type, regs->err, regs))
- return 0;
-#endif /* MACH_TTD */
#if MACH_KDB
if (kdb_trap(type, regs->err, regs))
return 0;
@@ -538,10 +514,6 @@ printf("user trap %d error %d sub %08x\n", type, code,
subcode);
return 0;
}
-#if MACH_TTD
- if (debug_all_traps_with_kttd && kttd_trap(type, regs->err, regs))
- return 0;
-#endif /* MACH_TTD */
#if MACH_KDB
if (debug_all_traps_with_kdb &&
kdb_trap(type, regs->err, regs))
diff --git a/i386/i386at/autoconf.c b/i386/i386at/autoconf.c
index 0eefa5c..116a637 100644
--- a/i386/i386at/autoconf.c
+++ b/i386/i386at/autoconf.c
@@ -110,13 +110,6 @@ void probeio(void)
device->phys_address, i, "atbus"))
i++;
}
-
-#if MACH_TTD
- /*
- * Initialize Remote kernel debugger.
- */
- ttd_init();
-#endif /* MACH_TTD */
}
void take_dev_irq(
--
1.8.1.4
