From 9700c9116a90de1428346b107062f31a6a4ef31f Mon Sep 17 00:00:00 2001 From: Bob Supnik Date: Sat, 18 Mar 2017 23:46:10 -0700 Subject: [PATCH] PDP8: Added LS8E decode (6660) for WPS8 and PKSTF As discussed in #353 --- PDP8/pdp8_ct.c | 4 ++-- PDP8/pdp8_lp.c | 8 +++++++- PDP8/pdp8_sys.c | 7 ++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/PDP8/pdp8_ct.c b/PDP8/pdp8_ct.c index 52017b7d..46933185 100644 --- a/PDP8/pdp8_ct.c +++ b/PDP8/pdp8_ct.c @@ -201,8 +201,8 @@ REG ct_reg[] = { { DRDATA (STIME, ct_stime, 24), PV_LEFT + REG_NZ }, { DRDATA (CTIME, ct_ctime, 24), PV_LEFT + REG_NZ }, { FLDATA (STOP_IOE, ct_stopioe, 0) }, - { URDATA (UFNC, ct_unit[0].FNC, 8, 4, 0, CT_NUMDR, REG_HRO ) }, - { URDATA (UST, ct_unit[0].UST, 8, 2, 0, CT_NUMDR, REG_HRO ) }, + { URDATA (UFNC, ct_unit[0].FNC, 8, 4, 0, CT_NUMDR, REG_HRO) }, + { URDATA (UST, ct_unit[0].UST, 8, 2, 0, CT_NUMDR, REG_HRO) }, { URDATA (POS, ct_unit[0].pos, 10, T_ADDR_W, 0, CT_NUMDR, PV_LEFT | REG_RO) }, { FLDATA (DEVNUM, ct_dib.dev, 6), REG_HRO }, diff --git a/PDP8/pdp8_lp.c b/PDP8/pdp8_lp.c index 6c111367..fff8bda7 100644 --- a/PDP8/pdp8_lp.c +++ b/PDP8/pdp8_lp.c @@ -1,6 +1,6 @@ /* pdp8_lp.c: PDP-8 line printer simulator - Copyright (c) 1993-2011, Robert M Supnik + Copyright (c) 1993-2016, Robert M Supnik Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -25,6 +25,7 @@ lpt LP8E line printer + 15-Dec-16 RMS Added LS8E decode (6660) for WPS8 (Dave Gesswein) 19-Jan-07 RMS Added UNIT_TEXT 25-Apr-03 RMS Revised for extended file support 04-Oct-02 RMS Added DIB, enable/disable, device number support @@ -91,6 +92,11 @@ int32 lpt (int32 IR, int32 AC) { switch (IR & 07) { /* decode IR<9:11> */ + case 0: /* PKSTF */ + dev_done = dev_done | INT_LPT; /* set flag */ + int_req = INT_UPDATE; /* update interrupts */ + return AC; + case 1: /* PSKF */ return (dev_done & INT_LPT)? IOT_SKP + AC: AC; diff --git a/PDP8/pdp8_sys.c b/PDP8/pdp8_sys.c index ef308605..d21a8047 100644 --- a/PDP8/pdp8_sys.c +++ b/PDP8/pdp8_sys.c @@ -1,6 +1,6 @@ /* pdp8_sys.c: PDP-8 simulator interface - Copyright (c) 1993-2013, Robert M Supnik + Copyright (c) 1993-2016, Robert M Supnik Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -23,6 +23,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Robert M Supnik. + 15-Dec-16 RMS Added PKLF (Dave Gesswein) 17-Sep-13 RMS Fixed recognition of initial field change (Dave Gesswein) 24-Mar-09 RMS Added link to FPP 24-Jun-08 RMS Fixed bug in new rim loader (Don North) @@ -305,7 +306,7 @@ static const char *opcode[] = { "DCEA", "DEAL", "DEAC", "DFSE", "DFSC", "DISK", "DMAC", "DCXA", "DXAL", "DXAC", - "PSKF", "PCLF", "PSKE", /* LPT */ + "PKLF", "PSKF", "PCLF", "PSKE", /* LPT */ "PSTB", "PSIE", "PCLF PSTB", "PCIE", "LWCR", "CWCR", "LCAR", /* MT */ "CCAR", "LCMR", "LFGR", "LDBR", @@ -368,7 +369,7 @@ static const int32 opc_val[] = { 06774+I_IOA+AMB_TD, 06775+I_IOA+AMB_TD, 06776+I_IOA+AMB_TD, 06777+I_IOA+AMB_TD, 06530+I_NPN, 06531+I_NPN, 06532+I_NPN, 06533+I_NPN, /* AD */ 06534+I_NPN, 06535+I_NPN, 06536+I_NPN, 06537+I_NPN, - 06601+I_NPN, 06603+I_NPN, 06605+I_NPN, /* DF/RF */ + 06660+I_NPN, 06601+I_NPN, 06603+I_NPN, 06605+I_NPN, /* DF/RF */ 06611+I_NPN, 06612+I_NPN, 06615+I_NPN, 06616+I_NPN, 06611+I_NPN, 06615+I_NPN, 06616+I_NPN, 06621+I_NPN, 06622+I_NPN, 06623+I_NPN, 06626+I_NPN,