folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

H316: Revised standard device implementation from Bob Supnik.

Browse source 
Fixes several bugs described several months ago on the simh list about how the hardware really works, most notably the "dummy" cycle created by an OCP '1 (switch to output mode). In addition, it fixes other problems (OCP '0 and OCP '1 are unconditional) and adds a "busy"
state on character input, like the real hardware.
This commit is contained in:
Mark Pizzolato 2013-10-11 09:16:28 -07:00
parent de6838756b
commit abfae3ca88
1 changed files with 116 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

167
H316/h316_stddev.c
View file

@ -1,6 +1,6 @@
/* h316_stddev.c: Honeywell 316/516 standard devices /* h316_stddev.c: Honeywell 316/516 standard devices
Copyright (c) 1999-2008, Robert M. Supnik Copyright (c) 1999-2013, Robert M. Supnik
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),
@ -28,6 +28,8 @@
tty 316/516-33 teleprinter tty 316/516-33 teleprinter
clk/options 316/516-12 real time clocks/internal options clk/options 316/516-12 real time clocks/internal options
10-Sep-13 RMS Fixed several bugs in the TTY logic
Added SET file type commands to PTR/PTP
09-Jun-07 RMS Fixed bug in clock increment (Theo Engel) 09-Jun-07 RMS Fixed bug in clock increment (Theo Engel)
30-Sep-06 RMS Fixed handling of non-printable characters in KSR mode 30-Sep-06 RMS Fixed handling of non-printable characters in KSR mode
03-Apr-06 RMS Fixed bugs in punch state handling (Theo Engel) 03-Apr-06 RMS Fixed bugs in punch state handling (Theo Engel)
@ -50,21 +52,37 @@
07-Sep-01 RMS Moved function prototypes 07-Sep-01 RMS Moved function prototypes
The ASR-33/35 reader/punch logic, and the ASCII file support for all paper tape The ASR-33/35 reader/punch logic, and the ASCII file support for all paper tape
devices, logic is taken, with grateful thanks, from Adrian Wise's H316 emulator. devices, is taken, with grateful thanks, from Adrian Wise's H316 emulator.
Teletype transitions:
- An OCP '1 starts an output sequence, unconditionally. Ready and Busy are both
set, and a dummy output sequence is started.
- If OTA "overtakes" the dummy output sequence, the dummy sequence is stopped,
and normal output takes place.
- If OTA is not issued before the dummy sequence completes, Busy is cleared.
Because Ready is set, an interrupt is requested.
- An OCP '0 starts an input sequence, unconditionally. Ready and Busy are both
cleared.
- When a character is available (either from the keyboard or the reader), Busy
is set.
- At the end of a delay, Busy is cleared and Ready is set, and an interrupt is
requested.
- At all times, the interrupt flag reflects the equation Ready & ~Busy.
Teletype reader transitions: Teletype reader transitions:
- SET TTY2 START puts the reader in RUN - SET TTY2 START puts the reader in RUN.
- XOFF from keyboard/reader stops the reader after 1-2 more characters are read - XOFF from keyboard/reader stops the reader after 1-2 more characters are read.
- XON from program starts the reader - XON from program starts the reader.
- Detach, SET TTY2 STOP, or end of file stops the reader - Detach, SET TTY2 STOP, or end of file stops the reader.
Teletype punch transitions: Teletype punch transitions:
- SET TTY3 START puts the punch in RUN - SET TTY3 START puts the punch in RUN.
- XOFF from program stops the punch after 1 more character is punched - XOFF from program stops the punch after 1 more character is punched.
- TAPE from program starts the punch after 1 character delay - TAPE from program starts the punch after 1 character delay.
- Detach or SET TTY3 STOP stops the punch - Detach or SET TTY3 STOP stops the punch.
*/ */
#include "h316_defs.h" #include "h316_defs.h"
@ -99,9 +117,13 @@ int32 ptp_ptime;
uint32 ttr_stopioe = 0; uint32 ttr_stopioe = 0;
uint32 tty_mode = 0; /* input (0), output (1) */ uint32 tty_mode = 0; /* input (0), output (1) */
uint32 tty_buf = 0; /* tty buffer */ uint32 tty_buf = 0; /* tty buffer */
uint32 tty_ready = 1; /* tty ready */
uint32 tty_busy = 0; /* tty busy */
uint32 tty_2nd = 0; /* tty input second state */
uint32 ttr_xoff_read = 0; uint32 ttr_xoff_read = 0;
uint32 ttp_tape_rcvd = 0; uint32 ttp_tape_rcvd = 0;
uint32 ttp_xoff_rcvd = 0; uint32 ttp_xoff_rcvd = 0;
int32 tty_busy_wait = SERIAL_IN_WAIT; /* busy state on input */
int32 clk_tps = 60; /* ticks per second */ int32 clk_tps = 60; /* ticks per second */
int32 ptrio (int32 inst, int32 fnc, int32 dat, int32 dev); int32 ptrio (int32 inst, int32 fnc, int32 dat, int32 dev);
@ -156,8 +178,12 @@ REG ptr_reg[] = {
}; };
MTAB pt_mod[] = { MTAB pt_mod[] = {
{ UNIT_ATT+UNIT_ASC+UNIT_UASC, UNIT_ATT+UNIT_ASC, "ASCII", NULL }, { UNIT_ATTABLE+UNIT_ASC+UNIT_UASC, UNIT_ATTABLE, NULL, "BINARY",
{ UNIT_ATT+UNIT_ASC+UNIT_UASC, UNIT_ATT+UNIT_ASC+UNIT_UASC, "Unix ASCII", NULL }, &ttrp_set_mode },
{ UNIT_ATTABLE+UNIT_ASC+UNIT_UASC, UNIT_ATTABLE+UNIT_ASC, "ASCII", "ASCII",
&ttrp_set_mode },
{ UNIT_ATTABLE+UNIT_ASC+UNIT_UASC, UNIT_ATTABLE+UNIT_ASC+UNIT_UASC, "Unix ASCII", "UASCII",
&ttrp_set_mode },
{ 0 } { 0 }
}; };
@ -228,11 +254,15 @@ UNIT tty_unit[] = {
REG tty_reg[] = { REG tty_reg[] = {
{ ORDATA (BUF, tty_buf, 8) }, { ORDATA (BUF, tty_buf, 8) },
{ ORDATA (IN2ND, tty_2nd, 9) },
{ FLDATA (MODE, tty_mode, 0) }, { FLDATA (MODE, tty_mode, 0) },
{ FLDATA (READY, dev_int, INT_V_TTY) }, { FLDATA (READY, tty_ready, 0) },
{ FLDATA (BUSY, tty_busy, 0) },
{ FLDATA (INT, dev_int, INT_V_TTY) },
{ FLDATA (ENABLE, dev_enb, INT_V_TTY) }, { FLDATA (ENABLE, dev_enb, INT_V_TTY) },
{ DRDATA (KPOS, tty_unit[TTI].pos, T_ADDR_W), PV_LEFT }, { DRDATA (KPOS, tty_unit[TTI].pos, T_ADDR_W), PV_LEFT },
{ DRDATA (KTIME, tty_unit[TTI].wait, 24), REG_NZ + PV_LEFT }, { DRDATA (KTIME, tty_unit[TTI].wait, 24), REG_NZ + PV_LEFT },
{ DRDATA (KBTIME, tty_busy_wait, 24), REG_NZ + PV_LEFT },
{ DRDATA (TPOS, tty_unit[TTO].pos, T_ADDR_W), PV_LEFT }, { DRDATA (TPOS, tty_unit[TTO].pos, T_ADDR_W), PV_LEFT },
{ DRDATA (TTIME, tty_unit[TTO].wait, 24), REG_NZ + PV_LEFT }, { DRDATA (TTIME, tty_unit[TTO].wait, 24), REG_NZ + PV_LEFT },
{ ORDATA (RXOFF, ttr_xoff_read, 2), REG_HIDDEN }, { ORDATA (RXOFF, ttr_xoff_read, 2), REG_HIDDEN },
@ -315,16 +345,16 @@ int32 ptrio (int32 inst, int32 fnc, int32 dat, int32 dev)
switch (inst) { /* case on opcode */ switch (inst) { /* case on opcode */
case ioOCP: /* OCP */ case ioOCP: /* OCP */
if (fnc & 016) /* only fnc 0,1 */ if ((fnc & 016) != 0) /* only fnc 0,1 */
return IOBADFNC (dat); return IOBADFNC (dat);
ptr_motion = fnc ^ 1; ptr_motion = fnc ^ 1;
if (fnc) /* fnc 1? stop */ if (fnc != 0) /* fnc 1? stop */
sim_cancel (&ptr_unit); sim_cancel (&ptr_unit);
else sim_activate (&ptr_unit, ptr_unit.wait); /* fnc 0? start */ else sim_activate (&ptr_unit, ptr_unit.wait); /* fnc 0? start */
break; break;
case ioSKS: /* SKS */ case ioSKS: /* SKS */
if (fnc & 013) /* only fnc 0,4 */ if ((fnc & 013) != 0) /* only fnc 0,4 */
return IOBADFNC (dat); return IOBADFNC (dat);
if (((fnc == 000) && TST_INT (INT_PTR)) || /* fnc 0? skip rdy */ if (((fnc == 000) && TST_INT (INT_PTR)) || /* fnc 0? skip rdy */
((fnc == 004) && !TST_INTREQ (INT_PTR))) /* fnc 4? skip !int */ ((fnc == 004) && !TST_INTREQ (INT_PTR))) /* fnc 4? skip !int */
@ -332,7 +362,7 @@ switch (inst) { /* case on opcode */
break; break;
case ioINA: /* INA */ case ioINA: /* INA */
if (fnc) /* only fnc 0 */ if (fnc != 0) /* only fnc 0 */
return IOBADFNC (dat); return IOBADFNC (dat);
if (TST_INT (INT_PTR)) { /* ready? */ if (TST_INT (INT_PTR)) { /* ready? */
CLR_INT (INT_PTR); /* clear ready */ CLR_INT (INT_PTR); /* clear ready */
@ -382,13 +412,14 @@ uptr->buf = c & 0377; /* get byte */
return SCPE_OK; return SCPE_OK;
} }
/* Paper tape attach routine - set or clear ASC/UASC flags if specified */ /* Paper tape attach routine - set or clear ASC/UASC flags if specified
Can be called for TTY units at well, hence, check for attachability */
t_stat pt_attach (UNIT *uptr, char *cptr) t_stat pt_attach (UNIT *uptr, char *cptr)
{ {
t_stat r; t_stat r;
if (!(uptr->flags & UNIT_ATTABLE)) if (!(uptr->flags & UNIT_ATTABLE)) /* not tti,tto */
return SCPE_NOFNC; return SCPE_NOFNC;
if ((r = attach_unit (uptr, cptr))) if ((r = attach_unit (uptr, cptr)))
return r; return r;
@ -406,7 +437,10 @@ return r;
t_stat pt_detach (UNIT *uptr) t_stat pt_detach (UNIT *uptr)
{ {
if (!(sim_switches & SIM_SW_REST)) sim_cancel (uptr); /* stop motion */ if (!(uptr->flags & UNIT_ATTABLE)) /* not tti,tto */
return SCPE_NOFNC;
if (!(sim_switches & SIM_SW_REST)) /* stop motion */
sim_cancel (uptr);
uptr->STA = 0; uptr->STA = 0;
return detach_unit (uptr); return detach_unit (uptr);
} }
@ -464,9 +498,9 @@ int32 ptpio (int32 inst, int32 fnc, int32 dat, int32 dev)
switch (inst) { /* case on opcode */ switch (inst) { /* case on opcode */
case ioOCP: /* OCP */ case ioOCP: /* OCP */
if (fnc & 016) /* only fnc 0,1 */ if ((fnc & 016) != 0) /* only fnc 0,1 */
return IOBADFNC (dat); return IOBADFNC (dat);
if (fnc) { /* fnc 1? pwr off */ if (fnc != 0) { /* fnc 1? pwr off */
CLR_INT (INT_PTP); /* not ready */ CLR_INT (INT_PTP); /* not ready */
ptp_power = 0; /* turn off power */ ptp_power = 0; /* turn off power */
sim_cancel (&ptp_unit); /* stop punch */ sim_cancel (&ptp_unit); /* stop punch */
@ -476,7 +510,7 @@ switch (inst) { /* case on opcode */
break; break;
case ioSKS: /* SKS */ case ioSKS: /* SKS */
if ((fnc & 012) || (fnc == 005)) /* only 0, 1, 4 */ if (((fnc & 012) !=0) || (fnc == 005)) /* only 0, 1, 4 */
return IOBADFNC (dat); return IOBADFNC (dat);
if (((fnc == 000) && TST_INT (INT_PTP)) || /* fnc 0? skip rdy */ if (((fnc == 000) && TST_INT (INT_PTP)) || /* fnc 0? skip rdy */
((fnc == 001) && /* fnc 1? skip ptp on */ ((fnc == 001) && /* fnc 1? skip ptp on */
@ -486,7 +520,7 @@ switch (inst) { /* case on opcode */
break; break;
case ioOTA: /* OTA */ case ioOTA: /* OTA */
if (fnc) /* only fnc 0 */ if (fnc != 0) /* only fnc 0 */
return IOBADFNC (dat); return IOBADFNC (dat);
if (TST_INT (INT_PTP)) { /* if ptp ready */ if (TST_INT (INT_PTP)) { /* if ptp ready */
CLR_INT (INT_PTP); /* clear ready */ CLR_INT (INT_PTP); /* clear ready */
@ -551,25 +585,29 @@ int32 ttyio (int32 inst, int32 fnc, int32 dat, int32 dev)
switch (inst) { /* case on opcode */ switch (inst) { /* case on opcode */
case ioOCP: /* OCP */ case ioOCP: /* OCP */
if (fnc & 016) /* only fnc 0,1 */ if ((fnc & 016) != 0) /* only fnc 0,1 */
return IOBADFNC (dat); return IOBADFNC (dat);
if (fnc && (tty_mode == 0)) { /* input to output? */ if (fnc != 0) { /* output */
if (!sim_is_active (&tty_unit[TTO])) /* set ready */ tty_ready = 1; /* set rdy, busy */
SET_INT (INT_TTY); tty_busy = 1; /* start dummy out */
tty_mode = 1; /* mode is output */ tty_mode = 1; /* mode is output */
sim_activate (&tty_unit[TTO], tty_unit[TTO].wait);
} }
else if ((fnc == 0) && tty_mode) { /* output to input? */ else { /* input? */
CLR_INT (INT_TTY); /* clear ready */ tty_ready = 0; /* clr rdy, busy */
tty_busy = 0;
tty_mode = 0; /* mode is input */ tty_mode = 0; /* mode is input */
tty_2nd = 0;
/* sim_cancel (&tty_unit[TTO]); /* cancel output */
} }
CLR_INT (INT_TTY); /* clear intr */
break; break;
case ioSKS: /* SKS */ case ioSKS: /* SKS */
if (fnc & 012) /* fnc 0,1,4,5 */ if ((fnc & 012) != 0) /* fnc 0,1,4,5 */
return IOBADFNC (dat); return IOBADFNC (dat);
if (((fnc == 000) && TST_INT (INT_TTY)) || /* fnc 0? skip rdy */ if (((fnc == 000) && tty_ready) || /* fnc 0? skip rdy */
((fnc == 001) && /* fnc 1? skip !busy */ ((fnc == 001) && !tty_busy) || /* fnc 1? skip !busy */
(!tty_mode || !sim_is_active (&tty_unit[TTO]))) ||
((fnc == 004) && !TST_INTREQ (INT_TTY)) || /* fnc 4? skip !int */ ((fnc == 004) && !TST_INTREQ (INT_TTY)) || /* fnc 4? skip !int */
((fnc == 005) && (tty_mode || /* fnc 5? skip !xoff */ ((fnc == 005) && (tty_mode || /* fnc 5? skip !xoff */
((tty_buf & 0177) != XOFF)))) /* input & XOFF char */ ((tty_buf & 0177) != XOFF)))) /* input & XOFF char */
@ -577,30 +615,30 @@ switch (inst) { /* case on opcode */
break; break;
case ioINA: /* INA */ case ioINA: /* INA */
if (fnc & 005) /* only 0,2 */ if ((fnc & 005) != 0) /* only 0,2 */
return IOBADFNC (dat); return IOBADFNC (dat);
if (TST_INT (INT_TTY)) { /* ready? */ if (tty_ready) { /* ready? */
if (tty_mode == 0) /* inp? clear rdy */ tty_ready = 0; /* clear rdy */
CLR_INT (INT_TTY); CLR_INT (INT_TTY); /* no interrupt */
return IOSKIP (dat | return IOSKIP (dat |
(tty_buf & ((fnc & 002)? 077: 0377))); (tty_buf & ((fnc & 002)? 077: 0377)));
} }
break; break;
case ioOTA: case ioOTA:
if (fnc & 015) /* only 0,2 */ if ((fnc & 015) != 0) /* only 0,2 */
return IOBADFNC (dat); return IOBADFNC (dat);
if (TST_INT (INT_TTY)) { /* ready? */ if (tty_ready) { /* ready? */
tty_buf = dat & 0377; /* store char */ tty_buf = dat & 0377; /* store char */
if (fnc & 002) { /* binary mode? */ if (fnc & 002) { /* binary mode? */
tty_buf = tty_buf | 0100; /* set ch 7 */ tty_buf = tty_buf | 0100; /* set ch 7 */
if (tty_buf & 040) if (tty_buf & 040)
tty_buf = tty_buf & 0277; tty_buf = tty_buf & 0277;
} }
if (tty_mode) { tty_ready = 0; /* clear ready */
tty_busy = 1; /* set busy */
CLR_INT (INT_TTY); /* clr int */
sim_activate (&tty_unit[TTO], tty_unit[TTO].wait); sim_activate (&tty_unit[TTO], tty_unit[TTO].wait);
CLR_INT (INT_TTY);
}
return IOSKIP (dat); return IOSKIP (dat);
} }
break; break;
@ -617,6 +655,14 @@ int32 out, c;
UNIT *ruptr = &tty_unit[TTR]; UNIT *ruptr = &tty_unit[TTR];
sim_activate (uptr, uptr->wait); /* continue poll */ sim_activate (uptr, uptr->wait); /* continue poll */
if (tty_2nd) { /* char pending? */
tty_buf = tty_2nd & 0377;
tty_2nd = 0;
tty_busy = 0; /* clr busy */
tty_ready = 1; /* set ready */
SET_INT (INT_TTY); /* set int */
return SCPE_OK;
}
if ((c = sim_poll_kbd ()) >= SCPE_KFLAG) { /* character? */ if ((c = sim_poll_kbd ()) >= SCPE_KFLAG) { /* character? */
out = c & 0177; /* mask echo to 7b */ out = c & 0177; /* mask echo to 7b */
if (c & SCPE_BREAK) /* break? */ if (c & SCPE_BREAK) /* break? */
@ -664,12 +710,15 @@ else if ((ruptr->flags & UNIT_ATT) && /* TTR attached */
out = c; /* echo char */ out = c; /* echo char */
} }
else return SCPE_OK; /* no char */ else return SCPE_OK; /* no char */
if (tty_mode == 0) { /* input mode? */
tty_buf = c & 0377; /* put char in buf */
SET_INT (INT_TTY); /* set flag */
}
tto_write (out); /* echo to printer */ tto_write (out); /* echo to printer */
return ttp_write (out); /* and punch */ ttp_write (out); /* and punch */
if (tty_mode == 0) { /* input mode? */
tty_2nd = (c & 0377) | 0400; /* flag 2nd state */
tty_busy = 1; /* set busy */
CLR_INT (INT_TTY); /* clear interrupt */
sim_activate_abs (uptr, tty_busy_wait); /* sched busy period */
}
return SCPE_OK;
} }
/* Output service - printer and punch */ /* Output service - printer and punch */
@ -681,6 +730,11 @@ UNIT *ruptr = &tty_unit[TTR];
UNIT *puptr = &tty_unit[TTP]; UNIT *puptr = &tty_unit[TTP];
t_stat r; t_stat r;
if ((tty_ready != 0) && (tty_busy != 0)) { /* dummy cycle? */
tty_busy = 0; /* clr busy */
SET_INT (INT_TTY); /* set intr */
return SCPE_OK;
}
c7b = tty_buf & 0177; c7b = tty_buf & 0177;
if (ttp_tape_rcvd != 0) { /* prev = tape? */ if (ttp_tape_rcvd != 0) { /* prev = tape? */
ttp_tape_rcvd--; /* decrement state */ ttp_tape_rcvd--; /* decrement state */
@ -706,7 +760,9 @@ if ((r = tto_write (tty_buf)) != SCPE_OK) { /* print; error? */
} }
if ((r = ttp_write (tty_buf)) != SCPE_OK) /* punch; error? */ if ((r = ttp_write (tty_buf)) != SCPE_OK) /* punch; error? */
return r; return r;
SET_INT (INT_TTY); /* set done flag */ tty_busy = 0; /* clr busy, set rdy */
tty_ready = 1;
SET_INT (INT_TTY); /* set intr */
return SCPE_OK; return SCPE_OK;
} }
@ -758,6 +814,9 @@ CLR_INT (INT_TTY); /* clear ready, enb */
CLR_ENB (INT_TTY); CLR_ENB (INT_TTY);
tty_mode = 0; /* mode = input */ tty_mode = 0; /* mode = input */
tty_buf = 0; tty_buf = 0;
tty_2nd = 0;
tty_ready = 1;
tty_busy = 0;
ttr_xoff_read = 0; /* clr TTR, TTP flags */ ttr_xoff_read = 0; /* clr TTR, TTP flags */
ttp_tape_rcvd = 0; ttp_tape_rcvd = 0;
ttp_xoff_rcvd = 0; ttp_xoff_rcvd = 0;
@ -785,7 +844,7 @@ return SCPE_OK;
t_stat ttrp_set_mode (UNIT *uptr, int32 val, char *cptr, void *desc) t_stat ttrp_set_mode (UNIT *uptr, int32 val, char *cptr, void *desc)
{ {
if (!(uptr->flags & UNIT_ATTABLE)) /* TTR, TTP only */ if (!(uptr->flags & UNIT_ATTABLE)) /* PTR, PTP, TTR, TTP only */
return SCPE_NOFNC; return SCPE_NOFNC;
if (!(val & UNIT_UASC)) if (!(val & UNIT_UASC))
uptr->STA &= ~LF_PEND; uptr->STA &= ~LF_PEND;
@ -800,10 +859,10 @@ if (!(uptr->flags & UNIT_ATTABLE)) /* TTR, TTP only */
return SCPE_NOFNC; return SCPE_NOFNC;
if (!(uptr->flags & UNIT_ATT)) /* must be attached */ if (!(uptr->flags & UNIT_ATT)) /* must be attached */
return SCPE_UNATT; return SCPE_UNATT;
if (val) /* start? set running */ if (val != 0) /* start? set running */
uptr->STA |= RUNNING; uptr->STA |= RUNNING;
else uptr->STA &= ~RUNNING; /* stop? clr running */ else uptr->STA &= ~RUNNING; /* stop? clr running */
if (uptr->flags & UNIT_ROABLE) /* TTR? cancel stop */ if ((uptr->flags & UNIT_ROABLE) != 0) /* TTR? cancel stop */
ttr_xoff_read = 0; ttr_xoff_read = 0;
else ttp_tape_rcvd = ttp_xoff_rcvd = 0; /* TTP? cancel all */ else ttp_tape_rcvd = ttp_xoff_rcvd = 0; /* TTP? cancel all */
return SCPE_OK; return SCPE_OK;
@ -816,10 +875,10 @@ int32 clkio (int32 inst, int32 fnc, int32 dat, int32 dev)
switch (inst) { /* case on opcode */ switch (inst) { /* case on opcode */
case ioOCP: /* OCP */ case ioOCP: /* OCP */
if (fnc & 015) /* only fnc 0,2 */ if ((fnc & 015) != 0) /* only fnc 0,2 */
return IOBADFNC (dat); return IOBADFNC (dat);
CLR_INT (INT_CLK); /* reset ready */ CLR_INT (INT_CLK); /* reset ready */
if (fnc) /* fnc = 2? stop */ if (fnc != 0) /* fnc = 2? stop */
sim_cancel (&clk_unit); sim_cancel (&clk_unit);
else { /* fnc = 0? */ else { /* fnc = 0? */
if (!sim_is_active (&clk_unit)) if (!sim_is_active (&clk_unit))