From f5008d760fe4cd39df2bbb2330841a4521fbd3dd Mon Sep 17 00:00:00 2001 From: Richard Cornwell Date: Wed, 9 Feb 2022 10:03:44 -0500 Subject: [PATCH] KA10: Clean up windows build errors. --- PDP10/kl10_dn.c | 4 ++-- PDP10/ks10_ch11.c | 7 +------ PDP10/ks10_dup.c | 3 --- PDP10/ks10_uba.c | 2 +- PDP10/kx10_imp.c | 4 ---- 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/PDP10/kl10_dn.c b/PDP10/kl10_dn.c index 00ba4c3..1a7fcc7 100644 --- a/PDP10/kl10_dn.c +++ b/PDP10/kl10_dn.c @@ -617,10 +617,10 @@ error: goto error; in->spare = data1; cnt -= 2; - sim_debug(DEBUG_DATA, &dn_dev, "DTE: Read CMD: %o c=%o f=%o %s d=%o\n", + sim_debug(DEBUG_DATA, &dn_dev, "DTE: Read CMD: %o c=%o f=%o %s s=%o d=%o\n", dn_in_ptr, in->cnt, in->func, ((in->func & 0377) > PRI_EMLDV)?"***": - pri_name[in->func & 0377], in->dev); + pri_name[in->func & 0377], in->spare, in->dev); dp = &in->data[0]; for (; cnt > 0; cnt -=2) { /* Read in data */ diff --git a/PDP10/ks10_ch11.c b/PDP10/ks10_ch11.c index 6888778..fca3e50 100644 --- a/PDP10/ks10_ch11.c +++ b/PDP10/ks10_ch11.c @@ -138,6 +138,7 @@ MTAB ch11_mod[] = { DIB ch11_dib = { 0764140, 017, 0270, 6, 3, &ch11_read, &ch11_write, NULL, 0, 0 }; DEBTAB ch11_debug[] = { + { "DETAIL", DEBUG_DETAIL,"I/O operations"}, { "TRC", DBG_TRC, "Detailed trace" }, { "REG", DBG_REG, "Hardware registers" }, { "PKT", DBG_PKT, "Packets" }, @@ -161,9 +162,6 @@ int ch11_write(DEVICE *dptr, t_addr addr, uint16 data, int32 access) { struct pdp_dib *dibp = (DIB *)dptr->ctxt; - uint16 temp; - int ln; - TMLN *lp; int i; addr &= dibp->uba_mask; @@ -219,9 +217,6 @@ int ch11_read(DEVICE *dptr, t_addr addr, uint16 *data, int32 access) { struct pdp_dib *dibp = (DIB *)dptr->ctxt; - uint16 temp; - int ln; - TMLN *lp; int i; addr &= dibp->uba_mask; diff --git a/PDP10/ks10_dup.c b/PDP10/ks10_dup.c index 118aa3b..238491f 100644 --- a/PDP10/ks10_dup.c +++ b/PDP10/ks10_dup.c @@ -472,8 +472,6 @@ if ((dptr->units[0].flags & UNIT_DIS) != 0) return 1; dup = ((PA - dup_dib.uba_addr) >> 3); /* get line num */ PA &= dibp->uba_mask; -sim_debug(DEBUG_DETAIL, DUPDPTR, "dup_rd(PA=%010o [%s], data=0x%X) ", PA, dup_rd_regs[(PA >> 1) & 03], *data); -sim_debug_bits(DEBUG_DETAIL, DUPDPTR, bitdefs[(PA >> 1) & 03], (uint32)(orig_val), (uint32)(regs[(PA >> 1) & 03][dup]), TRUE); if (dup >= dup_desc.lines) /* validate line number */ return 1; @@ -518,7 +516,6 @@ int32 dup; int32 orig_val; sim_debug(DEBUG_DETAIL, DUPDPTR, "dup_wr(PA=%010o [%s], data=0x%X) ", PA, dup_wr_regs[(PA >> 1) & 03], data); -sim_debug_bits(DEBUG_DETAIL, DUPDPTR, bitdefs[(PA >> 1) & 03], (uint32)orig_val, (uint32)regs[(PA >> 1) & 03][dup], TRUE); if ((dptr->units[0].flags & UNIT_DIS) != 0) return 1; dup = ((PA - dup_dib.uba_addr) >> 3); /* get line num */ diff --git a/PDP10/ks10_uba.c b/PDP10/ks10_uba.c index a10824f..081a16b 100644 --- a/PDP10/ks10_uba.c +++ b/PDP10/ks10_uba.c @@ -188,8 +188,8 @@ uba_write(t_addr addr, int ctl, uint64 data, int access) continue; if (ctl == dibp->uba_ctl && dibp->uba_addr == (addr & (~dibp->uba_mask))) { uint16 buf = (uint16)(data & 0177777); - sim_debug(DEBUG_EXP, &cpu_dev, "UBA device write %02o %08o %012llo %06o\n", ctl, addr, data, buf); int r = dibp->wr_io(dptr, addr, buf, access); + sim_debug(DEBUG_EXP, &cpu_dev, "UBA device write %02o %08o %012llo %06o\n", ctl, addr, data, buf); if (r) break; return r; diff --git a/PDP10/kx10_imp.c b/PDP10/kx10_imp.c index cdcde90..164ee72 100644 --- a/PDP10/kx10_imp.c +++ b/PDP10/kx10_imp.c @@ -691,8 +691,6 @@ imp_wr(DEVICE *dptr, t_addr addr, uint16 data, int32 access) { struct pdp_dib *dibp = (DIB *)dptr->ctxt; UNIT *uptr = imp_unit; - uint16 temp; - int i; addr &= dibp->uba_mask; sim_debug(DEBUG_DETAIL, dptr, "IMP11 write %06o %06o %o\n", @@ -800,8 +798,6 @@ imp_rd(DEVICE *dptr, t_addr addr, uint16 *data, int32 access) { struct pdp_dib *dibp = (DIB *)dptr->ctxt; UNIT *uptr = imp_unit; - uint16 temp; - int i; addr &= dibp->uba_mask;