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

Arranged sequencing of Modem RING and DCD bits to be presented together if DTR is not on and DCD only if DTR is on.

Browse source
This commit is contained in:
Mark Pizzolato 2013-01-25 12:00:53 -08:00
parent 9dcf5dc25e
commit bb9f9155f2
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
sim_tmxr.c
View file

@ -1055,24 +1055,36 @@ return SCPE_OK;
*/ */
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 *incoming_bits)
{ {
int32 changed_modem_bits;
tmxr_debug_trace_line (lp, "tmxr_set_get_modem_bits()"); tmxr_debug_trace_line (lp, "tmxr_set_get_modem_bits()");
if ((bits_to_set & ~(TMXR_MDM_OUTGOING)) || /* Assure only settable bits */ if ((bits_to_set & ~(TMXR_MDM_OUTGOING)) || /* Assure only settable bits */
(bits_to_clear & ~(TMXR_MDM_OUTGOING)) || (bits_to_clear & ~(TMXR_MDM_OUTGOING)) ||
(bits_to_set & bits_to_clear)) /* and can't set and clear the same bits */ (bits_to_set & bits_to_clear)) /* and can't set and clear the same bits */
return SCPE_ARG; return SCPE_ARG;
changed_modem_bits = lp->modembits;
lp->modembits |= bits_to_set;
lp->modembits &= bits_to_clear;
changed_modem_bits ^= lp->modembits;
if (incoming_bits) { if (incoming_bits) {
if ((lp->sock) || (lp->serport)) if ((lp->sock) || (lp->serport)) {
*incoming_bits = TMXR_MDM_DCD | TMXR_MDM_CTS | TMXR_MDM_DSR; if (lp->modembits & TMXR_MDM_DTR)
*incoming_bits = TMXR_MDM_DCD | TMXR_MDM_CTS | TMXR_MDM_DSR;
else
*incoming_bits = TMXR_MDM_RNG | TMXR_MDM_DCD | TMXR_MDM_CTS | TMXR_MDM_DSR;
}
else else
*incoming_bits = (lp->mp && lp->mp->master) ? (TMXR_MDM_CTS | TMXR_MDM_DSR) : 0; *incoming_bits = (lp->mp && lp->mp->master) ? (TMXR_MDM_CTS | TMXR_MDM_DSR) : 0;
} }
if (lp->mp && lp->mp->modem_control) { /* This API ONLY works on modem_control enabled multiplexers */ if (lp->mp && lp->mp->modem_control) { /* This API ONLY works on modem_control enabled multiplexers */
if (lp->serport) if (bits_to_set | bits_to_clear) { /* Anything to do? */
return sim_control_serial (lp->serport, bits_to_set, bits_to_clear, incoming_bits); if (lp->serport)
if (lp->sock) { return sim_control_serial (lp->serport, bits_to_set, bits_to_clear, incoming_bits);
if (bits_to_clear&TMXR_MDM_DTR) /* drop DTR? */ if (lp->sock) {
tmxr_reset_ln (lp); if (bits_to_clear&TMXR_MDM_DTR) /* drop DTR? */
tmxr_reset_ln (lp);
}
} }
return SCPE_OK; return SCPE_OK;
} }
@ -2675,6 +2687,7 @@ for (i = 0; i < mp->lines; i++) { /* loop thru conn */
free (lp->port); free (lp->port);
lp->port = NULL; lp->port = NULL;
} }
lp->modembits = 0;
} }
if (mp->master) if (mp->master)

1
sim_tmxr.h
View file

@ -115,6 +115,7 @@ struct tmln {
int32 txdrp; /* xmt drop count */ int32 txdrp; /* xmt drop count */
int32 txbsz; /* xmt buffer size */ int32 txbsz; /* xmt buffer size */
int32 txbfd; /* xmt buffered flag */ int32 txbfd; /* xmt buffered flag */
int32 modembits; /* modem bits which are currently set */
FILE *txlog; /* xmt log file */ FILE *txlog; /* xmt log file */
FILEREF *txlogref; /* xmt log file reference */ FILEREF *txlogref; /* xmt log file reference */
char *txlogname; /* xmt log file name */ char *txlogname; /* xmt log file name */