github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-04-16 00:21:35 +00:00
Code Releases Activity

General cleanup migrate to using sim_printf vs separate calls to printf and fprintf(sim_log).

Browse Source
This commit is contained in:
Mark Pizzolato
2014-10-22 17:12:14 -07:00
parent 593a5950d1
commit 3256c10c77
12 changed files with 34 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sigma/sigma_io.c
View File

@@ -1290,26 +1290,17 @@ for (i = 0; (dptr = sim_devices[i]) != NULL; i++) {
if ((ch >= chan_num) ||
(dev >= CHAN_N_DEV) ||
(dio >= DIO_N_MOD)) {
printf ("%s: invalid device address, chan = %d, dev = %X, dio = %X\n",
sim_dname (dptr), ch, DVA_GETDEV (dibp->dva), dio);
if (sim_log)
fprintf (sim_log, "%s: invalid device address, chan = %d, dev = %X, dio = %X\n",
sim_printf ("%s: invalid device address, chan = %d, dev = %X, dio = %X\n",
sim_dname (dptr), ch, DVA_GETDEV (dibp->dva), dio);
return SCPE_STOP;
}
if ((dibp->disp != NULL) && (chan[ch].disp[dev] != NULL)) {
printf ("%s: device address conflict, chan = %d, dev = %X\n",
sim_dname (dptr), ch, DVA_GETDEV (dibp->dva));
if (sim_log)
fprintf (sim_log, "%s: device address conflict, chan = %d, dev = %X\n",
sim_printf ("%s: device address conflict, chan = %d, dev = %X\n",
sim_dname (dptr), ch, DVA_GETDEV (dibp->dva));
return SCPE_STOP;
}
if ((dibp->dio_disp != NULL) && (dio_disp[dio] != NULL)) {
printf ("%s: direct I/O address conflict, dio = %X\n",
sim_dname (dptr), dio);
if (sim_log)
fprintf (sim_log, "%s: direct I/O address conflict, dio = %X\n",
sim_printf ("%s: direct I/O address conflict, dio = %X\n",
sim_dname (dptr), dio);
return SCPE_STOP;
}