github.com/rcornwell.sims
1
0
Fork 0
mirror of https://github.com/rcornwell/sims.git synced 2026-02-26 00:34:10 +00:00
Code Releases Activity

B5500: Updated with current patches.

Browse Source
This commit is contained in:
Richard Cornwell
2016-06-05 17:29:40 -04:00
parent 2122b6f021
commit 0ef2476182
3 changed files with 90 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
B5500/b5500_dtc.c
View File

@@ -148,6 +148,8 @@ t_stat dtc_setnl (UNIT *, int32, CONST char *, void *);
t_stat dtc_set_log (UNIT *, int32, CONST char *, void *);
t_stat dtc_set_nolog (UNIT *, int32, CONST char *, void *);
t_stat dtc_show_log (FILE *, UNIT *, int32, CONST void *);
t_stat dtc_set_buf (UNIT *, int32, CONST char *, void *);
t_stat dtc_show_buf (FILE *, UNIT *, int32, CONST void *);
t_stat dtc_help(FILE *, DEVICE *, UNIT *, int32, const char *);
t_stat dtc_help_attach (FILE *, DEVICE *, UNIT *, int32, const char *);
const char *dtc_description(DEVICE *);
@@ -162,6 +164,7 @@ uint8 dtc_lstatus[DTC_MLINES]; /* Line status *
uint16 dtc_bufptr[DTC_MLINES]; /* Buffer pointer */
uint16 dtc_bsize[DTC_MLINES]; /* Buffer size */
uint16 dtc_blimit[DTC_MLINES]; /* Buffer size */
int dtc_bufsize = DTC_BUFSIZ;
MTAB dtc_mod[] = {
@@ -175,12 +178,14 @@ MTAB dtc_mod[] = {
NULL, &tmxr_show_cstat, (void *) &dtc_desc, "Display multiplexer statistics" },
{ MTAB_XTD|MTAB_VDV|MTAB_VALR, 0, "LINES", "LINES=n",
&dtc_setnl, &tmxr_show_lines, (void *) &dtc_desc, "Display number of lines" },
{ MTAB_XTD|MTAB_VDV|MTAB_VALR, 0, "BUFSIZE", "BUFSIZE=n",
&dtc_set_buf, &dtc_show_buf, (void *)&dtc_bufsize, "Set buffer size" },
{ MTAB_XTD|MTAB_VDV|MTAB_NC, 0, NULL, "LOG=n=file",
&dtc_set_log, NULL, &dtc_desc },
&dtc_set_log, NULL, (void *)&dtc_desc },
{ MTAB_XTD|MTAB_VDV|MTAB_VALR, 0, NULL, "NOLOG",
&dtc_set_nolog, NULL, &dtc_desc, "Disable logging on designated line" },
&dtc_set_nolog, NULL, (void *)&dtc_desc, "Disable logging on designated line" },
{ MTAB_XTD|MTAB_VDV|MTAB_NMO, 0, "LOG", NULL,
NULL, &dtc_show_log, &dtc_desc, "Display logging for all lines" },
NULL, &dtc_show_log, (void *)&dtc_desc, "Display logging for all lines" },
{0}
};
@@ -282,8 +287,12 @@ t_stat dtc_srv(UNIT * uptr)
sim_debug(DEBUG_DETAIL, &dtc_dev, "Datacomm inqury found %d %d ",
line, buf);
if (line != -1) {
chan_set_eof(chan);
sim_debug(DEBUG_DETAIL, &dtc_dev, " writerdy ");
if ((dtc_lstatus[line] & BufSMASK) == BufWriteRdy) {
chan_set_eof(chan);
sim_debug(DEBUG_DETAIL, &dtc_dev, " writerdy ");
} else {
sim_debug(DEBUG_DETAIL, &dtc_dev, " idle ");
}
} else if (buf != -1) {
chan_set_read(chan);
sim_debug(DEBUG_DETAIL, &dtc_dev, " readrdy ");
@@ -311,6 +320,9 @@ t_stat dtc_srv(UNIT * uptr)
chan_set_eof(chan);
sim_debug(DEBUG_DETAIL, &dtc_dev, " writerdy ");
break;
case BufIdle:
sim_debug(DEBUG_DETAIL, &dtc_dev, " idle ");
break;
default:
chan_set_error(chan);
sim_debug(DEBUG_DETAIL, &dtc_dev, " busy ");
@@ -368,7 +380,6 @@ t_stat dtc_srv(UNIT * uptr)
/* Ok to start filling */
case BufIdle:
case BufWriteRdy:
dtc_lstatus[line] = BufWrite;
dtc_bufptr[line] = 0;
dtc_bsize[line] = 0;
sim_debug(DEBUG_DETAIL, &dtc_dev, "Datacomm write start %d\n",
@@ -388,24 +399,31 @@ t_stat dtc_srv(UNIT * uptr)
if (dtc_lstatus[line] & BufAbnormal) {
chan_set_wcflg(chan);
}
dtc_lstatus[line] = BufOutBusy;
/* Empty write, clears flags */
if (dtc_bsize[line] == 0) {
sim_debug(DEBUG_DETAIL, &dtc_dev, "empty\n");
if ((dtc_lstatus[line] & BufSMASK) != BufIdle) {
dtc_lstatus[line] = BufIRQ|BufIdle;
IAR |= IRQ_12;
}
/* Check if we filled up buffer */
if (dtc_bsize[line] >= dtc_blimit[line]) {
} else if (dtc_bsize[line] >= dtc_blimit[line]) {
dtc_lstatus[line] = BufOutBusy;
chan_set_gm(chan);
sim_debug(DEBUG_DETAIL, &dtc_dev, "full ");
/* Empty write, clears flags */
} else if (dtc_bsize[line] == 0) {
sim_debug(DEBUG_DETAIL, &dtc_dev, "empty\n");
dtc_lstatus[line] = BufIdle;
} else {
dtc_lstatus[line] |= BufGM;
dtc_lstatus[line] = BufOutBusy|BufGM;
sim_debug(DEBUG_DETAIL, &dtc_dev, "gm ");
}
sim_debug(DEBUG_DETAIL, &dtc_dev, "\n");
for (ttu = 1; line > 15; ttu++)
line -= 15;
chan_set_wc(chan, (ttu << 5) | line);
chan_set_end(chan);
uptr->u5 = DTC_RDY;
return SCPE_OK;
} else {
dtc_lstatus[line] = BufWrite;
dtc_buf[line][dtc_bufptr[line]++] = ch & 077;
sim_debug(DEBUG_DATA, &dtc_dev, "Datacomm write data %d %02o %d\n",
line, ch&077, dtc_bufptr[line]);
@@ -464,14 +482,18 @@ t_stat dtc_srv(UNIT * uptr)
if (dtc_lstatus[line] & BufAbnormal)
chan_set_wcflg(chan);
if (dtc_ldsc[line].conn == 0) /* connected? */
dtc_lstatus[line] = BufNotReady;
dtc_lstatus[line] = BufIRQ|BufNotReady;
else
dtc_lstatus[line] = BufIdle;
dtc_lstatus[line] = BufIRQ|BufIdle;
dtc_bsize[line] = 0;
chan_set_end(chan);
uptr->u5 = DTC_RDY;
sim_debug(DEBUG_DETAIL, &dtc_dev, "Datacomm read done %d\n",
line);
for (ttu = 1; line > 15; ttu++)
line -= 15;
chan_set_wc(chan, (ttu << 5) | line);
chan_set_end(chan);
uptr->u5 = DTC_RDY;
IAR |= IRQ_12;
return SCPE_OK;
} else {
sim_debug(DEBUG_DATA, &dtc_dev, "Datacomm read data %d %02o %d\n",
@@ -495,7 +517,7 @@ dtco_srv(UNIT * uptr)
sim_clock_coschedule(uptr, tmxr_poll);
ln = tmxr_poll_conn(&dtc_desc); /* look for connect */
if (ln >= 0) { /* got one? */
dtc_blimit[ln] = DTC_BUFSIZ-1;
dtc_blimit[ln] = dtc_bufsize-1;
dtc_lstatus[ln] = BufIRQ|BufAbnormal|BufWriteRdy;
IAR |= IRQ_12;
sim_debug(DEBUG_DETAIL, &dtc_dev, "Datacomm connect %d\n", ln);
@@ -559,6 +581,16 @@ dtco_srv(UNIT * uptr)
"Datacomm recieve ENQ %d\n", ln);
t = 0;
break;
case '\003': /* ^B send STX */
dtc_lstatus[ln] &= ~BufSMASK;
dtc_lstatus[ln] |= BufIRQ|BufReadRdy|BufAbnormal;
dtc_buf[ln][0] = 0;
dtc_buf[ln][1] = 017;
dtc_buf[ln][2] = 077;
dtc_bsize[ln] = 1;
IAR |= IRQ_12;
t = 0;
break;
case '}':
dtc_buf[ln][dtc_bufptr[ln]++] = 017;
dtc_lstatus[ln] |= BufAbnormal;
@@ -574,6 +606,7 @@ dtco_srv(UNIT * uptr)
dtc_bsize[ln] = dtc_bufptr[ln];
IAR |= IRQ_12;
t = 0;
c1 = 0;
sim_debug(DEBUG_DETAIL, &dtc_dev,
"Datacomm recieve %d return\n", ln);
break;
@@ -593,7 +626,7 @@ dtco_srv(UNIT * uptr)
}
c1 = 0;
sim_debug(DEBUG_DATA, &dtc_dev,
"Datacomm recieve %d backspace\n", ln);
"Datacomm recieve %d backspace %d\n", ln, dtc_bufptr[ln]);
break;
case '?':
sim_debug(DEBUG_DATA, &dtc_dev,
@@ -604,7 +637,8 @@ dtco_srv(UNIT * uptr)
break;
default:
sim_debug(DEBUG_DATA, &dtc_dev,
"Datacomm recieve %d %02x %c %02o\n", ln, c, c, c1);
"Datacomm recieve %d %02x %c %02o %d\n", ln, c, c, c1,
dtc_bufptr[ln]);
}
if (t && c1) {
tmxr_putc_ln(&dtc_ldsc[ln], con_to_ascii[c1]);
@@ -810,6 +844,33 @@ t_stat dtc_show_log (FILE *st, UNIT *uptr, int32 val, CONST void *desc)
return SCPE_OK;
}
/* SET BUFFER processor */
t_stat dtc_set_buf (UNIT *uptr, int32 val, CONST char *cptr, void *desc)
{
t_stat r;
int32 bufsiz;
if (cptr == NULL)
return SCPE_ARG;
bufsiz = (int32) get_uint (cptr, 10, DTC_BUFSIZ, &r);
if ((r != SCPE_OK) || (bufsiz >= DTC_BUFSIZ))
return SCPE_ARG;
if (bufsiz > 0 && (bufsiz % 28) == 0) {
dtc_bufsize = bufsiz;
return SCPE_OK;
}
return SCPE_ARG;
}
/* SHOW BUFFER processor */
t_stat dtc_show_buf (FILE *st, UNIT *uptr, int32 val, CONST void *desc)
{
fprintf (st, "bufsize=%d ", dtc_bufsize);
return SCPE_OK;
}
/* Show summary processor */
t_stat
@@ -857,6 +918,11 @@ fprintf (st, "The B249 is a terminal multiplexor. Up to %d lines are supported.
fprintf (st, "The default number of lines is %d. The number of lines can\n", DTC_MLINES);
fprintf (st, "be changed with the command\n\n");
fprintf (st, " sim> SET %s LINES=n set line count to n\n\n", dptr->name);
fprintf (st, "The default buffer size for all lines can be set to a multiple of 28\n");
fprintf (st, "to a max of %d characters. Changes will take effect when ", DTC_BUFSIZ);
fprintf (st, "devices connect.\nThis number must match what MCP believes to be the ");
fprintf (st, "buffer size.\n\n");
fprintf (st, " sim> SET %s BUFSIZE=n set buffer size to n\n\n", dptr->name);
fprintf (st, "The B249 supports logging on a per-line basis. The command\n\n");
fprintf (st, " sim> SET %s LOG=n=filename\n\n", dptr->name);
fprintf (st, "enables logging for the specified line(n) to the indicated file. The command\n\n");

26
B5500/b5500_io.c
View File

@@ -296,29 +296,7 @@ chan_set_end(int chan) {
else
D[chan] |= ((t_uint64)(CC[chan] & 07)) << DEV_WC_V;
}
/* Flush last buffer if short write */
if ((D[chan] & DEV_IORD) && CC[chan] != 0) {
uint16 addr = (uint16)(D[chan] & CORE);
if ((D[chan] & (DEV_BIN|DEV_WCFLG)) == 0) {
/* Insert group mark */
if (D[chan] & DEV_BACK) {
W[chan] |= (t_uint64)037LL << ((CC[chan]) * 6);
CC[chan]++;
} else {
while(CC[chan] != 8) {
W[chan] |= 037LL << ((7 - CC[chan]) * 6);
CC[chan]++;
}
}
}
M[addr] = W[chan];
sim_debug(DEBUG_DATA, &chan_dev, "write(%d, %05o, %016llo)f\n",
chan, addr, W[chan]);
(void)chan_advance(chan);
}
M[014+chan] = D[chan];
if (loading == 0)
IAR |= IRQ_5 << chan;
@@ -550,6 +528,7 @@ int chan_write_char(int chan, uint8 *ch, int flags) {
if (chan_advance(chan))
return 1;
W[chan] = 0;
}
if (flags) {
if ((D[chan] & (DEV_BIN|DEV_WCFLG)) == 0) {
@@ -573,9 +552,10 @@ int chan_write_char(int chan, uint8 *ch, int flags) {
uint16 addr = (uint16)(D[chan] & CORE);
M[addr] = W[chan];
sim_debug(DEBUG_DATA, &chan_dev, "write(%d, %05o, %016llo)\n",
sim_debug(DEBUG_DATA, &chan_dev, "writef(%d, %05o, %016llo)\n",
chan, addr, W[chan]);
(void)chan_advance(chan);
W[chan] = 0;
}
status[chan] |= EOR;
return 1;

2
B5500/b5500_urec.c
View File

@@ -38,7 +38,7 @@
/* For Card reader, when set returns end of file at end of deck. */
/* Reset after sent to system */
#define MODE_EOF (0x40 << UNIT_V_MODE)
#define MODE_EOF (0x40 << UNIT_V_CARD_MODE)