From 4a2513f42d75489ae63221ac3032fc93b8d1e516 Mon Sep 17 00:00:00 2001 From: Richard Cornwell Date: Tue, 25 Feb 2020 21:58:44 -0500 Subject: [PATCH] KA10: Minor cleanup. --- PDP10/ka10_ai.c | 2 +- PDP10/kl10_fe.c | 34 +++++++++++++++------------------- PDP10/kl10_nia.c | 2 ++ PDP10/kx10_imp.c | 4 ++-- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/PDP10/ka10_ai.c b/PDP10/ka10_ai.c index 263bafa..3a63b4a 100644 --- a/PDP10/ka10_ai.c +++ b/PDP10/ka10_ai.c @@ -279,7 +279,7 @@ DEVICE ai_dev = { AI_NAME, ai_unit, ai_reg, ai_mod, NUM_UNITS, 8, 18, 1, 8, 36, NULL, NULL, &ai_reset, NULL, &ai_attach, &ai_detach, - &ai_dib, DEV_DISABLE | DEV_DEBUG, 0, ai_debug, + &ai_dib, DEV_DISABLE | DEV_DEBUG | DEV_DIS, 0, ai_debug, NULL, NULL, &ai_help, NULL, NULL, &ai_description }; diff --git a/PDP10/kl10_fe.c b/PDP10/kl10_fe.c index 795221e..dcb4280 100644 --- a/PDP10/kl10_fe.c +++ b/PDP10/kl10_fe.c @@ -2429,24 +2429,20 @@ t_stat tty_detach (UNIT *uptr) { int32 i; t_stat reason; +sim_cancel (uptr); reason = tmxr_detach (&tty_desc, uptr); for (i = 0; i < tty_desc.lines; i++) tty_ldsc[i].rcve = 0; -sim_cancel (uptr); return reason; } t_stat tty_help (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr) { -fprintf (st, "DC10E Terminal Interfaces\n\n"); -fprintf (st, "The DC10 supported up to 8 blocks of 8 lines. Modem control was on a seperate\n"); -fprintf (st, "line. The simulator supports this by setting modem control to a fixed offset\n"); -fprintf (st, "from the given line. The number of lines is specified with a SET command:\n\n"); -fprintf (st, " sim> SET DC LINES=n set number of additional lines to n [8-32]\n\n"); +fprintf (st, "FE Terminal Interfaces\n\n"); +fprintf (st, "The FE terminal could support up to 256 lines, in groups of 16\n"); +fprintf (st, "lines. The number of lines is specified with a SET command:\n\n"); +fprintf (st, " sim> SET TTY LINES=n set number of additional lines to n [8-32]\n\n"); fprintf (st, "Lines must be set in multiples of 8.\n"); -fprintf (st, "The default offset for modem lines is 32. This can be changed with\n\n"); -fprintf (st, " sim> SET DC MODEM=n set offset for modem control to n [8-32]\n\n"); -fprintf (st, "Modem control must be set larger then the number of lines\n"); fprintf (st, "The ATTACH command specifies the port to be used:\n\n"); tmxr_attach_help (st, dptr, uptr, flag, cptr); fprintf (st, "The additional terminals can be set to one of four modes: UC, 7P, 7B, or 8B.\n\n"); @@ -2459,28 +2455,28 @@ fprintf (st, " non-printing characters suppressed fprintf (st, " 7B high-order bit cleared high-order bit cleared\n"); fprintf (st, " 8B no changes no changes\n\n"); fprintf (st, "The default mode is 7P.\n"); -fprintf (st, "Finally, each line supports output logging. The SET DCn LOG command enables\n"); +fprintf (st, "Finally, each line supports output logging. The SET TTYn LOG command enables\n"); fprintf (st, "logging on a line:\n\n"); -fprintf (st, " sim> SET DCn LOG=filename log output of line n to filename\n\n"); -fprintf (st, "The SET DCn NOLOG command disables logging and closes the open log file,\n"); +fprintf (st, " sim> SET TTYn LOG=filename log output of line n to filename\n\n"); +fprintf (st, "The SET TTYn NOLOG command disables logging and closes the open log file,\n"); fprintf (st, "if any.\n\n"); -fprintf (st, "Once DC is attached and the simulator is running, the terminals listen for\n"); +fprintf (st, "Once TTY is attached and the simulator is running, the terminals listen for\n"); fprintf (st, "connections on the specified port. They assume that the incoming connections\n"); fprintf (st, "are Telnet connections. The connections remain open until disconnected either\n"); -fprintf (st, "by the Telnet client, a SET DC DISCONNECT command, or a DETACH DC command.\n\n"); +fprintf (st, "by the Telnet client, a SET TTY DISCONNECT command, or a DETACH TTY command.\n\n"); fprintf (st, "Other special commands:\n\n"); -fprintf (st, " sim> SHOW DC CONNECTIONS show current connections\n"); -fprintf (st, " sim> SHOW DC STATISTICS show statistics for active connections\n"); -fprintf (st, " sim> SET DCn DISCONNECT disconnects the specified line.\n"); +fprintf (st, " sim> SHOW TTY CONNECTIONS show current connections\n"); +fprintf (st, " sim> SHOW TTY STATISTICS show statistics for active connections\n"); +fprintf (st, " sim> SET TTYn DISCONNECT disconnects the specified line.\n"); fprint_reg_help (st, &tty_dev); fprintf (st, "\nThe additional terminals do not support save and restore. All open connections\n"); -fprintf (st, "are lost when the simulator shuts down or DC is detached.\n"); +fprintf (st, "are lost when the simulator shuts down or TTY is detached.\n"); return SCPE_OK; } const char *tty_description (DEVICE *dptr) { -return "DC10E asynchronous line interface"; +return "FE asynchronous line interface"; } #endif diff --git a/PDP10/kl10_nia.c b/PDP10/kl10_nia.c index a9b73f7..0ab731a 100644 --- a/PDP10/kl10_nia.c +++ b/PDP10/kl10_nia.c @@ -1646,6 +1646,8 @@ t_stat nia_detach(UNIT* uptr) { if (uptr->flags & UNIT_ATT) { + sim_cancel(&nia_unit[1]); + sim_cancel(&nia_unit[2]); eth_close (&nia_data.etherface); free(uptr->filename); uptr->filename = NULL; diff --git a/PDP10/kx10_imp.c b/PDP10/kx10_imp.c index 81d6f01..31fdf9a 100644 --- a/PDP10/kx10_imp.c +++ b/PDP10/kx10_imp.c @@ -2772,12 +2772,12 @@ t_stat imp_detach(UNIT* uptr) if (uptr->flags & UNIT_DHCP) { imp_dhcp_release(&imp_data); } + sim_cancel (uptr+1); /* stop the packet timing services */ + sim_cancel (uptr+2); /* stop the clock timer services */ eth_close (&imp_data.etherface); free(uptr->filename); uptr->filename = NULL; uptr->flags &= ~UNIT_ATT; - sim_cancel (uptr+1); /* stop the packet timing services */ - sim_cancel (uptr+2); /* stop the clock timer services */ } return SCPE_OK; }