From b83faa76de59346c0f7670195f81d46a1d052f16 Mon Sep 17 00:00:00 2001 From: Richard Cornwell Date: Tue, 19 Mar 2024 12:02:25 -0400 Subject: [PATCH] I7000: Clean up compiler warning from CMake --- I7000/i7000_cdp.c | 2 -- I7000/i7010_cpu.c | 4 ---- I7000/i701_chan.c | 1 - I7000/i7090_chan.c | 41 +++++++++++++++++++++-------------------- 4 files changed, 21 insertions(+), 27 deletions(-) diff --git a/I7000/i7000_cdp.c b/I7000/i7000_cdp.c index f4c63a7..873a89f 100644 --- a/I7000/i7000_cdp.c +++ b/I7000/i7000_cdp.c @@ -461,12 +461,10 @@ cdp_get_input(FILE *st, UNIT *uptr, int32 v, CONST void *desc) { int u = (uptr - cdp_unit); UNIT *iuptr = &cdp_input_unit[u]; - int i; if (uptr == NULL) return SCPE_IERR; - i = (iuptr->flags & INPUT_MASK) >> INPUT_V; switch((iuptr->flags & INPUT_MASK) >> INPUT_V) { case INPUT_BLANK >> INPUT_V: fprintf(st, "%d blanks", iuptr->u3); diff --git a/I7000/i7010_cpu.c b/I7000/i7010_cpu.c index 8f0c2f8..02d3b29 100644 --- a/I7000/i7010_cpu.c +++ b/I7000/i7010_cpu.c @@ -409,10 +409,6 @@ void WriteP(uint32 MA, uint8 v) { if (fault) return; - - if (MA == 275) { - int x = v+1; - } if (reloc && (MA & BBIT) == 0 && MAR > 100) { if (low_addr > 0) { MAR += low_addr; diff --git a/I7000/i701_chan.c b/I7000/i701_chan.c index 9e4f4a5..9f9aa2b 100644 --- a/I7000/i701_chan.c +++ b/I7000/i701_chan.c @@ -258,7 +258,6 @@ chan_write(int chan, t_uint64 * data, int flags) int chan_read(int chan, t_uint64 * data, int flags) { - /* Return END_RECORD if requested */ if (flags & DEV_WEOR) { chan_flags[chan] &= ~(DEV_WEOR); diff --git a/I7000/i7090_chan.c b/I7000/i7090_chan.c index 8d9639f..71ea906 100644 --- a/I7000/i7090_chan.c +++ b/I7000/i7090_chan.c @@ -598,29 +598,30 @@ chan_proc() } /* Wait for device to recognize EOR */ - if (chan_flags[chan] & DEV_WEOR) + if (chan_flags[chan] & DEV_WEOR) { continue; + } - /* Check if got EOR */ - if (chan_flags[chan] & DEV_REOR) { - switch (cmd[chan] & 070) { - case IORP: - chan_flags[chan] &= ~(DEV_REOR); - if (chan_dev.dctrl & cmask) - sim_debug(DEBUG_DETAIL, &chan_dev, - "chan %d EOR> %o\n", chan, cmd[chan] & 070); - chan_fetch(chan); - chan_flags[chan] |= STA_ACTIVE; - break; - case IORT: - chan_flags[chan] &= ~(DEV_REOR|STA_ACTIVE); - chan_flags[chan] |= STA_TWAIT; - if (chan_dev.dctrl & cmask) - sim_debug(DEBUG_DETAIL, &chan_dev, - "chan %d EOR> %o\n", chan, cmd[chan] & 070); - continue; - } + /* Check if got EOR */ + if (chan_flags[chan] & DEV_REOR) { + switch (cmd[chan] & 070) { + case IORP: + chan_flags[chan] &= ~(DEV_REOR); + if (chan_dev.dctrl & cmask) + sim_debug(DEBUG_DETAIL, &chan_dev, + "chan %d EOR> %o\n", chan, cmd[chan] & 070); + chan_fetch(chan); + chan_flags[chan] |= STA_ACTIVE; + break; + case IORT: + chan_flags[chan] &= ~(DEV_REOR|STA_ACTIVE); + chan_flags[chan] |= STA_TWAIT; + if (chan_dev.dctrl & cmask) + sim_debug(DEBUG_DETAIL, &chan_dev, + "chan %d EOR> %o\n", chan, cmd[chan] & 070); + continue; } + } /* Give device new word if we have one */ if (wcount[chan] != 0) {