xnu-1228.15.4.tar.gz

[apple/xnu.git] / bsd / netinet / if_fddi.h

diff --git a/bsd/netinet/if_fddi.h b/bsd/netinet/if_fddi.h
index b44792a770324b4884f914f1acd081aaefd9cec6..5aee8f1bfc80898e49c7e24ca35d5d9952830d87 100644 (file)
--- a/bsd/netinet/if_fddi.h
+++ b/bsd/netinet/if_fddi.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * 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. 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.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * Copyright (c) 1982, 1986, 1993
  */
 /*
  * Copyright (c) 1982, 1986, 1993


@@ -54,10 +60,12 @@
  * SUCH DAMAGE.
  *
  *     @(#)if_fddi.h   8.1 (Berkeley) 6/10/93
  * SUCH DAMAGE.
  *
  *     @(#)if_fddi.h   8.1 (Berkeley) 6/10/93

+ * $FreeBSD: src/sys/netinet/if_fddi.h,v 1.8 1999/12/29 04:40:58 peter Exp $

  */
 
 #ifndef _NETINET_IF_FDDI_H_
 #define _NETINET_IF_FDDI_H_
  */
 
 #ifndef _NETINET_IF_FDDI_H_
 #define _NETINET_IF_FDDI_H_

+#include <sys/appleapiopts.h>

 
 /*
  * Structure of an 100Mb/s FDDI header.
 
 /*
  * Structure of an 100Mb/s FDDI header.


@@ -89,7 +97,7 @@ struct        fddi_header {
 #define FDDIFC_LLC_SYNC         0xd0
 #define        FDDIFC_SMT              0x40
 
 #define FDDIFC_LLC_SYNC         0xd0
 #define        FDDIFC_SMT              0x40
 

-#if defined(KERNEL)
+#ifdef KERNEL_PRIVATE

 #define        fddibroadcastaddr       etherbroadcastaddr
 #define        fddi_ipmulticast_min    ether_ipmulticast_min
 #define        fddi_ipmulticast_max    ether_ipmulticast_max
 #define        fddibroadcastaddr       etherbroadcastaddr
 #define        fddi_ipmulticast_min    ether_ipmulticast_min
 #define        fddi_ipmulticast_max    ether_ipmulticast_max


@@ -97,11 +105,10 @@ struct     fddi_header {
 #define        fddi_delmulti           ether_delmulti
 #define        fddi_sprintf            ether_sprintf
 
 #define        fddi_delmulti           ether_delmulti
 #define        fddi_sprintf            ether_sprintf
 

-void    fddi_ifattach __P((struct ifnet *));
-void    fddi_input __P((struct ifnet *, struct fddi_header *, struct mbuf *));
-int     fddi_output __P((struct ifnet *,
-           struct mbuf *, struct sockaddr *, struct rtentry *)); 
-
-#endif
+void    fddi_ifattach(struct ifnet *);
+void    fddi_input(struct ifnet *, struct fddi_header *, struct mbuf *);
+int     fddi_output(struct ifnet *,
+           struct mbuf *, struct sockaddr *, struct rtentry *); 
+#endif KERNEL_PRIVATE

 
 

-#endif
+#endif _NETINET_IF_FDDI_H_