xnu-792.6.56.tar.gz

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

diff --git a/bsd/netat/atp_read.c b/bsd/netat/atp_read.c
index 200577dbf0fd1278b9df764743573eddf3cf7f2a..0cf897f12691c71f358b7278f1dc24dacc347e0b 100644 (file)
--- a/bsd/netat/atp_read.c
+++ b/bsd/netat/atp_read.c
@@ -3,19 +3,20 @@
  *
  * @APPLE_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. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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@
  */
@@ -50,7 +51,7 @@
 
 static void atp_trans_complete();
 void atp_x_done();
-void atp_x_done_funnel();
+void atp_x_done_locked(void *);
 extern void atp_req_timeout();
 
 /*
@@ -58,14 +59,13 @@ extern void atp_req_timeout();
  *     Version 1.7 of atp_read.c on 89/02/09 17:53:16
  */
 
-void atp_treq_event(gref)
-register gref_t *gref;
+void atp_treq_event(void *arg)
 {
+       register gref_t *gref = (gref_t *)arg;
        register gbuf_t *m;
        register struct atp_state *atp;
-       boolean_t       funnel_state;
 
-       funnel_state = thread_funnel_set(network_flock, TRUE);
+       atalk_lock();
        atp = (struct atp_state *)gref->info;   
        if (atp->dflag)
                atp = (struct atp_state *)atp->atp_msgq;
@@ -86,7 +86,7 @@ register gref_t *gref;
 
        if (m == 0)
                timeout(atp_treq_event, gref, 10);
-       (void) thread_funnel_set(network_flock, FALSE);
+       atalk_unlock();
 }
 
 void atp_rput(gref, m)
@@ -97,6 +97,7 @@ gbuf_t   *m;
        register struct atp_state *atp;
        register int s, s_gen;
        gbuf_t *m_asp = NULL;
+       struct timeval timenow;
 
        atp = (struct atp_state *)gref->info;   
        if (atp->dflag)
@@ -399,9 +400,10 @@ gbuf_t   *m;
                         *              update the bitmap and resend
                         *              the replies
                         */
+                       getmicrouptime(&timenow);
                        ATDISABLE(s_gen, atpgen_lock);
                        if (rcbp->rc_timestamp) {
-                         rcbp->rc_timestamp = time.tv_sec;
+                         rcbp->rc_timestamp = timenow.tv_sec;
                          if (rcbp->rc_timestamp == 0)
                            rcbp->rc_timestamp = 1;
                        }
@@ -455,12 +457,12 @@ gbuf_t   *m;
 } /* atp_rput */
 
 void 
-atp_x_done_funnel(trp)
-register struct atp_trans *trp;
+atp_x_done_locked(trp)
+void *trp;
 {
-       thread_funnel_set(network_flock, TRUE);
-       atp_x_done(trp);
-       (void) thread_funnel_set(network_flock, FALSE);
+       atalk_lock();
+       atp_x_done((struct atp_trans *)trp);
+       atalk_unlock();
 
 }
 
@@ -491,7 +493,7 @@ register struct atp_trans *trp;
 
                        atp = trp->tr_queue;
                        trp->tr_state = TRANS_RELEASE;
-                       timeout(atp_x_done_funnel, trp, 10);
+                       timeout(atp_x_done_locked, trp, 10);
                }
        }
 }
@@ -539,7 +541,7 @@ register struct atp_trans *trp;
          if (trp->tr_bdsp == NULL) {
                gbuf_freem(m);
                if (trp->tr_rsp_wait)
-                       thread_wakeup(&trp->tr_event);
+                       wakeup(&trp->tr_event);
          } else {
                gbuf_set_type(m, MSG_IOCACK);
                ((ioc_t *)gbuf_rptr(m))->ioc_count = 0;