From fdb33ce135b32a5629e1d595061efb0f5fd973c6 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Tue, 5 Nov 2013 16:42:17 -0800 Subject: [PATCH] Compiler warning cleanup --- H316/h316_stddev.c | 2 +- PDP11/pdp11_ke.c | 2 +- PDP11/pdp11_rf.c | 4 ++-- PDP11/pdp11_tc.c | 6 +++--- PDP11/pdp11_tm.c | 2 +- VAX/vax_vc.c | 9 ++++++--- scp.c | 3 ++- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/H316/h316_stddev.c b/H316/h316_stddev.c index beb334cf..a624b8cb 100644 --- a/H316/h316_stddev.c +++ b/H316/h316_stddev.c @@ -598,7 +598,7 @@ switch (inst) { /* case on opcode */ tty_busy = 0; tty_mode = 0; /* mode is input */ tty_2nd = 0; -/* sim_cancel (&tty_unit[TTO]); /* cancel output */ +/* sim_cancel (&tty_unit[TTO]); *//* cancel output */ } CLR_INT (INT_TTY); /* clear intr */ break; diff --git a/PDP11/pdp11_ke.c b/PDP11/pdp11_ke.c index ae916d99..656e52ba 100644 --- a/PDP11/pdp11_ke.c +++ b/PDP11/pdp11_ke.c @@ -360,7 +360,7 @@ const char *const text = "KE11A Extended Arithmetic Option (KE)\n" "\n" " The KE11A extended arithmetic option (KE) provides multiply, divide,\n" -" normalization, and multi-bit shift capability on Unibus PDP-11’s that\n" +" normalization, and multi-bit shift capability on Unibus PDP-11's that\n" " lack the EIS instruction set.\n" "\n" " The KE11-A performs five arithmetic operations.\n" diff --git a/PDP11/pdp11_rf.c b/PDP11/pdp11_rf.c index a4d101ce..106feb8b 100644 --- a/PDP11/pdp11_rf.c +++ b/PDP11/pdp11_rf.c @@ -516,7 +516,7 @@ const char *const text = "RF11/RS11 Fixed Head Disk Controller (RF)\n" "\n" /*567901234567890123456789012345678901234567890123456789012345678901234567890*/ -" The RFll-A is a fast, low-cost, random·access bulk-storage system. An\n" +" The RFll-A is a fast, low-cost, random-access bulk-storage system. An\n" " RFll-A provides 262,144 17-bit words (16 data bits and 1 parity bit)\n" " of storage. Up to eight RSll disk platters can be controlled by one RFll\n" " Controller for a total of 2,047,152 words of storage. An RFll-A includes\n" @@ -529,7 +529,7 @@ const char *const text = " both disk storage and main memory in the PDP-11 system.\n" /*567901234567890123456789012345678901234567890123456789012345678901234567890*/ "\n" -" The RSll disk contains a nickel·cobalt·plated disk driven by a hysterisis\n" +" The RSll disk contains a nickel-cobalt-plated disk driven by a hysterisis\n" " synchronous motor. Data is recorded on a single disk surface by 128\n" " fixed read/write heads.\n" " Operation\n" diff --git a/PDP11/pdp11_tc.c b/PDP11/pdp11_tc.c index 110c176d..948332a3 100644 --- a/PDP11/pdp11_tc.c +++ b/PDP11/pdp11_tc.c @@ -1418,8 +1418,8 @@ const char *const text = " referred to as a line or as a character. Since. six lines make up a\n" " word, the tape can record, 18-bit data words. During normal data\n" " writing, the Controller disassembles the 18-bit word and distributes\n" -" the bits so they are recorded as six 3·bit characters. Since PDP-11\n" -" words are l6·bits long, the Controller writes the extra two bits as 0's\n" +" the bits so they are recorded as six 3-bit characters. Since PDP-11\n" +" words are l6-bits long, the Controller writes the extra two bits as 0's\n" " and ignores them when reading. However, during special modes, the\n" " extra two bits can be written and recovered.\n" "\n" @@ -1428,7 +1428,7 @@ const char *const text = " (forward and reverse), extension zones (forward and reverse), and the\n" " information zone. The two end zones (each approximately 10 feet) mark\n" " the end of the physical tape and are used for winding the tape around\n" -" the heads and onto the take·up reel. These zones never contain data.\n" +" the heads and onto the take-up reel. These zones never contain data.\n" " The forward and reverse extension areas mark the end of the information\n" " region of the tape. Their length is sufficient to ensure that once the\n" " end zone is entered and tape motion is reversed; there is adequate\n" diff --git a/PDP11/pdp11_tm.c b/PDP11/pdp11_tm.c index 1fd90502..2e521aa6 100644 --- a/PDP11/pdp11_tm.c +++ b/PDP11/pdp11_tm.c @@ -762,7 +762,7 @@ const char *const text = " read and executed the first record on tape. To allow for ANSI labels,\n" " the DEC standard bootstrap skipped the first record and read and executed\n" " the second. The DEC standard is the default; to bootstrap an original\n" -" format tape, use the command BOOT –O MTn. The TM11 is automatically\n" +" format tape, use the command BOOT -O MTn. The TM11 is automatically\n" " disabled in a Qbus system with more than 256KB of memory.\n"; fprintf (st, "%s", text); fprint_set_help (st, dptr); diff --git a/VAX/vax_vc.c b/VAX/vax_vc.c index 4c6e497e..2ef42b6c 100644 --- a/VAX/vax_vc.c +++ b/VAX/vax_vc.c @@ -644,19 +644,22 @@ if ((vc_intc.mode & 0x80) && ~(vc_intc.mode & 0x4)) { /* group int MM & not po } } if ((vc_csr & CSR_IEN) && (vc_icsr & ICSR_GRI)) { - if (!(int_req[IPL_QVSS] & (INT_QVSS))) + if (!(int_req[IPL_QVSS] & (INT_QVSS))) { sim_debug (DBG_INT, &vc_dev, "vc_checkint(SET_INT) icsr=0x%x\n", vc_icsr); + } SET_INT (QVSS); } else { - if ((int_req[IPL_QVSS] & (INT_QVSS))) + if ((int_req[IPL_QVSS] & (INT_QVSS))) { sim_debug (DBG_INT, &vc_dev, "vc_checkint(CLR_INT)\n"); + } CLR_INT (QVSS); } } else { - if ((int_req[IPL_QVSS] & (INT_QVSS))) + if ((int_req[IPL_QVSS] & (INT_QVSS))) { sim_debug (DBG_INT, &vc_dev, "vc_checkint(CLR_INT)\n"); + } CLR_INT (QVSS); } } diff --git a/scp.c b/scp.c index d1ea4005..3babe871 100644 --- a/scp.c +++ b/scp.c @@ -3684,9 +3684,10 @@ if (uptr->flags & UNIT_ATT) /* already attached? */ if (r != SCPE_OK) /* error? */ return r; } - else + else { if (!(uptr->dynflags & UNIT_ATTMULT)) return SCPE_ALATT; /* Already attached */ + } sim_trim_endspc (cptr); /* trim trailing spc */ return scp_attach_unit (dptr, uptr, cptr); /* attach */ }