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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Peter Schorn 2014-04-01 19:35:12 +02:00
commit 54e04dda7f
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sim_tmxr.c
View file

@ -1375,11 +1375,7 @@ if ((lp->sock) || (lp->serport) || (lp->loopback)) {
incoming_state = TMXR_MDM_RNG | TMXR_MDM_DCD | TMXR_MDM_DSR; incoming_state = TMXR_MDM_RNG | TMXR_MDM_DCD | TMXR_MDM_DSR;
} }
else else
if ((lp->master) || (lp->mp && lp->mp->master) || incoming_state = 0;
(lp->port && lp->destination))
incoming_state = TMXR_MDM_DCD | TMXR_MDM_DSR;
else
incoming_state = 0;
lp->modembits |= incoming_state; lp->modembits |= incoming_state;
dptr = (lp->dptr ? lp->dptr : (lp->mp ? lp->mp->dptr : NULL)); dptr = (lp->dptr ? lp->dptr : (lp->mp ? lp->mp->dptr : NULL));
if (sim_deb && lp->mp && dptr) { if (sim_deb && lp->mp && dptr) {
@ -2082,6 +2078,8 @@ while (*tptr) {
nolog = notelnet = listennotelnet = unbuffered = loopback = FALSE; nolog = notelnet = listennotelnet = unbuffered = loopback = FALSE;
datagram = mp->datagram; datagram = mp->datagram;
packet = mp->packet; packet = mp->packet;
if (mp->buffered)
sprintf(buffered, "%d", mp->buffered);
if (line != -1) if (line != -1)
notelnet = listennotelnet = mp->notelnet; notelnet = listennotelnet = mp->notelnet;
modem_control = mp->modem_control; modem_control = mp->modem_control;