1
0
mirror of https://github.com/simh/simh.git synced 2026-04-17 08:41:28 +00:00

TIMER, TMXR: Add casts for down-conversion potential compiler warnings

This commit is contained in:
J. David Bryan
2022-06-16 21:06:46 -07:00
committed by Mark Pizzolato
parent 13c9ca5bec
commit f7ccf334a2
2 changed files with 17 additions and 15 deletions

View File

@@ -1,6 +1,6 @@
/* sim_timer.c: simulator timer library /* sim_timer.c: simulator timer library
Copyright (c) 1993-2017, Robert M Supnik Copyright (c) 1993-2021, Robert M Supnik
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),
@@ -23,6 +23,7 @@
used in advertising or otherwise to promote the sale, use or other dealings used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from Robert M Supnik. in this Software without prior written authorization from Robert M Supnik.
01-Feb-21 JDB Added cast for down-conversion
22-May-17 RMS Hacked for V4.0 CONST compatibility 22-May-17 RMS Hacked for V4.0 CONST compatibility
23-Nov-15 RMS Fixed calibration lost path to reinitialize timer 23-Nov-15 RMS Fixed calibration lost path to reinitialize timer
28-Mar-15 RMS Revised to use sim_printf 28-Mar-15 RMS Revised to use sim_printf
@@ -561,10 +562,10 @@ else {
val = strtotv (cptr, &tptr, 10); val = strtotv (cptr, &tptr, 10);
if (cptr == tptr) if (cptr == tptr)
return SCPE_ARG; return SCPE_ARG;
c = toupper (*tptr++); c = (char) toupper (*tptr++);
if (*tptr != 0) if (*tptr != 0)
return SCPE_ARG; return SCPE_ARG;
if (c == 'M') if (c == 'M')
sim_throt_type = SIM_THROT_MCYC; sim_throt_type = SIM_THROT_MCYC;
else if (c == 'K') else if (c == 'K')
sim_throt_type = SIM_THROT_KCYC; sim_throt_type = SIM_THROT_KCYC;

View File

@@ -1,6 +1,6 @@
/* sim_tmxr.c: Telnet terminal multiplexor library /* sim_tmxr.c: Telnet terminal multiplexor library
Copyright (c) 2001-2020, Robert M Supnik Copyright (c) 2001-2021, Robert M Supnik
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),
@@ -26,6 +26,7 @@
Based on the original DZ11 simulator by Thord Nilson, as updated by Based on the original DZ11 simulator by Thord Nilson, as updated by
Arthur Krewat. Arthur Krewat.
31-Jan-21 JDB Added a cast in "tmxr_set_lnorder" from t_addr to uint32
26-Oct-20 JDB Line order now supports partial connection lists 26-Oct-20 JDB Line order now supports partial connection lists
23-Oct-20 JDB Added tmxr_table and tmxr_post_logs 23-Oct-20 JDB Added tmxr_table and tmxr_post_logs
tmxr_set_log now takes -N switch for new file tmxr_set_log now takes -N switch for new file
@@ -1107,12 +1108,12 @@ tptr = cptr + strlen (cptr); /* append a semicolon */
idx = 0; /* initialize the index of ordered values */ idx = 0; /* initialize the index of ordered values */
while (*cptr != '\0') { /* while characters remain in the command string */ while (*cptr != '\0') { /* while characters remain in the command string */
if (strncmp (cptr, "ALL;", 4) == 0) { /* if the parameter is "ALL" */ if (strncmp (cptr, "ALL;", 4) == 0) { /* if the parameter is "ALL" */
if (val != 0 || idx > 0 && idx <= max) /* then if some lines are restrictied or unspecified */ if (val != 0 || idx > 0 && idx <= max) /* then if some lines are restrictied or unspecified */
for (line = min; line <= max; line++) /* then fill them in sequentially */ for (line = (uint32) min; line <= max; line++) /* then fill them in sequentially */
if (set [line] == FALSE) /* setting each unspecified line */ if (set [line] == FALSE) /* setting each unspecified line */
list [idx++] = line; /* into the line order */ list [idx++] = line; /* into the line order */
cptr = cptr + 4; /* advance past "ALL" and the trailing semicolon */ cptr = cptr + 4; /* advance past "ALL" and the trailing semicolon */
@@ -1134,11 +1135,11 @@ while (*cptr != '\0') { /* while characters rema
break; /* and terminate the parse */ break; /* and terminate the parse */
} }
else /* otherwise it's a valid range */ else /* otherwise it's a valid range */
for (line = (uint32) low; line <= (uint32) high; line++) /* so add the line(s) to the order */ for (line = (uint32) low; line <= high; line++) /* so add the line(s) to the order */
if (set [line] == FALSE) { /* if the line number has not been specified */ if (set [line] == FALSE) { /* if the line number has not been specified */
set [line] = TRUE; /* then now it is */ set [line] = TRUE; /* then now it is */
list [idx++] = line; /* and add it to the connection order */ list [idx++] = line; /* and add it to the connection order */
} }
} }