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

sim_tmxr.c - Fixed behavior when I/O errors happen on serial port connections. Now a message is displayed and the serial port is closed as opposed to the prior behavior where messages would be spewed incessantly with no benefit.

Browse source
This commit is contained in:
Mark Pizzolato 2012-10-27 12:50:50 -07:00
parent b356a98ea9
commit 8b59f2a12a
1 changed files with 39 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
sim_tmxr.c
View file

@ -392,7 +392,7 @@ return;
static void tmxr_report_connection (TMXR *mp, TMLN *lp) static void tmxr_report_connection (TMXR *mp, TMLN *lp)
{ {
int32 written, psave; int32 unwritten, psave;
char cmsg[80]; char cmsg[80];
char dmsg[80] = ""; char dmsg[80] = "";
char lmsg[80] = ""; char lmsg[80] = "";
@ -428,9 +428,9 @@ lp->txbpi = lp->txbpr; /* insert connection mes
tmxr_linemsg (lp, msgbuf); /* beginning of buffer */ tmxr_linemsg (lp, msgbuf); /* beginning of buffer */
lp->txbpi = psave; /* restore insertion pointer */ lp->txbpi = psave; /* restore insertion pointer */
written = tmxr_send_buffered_data (lp); /* send the message */ unwritten = tmxr_send_buffered_data (lp); /* send the message */
if (written == 0) /* buffer now empty? */ if (unwritten == 0) /* buffer now empty? */
lp->xmte = 1; /* reenable transmission if paused */ lp->xmte = 1; /* reenable transmission if paused */
lp->txcnt -= (int32)strlen (msgbuf); /* adjust statistics */ lp->txcnt -= (int32)strlen (msgbuf); /* adjust statistics */
@ -816,20 +816,28 @@ return -1; /* no new connections ma
DTR is dropped and raised again after 500ms to signal the attached serial device. DTR is dropped and raised again after 500ms to signal the attached serial device.
*/ */
t_stat tmxr_reset_ln (TMLN *lp) static t_stat tmxr_reset_ln_ex (TMLN *lp, t_bool closeserial)
{ {
tmxr_debug_trace_line (lp, "tmxr_reset_ln()");
if (lp->txlog) /* logging? */ if (lp->txlog) /* logging? */
fflush (lp->txlog); /* flush log */ fflush (lp->txlog); /* flush log */
tmxr_send_buffered_data (lp); /* send any buffered data */ tmxr_send_buffered_data (lp); /* send any buffered data */
if ((lp->serport) && (!lp->mp->modem_control)) { /* serial connection? */ if (lp->serport) {
if (closeserial) {
sim_close_serial (lp->serport);
lp->serport = 0;
free (lp->serconfig);
lp->serconfig = NULL;
lp->cnms = 0;
}
else
if (!lp->mp->modem_control) { /* serial connection? */
sim_control_serial (lp->serport, 0, TMXR_MDM_DTR|TMXR_MDM_RTS, NULL);/* drop DTR and RTS */ sim_control_serial (lp->serport, 0, TMXR_MDM_DTR|TMXR_MDM_RTS, NULL);/* drop DTR and RTS */
sim_os_ms_sleep (TMXR_DTR_DROP_TIME); sim_os_ms_sleep (TMXR_DTR_DROP_TIME);
sim_control_serial (lp->serport, TMXR_MDM_DTR|TMXR_MDM_RTS, 0, NULL);/* raise DTR and RTS */ sim_control_serial (lp->serport, TMXR_MDM_DTR|TMXR_MDM_RTS, 0, NULL);/* raise DTR and RTS */
} }
}
else /* Telnet connection */ else /* Telnet connection */
if (lp->conn) { if (lp->conn) {
sim_close_sock (lp->conn, 0); /* close socket */ sim_close_sock (lp->conn, 0); /* close socket */
@ -852,6 +860,18 @@ else {
return SCPE_OK; return SCPE_OK;
} }
t_stat tmxr_close_ln (TMLN *lp)
{
tmxr_debug_trace_line (lp, "tmxr_close_ln()");
return tmxr_reset_ln_ex (lp, TRUE);
}
t_stat tmxr_reset_ln (TMLN *lp)
{
tmxr_debug_trace_line (lp, "tmxr_reset_ln()");
return tmxr_reset_ln_ex (lp, FALSE);
}
/* Enable modem control pass thru /* Enable modem control pass thru
Inputs: Inputs:
@ -1048,7 +1068,7 @@ for (i = 0; i < mp->lines; i++) { /* loop thru lines */
TMXR_MAXBUF - lp->rxbpi); TMXR_MAXBUF - lp->rxbpi);
if (nbytes < 0) /* line error? */ if (nbytes < 0) /* line error? */
tmxr_reset_ln (lp); /* disconnect line */ tmxr_close_ln (lp); /* disconnect line */
else if (nbytes > 0) { /* if data rcvd */ else if (nbytes > 0) { /* if data rcvd */
@ -1273,6 +1293,10 @@ if (nbytes) { /* >0? write */
lp->txcnt = lp->txcnt + sbytes; /* update counts */ lp->txcnt = lp->txcnt + sbytes; /* update counts */
nbytes = nbytes - sbytes; nbytes = nbytes - sbytes;
} }
if (sbytes < 0) { /* I/O Error? */
tmxr_close_ln (lp); /* close line/port on error */
return nbytes; /* done now. */
}
if (nbytes && (lp->txbpr == 0)) { /* more data and wrap? */ if (nbytes && (lp->txbpr == 0)) { /* more data and wrap? */
sbytes = tmxr_write (lp, nbytes); sbytes = tmxr_write (lp, nbytes);
if (sbytes > 0) { /* ok */ if (sbytes > 0) { /* ok */
@ -1843,7 +1867,10 @@ if (r != SCPE_OK) { /* error? */
mp->uptr = uptr; /* save unit for polling */ mp->uptr = uptr; /* save unit for polling */
uptr->filename = _mux_attach_string (uptr->filename, mp);/* save */ uptr->filename = _mux_attach_string (uptr->filename, mp);/* save */
uptr->flags = uptr->flags | UNIT_ATT; /* no more errors */ uptr->flags = uptr->flags | UNIT_ATT; /* no more errors */
if (mp->lines > 1) if ((mp->lines > 1) ||
((mp->master == 0) &&
(mp->ldsc[0].connecting == 0) &&
(mp->ldsc[0].serport == 0)))
uptr->flags = uptr->flags | UNIT_ATTMULT; /* allow multiple attach commands */ uptr->flags = uptr->flags | UNIT_ATTMULT; /* allow multiple attach commands */
if (mp->dptr == NULL) /* has device been set? */ if (mp->dptr == NULL) /* has device been set? */