[Simh] [PATCH 09 of 14] sim_printf_log() changes for Interdata

Peter Lund firefly at vax64.dk
Mon Sep 10 17:09:43 EDT 2007


1 file changed, 2 insertions(+), 7 deletions(-)
Interdata/id_io.c |    9 ++-------


# HG changeset patch
# User Peter Lund <firefly at vax64.dk>
# Date 1189306567 -7200
# Node ID 626069f2f8eb52d666d9423988d86afe37b1ec68
# Parent  380e96a0c951a905ef4140d9faddc0a4eafca446
sim_printf_log() changes for Interdata

diff -r 380e96a0c951 -r 626069f2f8eb Interdata/id_io.c
--- a/Interdata/id_io.c	Sun Sep 09 04:55:51 2007 +0200
+++ b/Interdata/id_io.c	Sun Sep 09 04:56:07 2007 +0200
@@ -66,7 +66,6 @@ extern uint32 (*dev_tab[DEVNO])(uint32 d
 extern uint32 (*dev_tab[DEVNO])(uint32 dev, uint32 op, uint32 datout);
 extern uint32 pawidth;
 extern UNIT cpu_unit;
-extern FILE *sim_log;
 extern DEVICE *sim_devices[];
 
 uint32 sch_max = 2;                                     /* sch count */
@@ -347,9 +346,7 @@ if (newmax < sch_max) {                 
     for (i = 0; dptr = sim_devices[i]; i++) {           /* loop thru dev */
         dibp = (DIB *) dptr->ctxt;                      /* get DIB */
         if (dibp && (dibp->sch >= (int32) newmax)) {    /* dev using chan? */
-            printf ("Device %02X uses channel %d\n",
-                dibp->dno, dibp->sch);
-            if (sim_log) fprintf (sim_log, "Device %02X uses channel %d\n",
+            sim_printf_log ("Device %02X uses channel %d\n",
                 dibp->dno, dibp->sch);
             return SCPE_OK;
             }
@@ -588,9 +585,7 @@ for (i = 0; dptr = sim_devices[i]; i++) 
         dmsk = 1u << (t & 0x1F);                        /* bit to test */
         doff = t / 32;                                  /* word to test */
         if (dmap[doff] & dmsk) {                        /* in use? */
-            printf ("Device number conflict, devno = %02X\n", t);
-            if (sim_log) fprintf (sim_log,
-                "Device number conflict, devno = %02X\n", t);
+            sim_printf_log ("Device number conflict, devno = %02X\n", t);
             return TRUE;
             }
         dmap[doff] = dmap[doff] | dmsk;



More information about the Simh mailing list