xnu-2050.18.24.tar.gz

[apple/xnu.git] / bsd / net / if_pppvar.h

diff --git a/bsd/net/if_pppvar.h b/bsd/net/if_pppvar.h
index d7a6ee6ad638bf841689b1f01043eb5c9891ee0e..a48282763d3e2d90db341d11b7e7cf91b16cec31 100644 (file)
--- a/bsd/net/if_pppvar.h
+++ b/bsd/net/if_pppvar.h
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * if_pppvar.h - private structures and declarations for PPP.
@@ -71,7 +74,7 @@
 #warning if_pppvar.h is not used by the darwin kernel
 #endif
 
-#ifdef __APPLE_API_PRIVATE
+#ifdef KERNEL_PRIVATE
 
 /*
  * Supported network protocols.  These values are used for
@@ -88,10 +91,10 @@ struct ppp_softc {
 /*hi*/ u_int   sc_flags;               /* control/status bits; see if_ppp.h */
        struct  callout_handle sc_ch;   /* Used for scheduling timeouts */
        void    *sc_devp;               /* pointer to device-dep structure */
-       void    (*sc_start) __P((struct ppp_softc *));  /* start output proc */
-       void    (*sc_ctlp) __P((struct ppp_softc *)); /* rcvd control pkt */
-       void    (*sc_relinq) __P((struct ppp_softc *)); /* relinquish ifunit */
-       void    (*sc_setmtu) __P((struct ppp_softc *)); /* set mtu */
+       void    (*sc_start)(struct ppp_softc *);        /* start output proc */
+       void    (*sc_ctlp)(struct ppp_softc *); /* rcvd control pkt */
+       void    (*sc_relinq)(struct ppp_softc *); /* relinquish ifunit */
+       void    (*sc_setmtu)(struct ppp_softc *); /* set mtu */
        short   sc_mru;                 /* max receive unit */
        pid_t   sc_xfer;                /* used in transferring unit */
 /*hi*/ struct  ifqueue sc_rawq;        /* received packets */
@@ -117,7 +120,7 @@ struct ppp_softc {
 
        /* Device-dependent part for async lines. */
        ext_accm sc_asyncmap;           /* async control character map */
-       u_long  sc_rasyncmap;           /* receive async control char map */
+       u_int32_t       sc_rasyncmap;           /* receive async control char map */
        struct  mbuf *sc_outm;          /* mbuf chain currently being output */
        struct  mbuf *sc_m;             /* pointer to input mbuf chain */
        struct  mbuf *sc_mc;            /* pointer to current input mbuf */
@@ -131,13 +134,13 @@ struct ppp_softc {
 
 extern struct ppp_softc ppp_softc[];
 
-struct ppp_softc *pppalloc __P((pid_t pid));
-void   pppdealloc __P((struct ppp_softc *sc));
-int    pppioctl __P((struct ppp_softc *sc, u_long cmd, caddr_t data,
-                     int flag, struct proc *p));
-int    pppoutput __P((struct ifnet *ifp, struct mbuf *m0,
-                      struct sockaddr *dst, struct rtentry *rtp));
-void   ppp_restart __P((struct ppp_softc *sc));
-void   ppppktin __P((struct ppp_softc *sc, struct mbuf *m, int lost));
-struct mbuf *ppp_dequeue __P((struct ppp_softc *sc));
+struct ppp_softc *pppalloc(pid_t pid);
+void   pppdealloc(struct ppp_softc *sc);
+int    pppioctl(struct ppp_softc *sc, u_long cmd, caddr_t data,
+                     int flag, struct proc *p);
+int    pppoutput(struct ifnet *ifp, struct mbuf *m0,
+                      struct sockaddr *dst, struct rtentry *rtp);
+void   ppp_restart(struct ppp_softc *sc);
+void   ppppktin(struct ppp_softc *sc, struct mbuf *m, int lost);
+struct mbuf *ppp_dequeue(struct ppp_softc *sc);
 #endif /* __APPLE_API_PRIVATE */