mirror of
https://github.com/open-simh/simh.git
synced 2026-01-25 19:57:36 +00:00
SCP: Added generic output routine sim_printf to output to stdout and sim_log (and sim_deb when enabled)
The goals here being to simplify calling code while getting consistent output delivered everywhere it may be useful. Modified most places which explicitly used sim_log or merely called printf to now avoid doing that and merely call sim_printf().
This commit is contained in:
@@ -982,11 +982,8 @@ for (i = 0; (dptr = sim_devices[i]); i++) { /* loop thru devices */
|
||||
for (j = 0; j < tplp->num; j++) { /* repeat as needed */
|
||||
doff = dev + tplp->off + j; /* get offset dnum */
|
||||
if (dev_map[doff][ch]) { /* slot in use? */
|
||||
printf ("Device number conflict, chan = %s, devno = %02o\n",
|
||||
chname[ch], doff);
|
||||
if (sim_log)
|
||||
fprintf (sim_log, "Device number conflict, chan = %s, dev = %02o\n",
|
||||
chname[ch], doff);
|
||||
sim_printf ("Device number conflict, chan = %s, devno = %02o\n",
|
||||
chname[ch], doff);
|
||||
return TRUE;
|
||||
}
|
||||
dev_map[doff][ch] = dibp->xfr; /* set xfr flag */
|
||||
|
||||
@@ -278,7 +278,7 @@ if ((temp = getc (ptr_unit.fileref)) == EOF) { /* end of file? */
|
||||
ptr_set_err (); /* yes, err, disc */
|
||||
if (feof (ptr_unit.fileref)) { /* end of file? */
|
||||
if (ptr_stopioe)
|
||||
printf ("PTR end of file\n");
|
||||
sim_printf ("PTR end of file\n");
|
||||
else return SCPE_OK;
|
||||
}
|
||||
else perror ("PTR I/O error"); /* I/O error */
|
||||
|
||||
Reference in New Issue
Block a user