xnu-792.22.5.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 de59959dec0a150c549190edfe2fec50ff89a467..79498bf915c5442e9c78c06d560eb7d27e0faba7 100644 (file)
--- a/bsd/netat/at_proto.c
+++ b/bsd/netat/at_proto.c
@@ -77,7 +77,6 @@ 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. 
@@ -91,31 +90,45 @@ struct pr_usrreqs ddp_usrreqs = {
        ddp_pru_sockaddr, sosend, soreceive, pru_sopoll_notsupp
 };
 
-struct domain atalkdomain;
+extern struct domain atalkdomain;
+extern void atalk_dominit(void);
+
 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
+       0, 0, 0, /*lock, unlock, getlock */
+   {0, 0}, 0, {0} /* filters */
   }
 };
 
 struct domain atalkdomain =
-{ AF_APPLETALK, "appletalk", atalk_dominit, 0, 0, 
-  atalksw, 0,
-  0, 0, 0,
-  DDP_X_HDR_SIZE, 0
+{ 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] */
 };
 
 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()
+atalk_dominit(void)
 {
        atalk_mutex = atalkdom->dom_mtx;
 }
@@ -123,24 +136,22 @@ atalk_dominit()
 void
 atalk_lock()
 {
-       int error = 0, lr, lr_saved;
-#ifdef __ppc__
-       __asm__ volatile("mflr %0" : "=r" (lr));
-       lr_saved = lr;
-#endif 
+       int lr_saved;
+       lr_saved = (unsigned int) __builtin_return_address(0);
+
        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 error = 0, lr, lr_saved;
-#ifdef __ppc__
-       __asm__ volatile("mflr %0" : "=r" (lr));
-       lr_saved = lr;
-#endif 
+       int lr_saved;
+       lr_saved = (unsigned int) __builtin_return_address(0);
+
        lck_mtx_assert(atalkdom->dom_mtx, LCK_MTX_ASSERT_OWNED);
+       at_saved_unlock = lr_saved;
        lck_mtx_unlock(atalkdom->dom_mtx);
 
 }