github.com/rcornwell.sims
1
0
Fork 0
mirror of https://github.com/rcornwell/sims.git synced 2026-02-22 23:28:47 +00:00
Code Releases Activity

SCP: Updated to current.

Browse Source
This commit is contained in:
Richard Cornwell
2020-11-07 15:36:32 -05:00
parent e9eb79aee9
commit 7e7689bbf1
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sim_card.h
View File

@@ -139,9 +139,9 @@ t_stat sim_card_show_fmt (FILE *st, UNIT *uptr, int32 val, CONST void *desc);
t_stat sim_card_attach_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr);
/* Translation tables */
extern CONST char sim_six_to_ascii[64]; /* Map BCD to ASCII */
extern CONST char sim_ascii_to_six[128]; /* Map 7 bit ASCII to BCD */
extern CONST uint8 sim_parity_table[64]; /* 64 entry odd parity table */
extern const char sim_six_to_ascii[64]; /* Map BCD to ASCII */
extern const char sim_ascii_to_six[128]; /* Map 7 bit ASCII to BCD */
extern const uint8 sim_parity_table[64]; /* 64 entry odd parity table */
/* Unit test routine */
extern t_stat sim_card_test (DEVICE *dptr);

22
sim_tmxr.c
View File

@@ -1654,9 +1654,9 @@ return SCPE_OK;
bits_to_clear TMXR_MDM_DTR and/or TMXR_MDM_RTS as desired
Output:
incoming_bits if non NULL, returns the current stat of DCD,
RNG, CTS and DSR along with the current state
of DTR and RTS
status_bits if non NULL, returns all of the current signal
state bits (incoming: DCD, RNG, CTS, DSR) along
with the specifically settable bits (DTR, RTS)
Implementation note:
@@ -1665,7 +1665,7 @@ return SCPE_OK;
to a network socket (or could be) then the network session state is
set, cleared and/or returned.
*/
t_stat tmxr_set_get_modem_bits (TMLN *lp, int32 bits_to_set, int32 bits_to_clear, int32 *incoming_bits)
t_stat tmxr_set_get_modem_bits (TMLN *lp, int32 bits_to_set, int32 bits_to_clear, int32 *status_bits)
{
int32 before_modem_bits, incoming_state;
DEVICE *dptr;
@@ -1745,10 +1745,10 @@ if ((lp->modembits != before_modem_bits) && (sim_deb && lp->mp && dptr)) {
sim_debug_bits (TMXR_DBG_MDM, dptr, tmxr_modem_bits, before_modem_bits, lp->modembits, FALSE);
sim_debug (TMXR_DBG_MDM, dptr, " - Line %d - %p\n", (int)(lp-lp->mp->ldsc), lp->txb);
}
if (incoming_bits)
*incoming_bits = (lp->modembits & TMXR_MDM_INCOMING);
if (status_bits)
*status_bits = (lp->modembits & (TMXR_MDM_INCOMING | TMXR_MDM_OUTGOING));
if (lp->mp && lp->modem_control) { /* This API ONLY works on modem_control enabled multiplexer lines */
if ((bits_to_set | bits_to_clear) || incoming_bits) {/* Anything to do? */
if ((bits_to_set | bits_to_clear) || status_bits) {/* Anything to do? */
if (lp->loopback) {
if ((lp->modembits ^ before_modem_bits) & TMXR_MDM_DTR) { /* DTR changed? */
lp->ser_connect_pending = (lp->modembits & TMXR_MDM_DTR);
@@ -1757,9 +1757,9 @@ if (lp->mp && lp->modem_control) { /* This API ONLY works on mo
return SCPE_OK;
}
if (lp->serport) {
t_stat r = sim_control_serial (lp->serport, bits_to_set, bits_to_clear, incoming_bits);
if (incoming_bits && (r == SCPE_OK))
lp->modembits = (lp->modembits & ~TMXR_MDM_INCOMING) | *incoming_bits;
t_stat r = sim_control_serial (lp->serport, bits_to_set, bits_to_clear, status_bits);
if (status_bits && (r == SCPE_OK))
lp->modembits = (lp->modembits & ~TMXR_MDM_INCOMING) | *status_bits;
return r;
}
if ((lp->sock) || (lp->connecting)) {
@@ -1792,7 +1792,7 @@ if ((lp->sock) || (lp->connecting)) {
}
}
if ((lp->serport) && (!lp->loopback))
sim_control_serial (lp->serport, 0, 0, incoming_bits);
sim_control_serial (lp->serport, 0, 0, status_bits);
return SCPE_INCOMP;
}