github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-01-26 12:02:14 +00:00
Code Releases Activity

All LP and CD devices: Removed use of ftell for pipe compatibility

Browse Source 
Merge changes from v3.12-2
This commit is contained in:
Bob Supnik
2022-06-16 16:13:46 -07:00
committed by Mark Pizzolato
parent 1182157a4d
commit d35f4d9695
16 changed files with 141 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
PDP18B/pdp18b_lp.c
View File

@@ -1,6 +1,6 @@
/* pdp18b_lp.c: 18b PDP's line printer simulator
Copyright (c) 1993-2017, Robert M Supnik
Copyright (c) 1993-2021, 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"),
@@ -28,6 +28,7 @@
lp09 (PDP-9,15) LP09 line printer
lp15 (PDP-15) LP15 line printer
09-Jun-21 RMS Reverted use of ftell for pipe compatibility
13-Mar-17 RMS Annotated fall throughs in switch
10-Mar-16 RMS Added 3-cycle databreak set/show entry
07-Mar-16 RMS Revised for dynamically allocated memory
@@ -190,12 +191,12 @@ if (lp62_spc) { /* space? */
if ((uptr->flags & UNIT_ATT) == 0) /* attached? */
return IORETURN (lp62_stopioe, SCPE_UNATT);
fputs (lp62_cc[lp62_spc & 07], uptr->fileref); /* print cctl */
uptr->pos = ftell (uptr->fileref); /* update position */
if (ferror (uptr->fileref)) { /* error? */
sim_perror ("LPT I/O error");
clearerr (uptr->fileref);
return SCPE_IOERR;
}
uptr->pos = uptr->pos + strlen (lp62_cc[lp62_spc & 07]); /* update position */
lp62_ovrpr = 0; /* clear overprint */
}
else {
@@ -205,12 +206,13 @@ else {
if (lp62_ovrpr) /* overprint? */
fputc ('\r', uptr->fileref);
fputs (lp62_buf, uptr->fileref); /* print buffer */
uptr->pos = ftell (uptr->fileref); /* update position */
if (ferror (uptr->fileref)) { /* test error */
sim_perror ("LPT I/O error");
clearerr (uptr->fileref);
return SCPE_IOERR;
}
uptr->pos = uptr->pos + strlen (lp62_buf) + /* update position */
(lp62_ovrpr? 1: 0); /* including \r */
lp62_bp = 0;
for (i = 0; i <= LP62_BSIZE; i++) /* clear buffer */
lp62_buf[i] = 0;
@@ -439,23 +441,23 @@ if ((lp647_iot & 020) == 0) { /* print? */
for (i = 0; i < LP647_BSIZE; i++) /* clear buffer */
lp647_buf[i] = 0;
fputs (pbuf, uptr->fileref); /* print buffer */
uptr->pos = ftell (uptr->fileref); /* update position */
if (ferror (uptr->fileref)) { /* error? */
sim_perror ("LPT I/O error");
clearerr (uptr->fileref);
lp647_bp = 0;
return SCPE_IOERR;
}
uptr->pos = uptr->pos + strlen (pbuf); /* update position */
lp647_bp = 0; /* clear buffer ptr */
}
if (lp647_iot & 060) { /* space? */
fputs (lp647_cc[lp647_iot & 07], uptr->fileref); /* write cctl */
uptr->pos = ftell (uptr->fileref); /* update position */
if (ferror (uptr->fileref)) { /* error? */
sim_perror ("LPT I/O error");
clearerr (uptr->fileref);
return SCPE_IOERR;
}
uptr->pos = uptr->pos + strlen (lp647_cc[lp647_iot & 07]);
}
return SCPE_OK;
}
@@ -838,7 +840,6 @@ for (more = 1; more != 0; ) { /* loop until ctrl */
lp15_buf[lp15_bp] = 0; /* append nul */
fputs (lp15_buf, uptr->fileref); /* print line */
fputs (ctrl[c[i] & 037], uptr->fileref); /* space */
uptr->pos = ftell (uptr->fileref);
if (ferror (uptr->fileref)) { /* error? */
sim_perror ("LPT I/O error");
clearerr (uptr->fileref);
@@ -846,6 +847,8 @@ for (more = 1; more != 0; ) { /* loop until ctrl */
lp15_updsta (STA_DON | STA_ALM);
return SCPE_IOERR;
}
uptr->pos = uptr->pos + strlen (lp15_buf) /* update position */
+ strlen (ctrl[c[i] & 037]); /* incl spacing */
lp15_bp = more = 0;
}
else {