summaryrefslogtreecommitdiffstats
path: root/c/src/exec/libnetworking/net
diff options
context:
space:
mode:
Diffstat (limited to 'c/src/exec/libnetworking/net')
-rw-r--r--c/src/exec/libnetworking/net/if_ppp.c4
-rw-r--r--c/src/exec/libnetworking/net/if_pppvar.h1
-rw-r--r--c/src/exec/libnetworking/net/ppp_tty.c21
3 files changed, 13 insertions, 13 deletions
diff --git a/c/src/exec/libnetworking/net/if_ppp.c b/c/src/exec/libnetworking/net/if_ppp.c
index bb90eac78a..d4e0847655 100644
--- a/c/src/exec/libnetworking/net/if_ppp.c
+++ b/c/src/exec/libnetworking/net/if_ppp.c
@@ -243,7 +243,6 @@ static rtems_task ppp_rxdaemon(rtems_task_argument arg)
static rtems_task ppp_txdaemon(rtems_task_argument arg)
{
rtems_event_set events;
- char cFrame = (char )PPP_FLAG;
int iprocess = (int )0;
struct ppp_softc *sc = (struct ppp_softc *)arg;
struct mbuf *mp;
@@ -351,7 +350,8 @@ static rtems_task ppp_txdaemon(rtems_task_argument arg)
microtime(&sc->sc_if.if_lastchange);
/* write out frame byte to start the transmission */
- (*tp->device.write)(tp->minor, &cFrame, 1);
+ sc->sc_outchar = (u_char)PPP_FLAG;
+ (*tp->device.write)(tp->minor, &sc->sc_outchar, 1);
}
/* check to see if we need to free some empty mbufs */
diff --git a/c/src/exec/libnetworking/net/if_pppvar.h b/c/src/exec/libnetworking/net/if_pppvar.h
index 374fac3b11..2b4cd7d9de 100644
--- a/c/src/exec/libnetworking/net/if_pppvar.h
+++ b/c/src/exec/libnetworking/net/if_pppvar.h
@@ -105,6 +105,7 @@ struct ppp_softc {
short sc_outfcslen; /* length of output fcs data */
u_char sc_outfcsbuf[8]; /* output packet fcs buffer */
u_char *sc_outbuf; /* pointer to output data */
+ u_char sc_outchar;
rtems_id sc_rxtask;
rtems_id sc_txtask;
diff --git a/c/src/exec/libnetworking/net/ppp_tty.c b/c/src/exec/libnetworking/net/ppp_tty.c
index b655fd4f04..060bd3976c 100644
--- a/c/src/exec/libnetworking/net/ppp_tty.c
+++ b/c/src/exec/libnetworking/net/ppp_tty.c
@@ -562,10 +562,8 @@ pppasyncctlp(sc)
int
pppstart(struct rtems_termios_tty *tp)
{
- char c;
char *sendBegin;
- char cFrame = (char )PPP_FLAG;
- u_char ioffset = (u_char )0;
+ u_long ioffset = (u_long )0;
struct mbuf *m = (struct mbuf *)0;
struct ppp_softc *sc = tp->t_sc;
@@ -596,7 +594,8 @@ pppstart(struct rtems_termios_tty *tp)
else {
/* done with this packet */
sc->sc_outflag &= ~SC_TX_BUSY;
- (*tp->device.write)(tp->minor, &cFrame, 1);
+ sc->sc_outchar = (u_char)PPP_FLAG;
+ (*tp->device.write)(tp->minor, &sc->sc_outchar, 1);
rtems_event_send(sc->sc_txtask, TX_TRANSMIT);
}
}
@@ -604,11 +603,11 @@ pppstart(struct rtems_termios_tty *tp)
/* check to see if there is some data to write out */
if ( sc->sc_outoff < sc->sc_outlen ) {
/* check to see if character needs to be escaped */
- c = sc->sc_outbuf[sc->sc_outoff];
- if ( ESCAPE_P(c) ) {
+ sc->sc_outchar = sc->sc_outbuf[sc->sc_outoff];
+ if ( ESCAPE_P(sc->sc_outchar) ) {
if ( sc->sc_outflag & SC_TX_ESCAPE ) {
/* last sent character was the escape character */
- c = c ^ PPP_TRANS;
+ sc->sc_outchar = sc->sc_outchar ^ PPP_TRANS;
/* clear the escape flag and increment the offset */
sc->sc_outflag &= ~SC_TX_ESCAPE;
@@ -616,18 +615,18 @@ pppstart(struct rtems_termios_tty *tp)
}
else {
/* need to send the escape character */
- c = PPP_ESCAPE;
+ sc->sc_outchar = PPP_ESCAPE;
/* set the escape flag */
sc->sc_outflag |= SC_TX_ESCAPE;
}
- sendBegin = &c;
+ sendBegin = &sc->sc_outchar;
}
else {
/* escape not needed - increment the offset as much as possible */
- while ((!ESCAPE_P(c)) && ((sc->sc_outoff + ioffset) < sc->sc_outlen)) {
+ while ((!ESCAPE_P(sc->sc_outchar)) && ((sc->sc_outoff + ioffset) < sc->sc_outlen)) {
ioffset++;
- c = sc->sc_outbuf[sc->sc_outoff + ioffset];
+ sc->sc_outchar = sc->sc_outbuf[sc->sc_outoff + ioffset];
}
sendBegin = &sc->sc_outbuf[sc->sc_outoff];
}