diff options
-rw-r--r-- | cpukit/libnetworking/net/if_ppp.c | 11 | ||||
-rw-r--r-- | cpukit/libnetworking/net/ppp_tty.c | 38 |
2 files changed, 28 insertions, 21 deletions
diff --git a/cpukit/libnetworking/net/if_ppp.c b/cpukit/libnetworking/net/if_ppp.c index 34caf68ce7..3c69511acb 100644 --- a/cpukit/libnetworking/net/if_ppp.c +++ b/cpukit/libnetworking/net/if_ppp.c @@ -71,11 +71,17 @@ * Paul Mackerras (paulus@cs.anu.edu.au). */ -/* $Id$ */ +/* $FreeBSD: src/sys/net/if_ppp.c,v 1.109 2005/10/12 19:52:16 thompsa Exp $ */ /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */ /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */ -#include "ppp.h" +/* $Id$ */ + +#include "opt_inet.h" +#include "opt_ipx.h" +#include "opt_mac.h" +#include "opt_ppp.h" + #if NPPP > 0 #include <termios.h> @@ -106,7 +112,6 @@ #include <netinet/ip.h> #endif -#include "bpfilter.h" #if NBPFILTER > 0 #include <net/bpf.h> #endif diff --git a/cpukit/libnetworking/net/ppp_tty.c b/cpukit/libnetworking/net/ppp_tty.c index d4fc3b3a5e..1ce5542bde 100644 --- a/cpukit/libnetworking/net/ppp_tty.c +++ b/cpukit/libnetworking/net/ppp_tty.c @@ -70,11 +70,14 @@ * Paul Mackerras (paulus@cs.anu.edu.au). */ -/* $Id$ */ +/* $FreeBSD: src/sys/net/ppp_tty.c,v 1.69 2005/10/16 20:44:18 phk Exp $ */ /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */ /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */ -#include "ppp.h" +/* $Id$ */ + +#include "opt_ppp.h" /* XXX for ppp_defs.h */ + #if NPPP > 0 #include <sys/param.h> @@ -110,20 +113,20 @@ #include <net/if_pppvar.h> -void pppasyncattach __P((void)); -int pppopen __P((struct rtems_termios_tty *tty)); -int pppclose __P((struct rtems_termios_tty *tty)); -int pppread __P((struct rtems_termios_tty *tty, rtems_libio_rw_args_t *rw_args)); -int pppwrite __P((struct rtems_termios_tty *tty, rtems_libio_rw_args_t *rw_args)); -int ppptioctl __P((struct rtems_termios_tty *tty, rtems_libio_ioctl_args_t *args)); -int pppinput __P((int c, struct rtems_termios_tty *tty)); -int pppstart __P((struct rtems_termios_tty *tp)); -u_short pppfcs __P((u_short fcs, u_char *cp, int len)); -void pppallocmbuf __P((struct ppp_softc *sc, struct mbuf **mp)); - -static void pppasyncstart __P((struct ppp_softc *)); -static void pppasyncctlp __P((struct ppp_softc *)); -static void pppasyncrelinq __P((struct ppp_softc *)); +void pppasyncattach(void); +int pppopen(struct rtems_termios_tty *tty); +int pppclose(struct rtems_termios_tty *tty); +int pppread(struct rtems_termios_tty *tty, rtems_libio_rw_args_t *rw_args); +int pppwrite(struct rtems_termios_tty *tty, rtems_libio_rw_args_t *rw_args); +int ppptioctl(struct rtems_termios_tty *tty, rtems_libio_ioctl_args_t *args); +int pppinput(int c, struct rtems_termios_tty *tty); +int pppstart(struct rtems_termios_tty *tp); +u_short pppfcs(u_short fcs, u_char *cp, int len); +void pppallocmbuf(struct ppp_softc *sc, struct mbuf **mp); + +static void pppasyncstart(struct ppp_softc *); +static void pppasyncctlp(struct ppp_softc *); +static void pppasyncrelinq(struct ppp_softc *); /*static void ppp_timeout __P((void *)); */ /*static void pppdumpb __P((u_char *b, int l)); */ /*static void ppplogchar __P((struct ppp_softc *, int)); */ @@ -310,9 +313,8 @@ pppread(struct rtems_termios_tty *tty, rtems_libio_rw_args_t *rw_args) struct mbuf *m0; u_char *p; - if (sc == NULL) { + if (sc == NULL) return 0; - } /* * Loop waiting for input, checking that nothing disasterous |