folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compiler warning cleanup

Browse source
This commit is contained in:
Mark Pizzolato 2013-06-01 23:04:45 -07:00
parent e5ee32d411
commit 486ef58595
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
PDP11/pdp11_dup.c
View file

@ -728,7 +728,7 @@ sim_debug(DBG_TRC, DUPDPTR, "dup_svc(dup=%d)\n", dup);
if (!(dup_txcsr[dup] & TXCSR_M_TXDONE) && (!dup_xmtpkrdy[dup])) { if (!(dup_txcsr[dup] & TXCSR_M_TXDONE) && (!dup_xmtpkrdy[dup])) {
uint8 data = dup_txdbuf[dup] & TXDBUF_M_TXDBUF; uint8 data = dup_txdbuf[dup] & TXDBUF_M_TXDBUF;
dup_put_msg_bytes (dup, &data, (dup_txdbuf[dup] & TXDBUF_M_TEOM) ? 0 : 1, dup_txdbuf[dup] & TXDBUF_M_TSOM, (dup_txdbuf[dup] & TXDBUF_M_TEOM)); dup_put_msg_bytes (dup, &data, (dup_txdbuf[dup] & TXDBUF_M_TEOM) && (dptr == &dup_dev) ? 0 : 1, dup_txdbuf[dup] & TXDBUF_M_TSOM, (dup_txdbuf[dup] & TXDBUF_M_TEOM));
if (dup_xmtpkrdy[dup]) { /* Packet ready to send? */ if (dup_xmtpkrdy[dup]) { /* Packet ready to send? */
sim_debug(DBG_TRC, DUPDPTR, "dup_svc(dup=%d) - Packet Done %d bytes\n", dup, dup_xmtpkoffset[dup]); sim_debug(DBG_TRC, DUPDPTR, "dup_svc(dup=%d) - Packet Done %d bytes\n", dup, dup_xmtpkoffset[dup]);
ddcmp_packet_trace (DBG_PKT, DUPDPTR, ">>> XMT Packet", dup_xmtpacket[dup], dup_xmtpkoffset[dup], TRUE); ddcmp_packet_trace (DBG_PKT, DUPDPTR, ">>> XMT Packet", dup_xmtpacket[dup], dup_xmtpkoffset[dup], TRUE);
@ -900,10 +900,12 @@ if (sim_deb && dptr && (reason & dptr->dctrl)) {
sim_debug (reason, dptr, "(Unknown=0%o)\n", msg[1]); sim_debug (reason, dptr, "(Unknown=0%o)\n", msg[1]);
break; break;
} }
if (len != 8) if (len != 8) {
sim_debug (reason, dptr, "Unexpected Control Message Length: %d expected 8\n", len); sim_debug (reason, dptr, "Unexpected Control Message Length: %d expected 8\n", len);
if (0 != ddcmp_crc16 (0, msg, len)) }
if (0 != ddcmp_crc16 (0, msg, len)) {
sim_debug (reason, dptr, "Unexpected Message CRC\n"); sim_debug (reason, dptr, "Unexpected Message CRC\n");
}
break; break;
case DDCMP_DLE: /* Maintenance Message */ case DDCMP_DLE: /* Maintenance Message */
sim_debug (reason, dptr, "Maintenance Message, Link: %d, Count: %d, HDRCRC: %s, DATACRC: %s\n", msg[2]>>6, ((msg[2] & 0x3F) << 8)| msg[1], sim_debug (reason, dptr, "Maintenance Message, Link: %d, Count: %d, HDRCRC: %s, DATACRC: %s\n", msg[2]>>6, ((msg[2] & 0x3F) << 8)| msg[1],

3
scp.c
View file

@ -6431,8 +6431,9 @@ return 0;
double sim_gtime (void) double sim_gtime (void)
{ {
if (AIO_MAIN_THREAD) if (AIO_MAIN_THREAD) {
UPDATE_SIM_TIME; UPDATE_SIM_TIME;
}
return sim_time; return sim_time;
} }

3
sim_console.c
View file

@ -704,13 +704,14 @@ for (i=(was_stepping ? sim_rem_step_line : 0);
strcpy (cbuf, sim_rem_buf[i]); strcpy (cbuf, sim_rem_buf[i]);
sim_rem_buf_ptr[i] = 0; sim_rem_buf_ptr[i] = 0;
sim_rem_buf[i][sim_rem_buf_ptr[i]] = '\0'; sim_rem_buf[i][sim_rem_buf_ptr[i]] = '\0';
if (cbuf[0] == '\0') if (cbuf[0] == '\0') {
if (sim_rem_single_mode[i]) { if (sim_rem_single_mode[i]) {
sim_rem_single_mode[i] = FALSE; sim_rem_single_mode[i] = FALSE;
break; break;
} }
else else
continue; continue;
}
sim_sub_args (cbuf, sizeof(cbuf), argv); sim_sub_args (cbuf, sizeof(cbuf), argv);
cptr = cbuf; cptr = cbuf;
cptr = get_glyph (cptr, gbuf, 0); /* get command glyph */ cptr = get_glyph (cptr, gbuf, 0); /* get command glyph */

3
sim_tmxr.c
View file

@ -1817,7 +1817,7 @@ while (*tptr) {
sim_close_sock (sock, 1); sim_close_sock (sock, 1);
strcpy(listen, port); strcpy(listen, port);
cptr = get_glyph (cptr, option, ';'); cptr = get_glyph (cptr, option, ';');
if (option[0]) if (option[0]) {
if (0 == MATCH_CMD (option, "NOTELNET")) if (0 == MATCH_CMD (option, "NOTELNET"))
listennotelnet = TRUE; listennotelnet = TRUE;
else else
@ -1826,6 +1826,7 @@ while (*tptr) {
else else
return SCPE_ARG; return SCPE_ARG;
} }
}
if (line == -1) { if (line == -1) {
if (modem_control != mp->modem_control) if (modem_control != mp->modem_control)
return SCPE_ARG; return SCPE_ARG;