xnu-792.17.14.tar.gz

[apple/xnu.git] / bsd / netat / at_proto.c

diff --git a/bsd/netat/at_proto.c b/bsd/netat/at_proto.c
index 74e1808e68d82aafdb1887f1235108b89326249a..de59959dec0a150c549190edfe2fec50ff89a467 100644 (file)
--- a/bsd/netat/at_proto.c
+++ b/bsd/netat/at_proto.c
@@ -1,23 +1,29 @@
 /*
  * 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,
- * 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) 1998 Apple Computer, Inc. 
@@ -71,6 +77,7 @@ extern int    ddp_pru_send(struct socket *so, int flags, struct mbuf *m,
 extern int     ddp_pru_shutdown(struct socket *so);
 extern int     ddp_pru_sockaddr(struct socket *so, 
                                 struct sockaddr **nam);
+void atalk_dominit();
 
 /*
  * Dummy usrreqs struct created by Ted for FreeBSD 3.x integration. 
@@ -84,45 +91,31 @@ struct pr_usrreqs ddp_usrreqs = {
        ddp_pru_sockaddr, sosend, soreceive, pru_sopoll_notsupp
 };
 
-extern struct domain atalkdomain;
-extern void atalk_dominit(void);
-
+struct domain atalkdomain;
 struct protosw atalksw[] = {
   { SOCK_RAW,  &atalkdomain,   /*protocol*/ 0, PR_ATOMIC|PR_ADDR,
     /*input*/ 0, /*output*/ 0, /*clinput*/ 0, ddp_ctloutput,
     /*ousrreq*/ 0, 
     ddp_init, /*fastto*/ 0, /*slowto*/ 0, /*drain*/ 0, 
     /*sysctl*/ 0, &ddp_usrreqs,
-       0, 0, 0, /*lock, unlock, getlock */
-   {0, 0}, 0, {0} /* filters */
+       0, 0, 0
   }
 };
 
 struct domain atalkdomain =
-{ AF_APPLETALK,
-  "appletalk",
-  atalk_dominit,
-  0,
-  0, 
-  atalksw,
-  0,
-  0, /* dom_rtattach */
-  0, 0, /* dom_rtoffset, dom_maxrtkey */
-  DDP_X_HDR_SIZE, 0,
-  0, /* domain global mutex */
-  0,  /* domain flags */
-  {0, 0} /*reserved[2] */
+{ AF_APPLETALK, "appletalk", atalk_dominit, 0, 0, 
+  atalksw, 0,
+  0, 0, 0,
+  DDP_X_HDR_SIZE, 0
 };
 
 struct domain * atalkdom = &atalkdomain;
 lck_mtx_t  *atalk_mutex = NULL;
 
-static int at_saved_lock, at_saved_unlock;
-
 SYSCTL_NODE(_net, PF_APPLETALK, appletalk, CTLFLAG_RW, 0, "AppleTalk Family");
 
 void
-atalk_dominit(void)
+atalk_dominit()
 {
        atalk_mutex = atalkdom->dom_mtx;
 }
@@ -130,22 +123,24 @@ atalk_dominit(void)
 void
 atalk_lock()
 {
-       int lr_saved;
-       lr_saved = (unsigned int) __builtin_return_address(0);
-
+       int error = 0, lr, lr_saved;
+#ifdef __ppc__
+       __asm__ volatile("mflr %0" : "=r" (lr));
+       lr_saved = lr;
+#endif 
        lck_mtx_assert(atalkdom->dom_mtx, LCK_MTX_ASSERT_NOTOWNED);
        lck_mtx_lock(atalkdom->dom_mtx);
-       at_saved_lock = lr_saved;
 }
        
 void
 atalk_unlock()
 {
-       int lr_saved;
-       lr_saved = (unsigned int) __builtin_return_address(0);
-
+       int error = 0, lr, lr_saved;
+#ifdef __ppc__
+       __asm__ volatile("mflr %0" : "=r" (lr));
+       lr_saved = lr;
+#endif 
        lck_mtx_assert(atalkdom->dom_mtx, LCK_MTX_ASSERT_OWNED);
-       at_saved_unlock = lr_saved;
        lck_mtx_unlock(atalkdom->dom_mtx);
 
 }