X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/de355530ae67247cbd0da700edb3a2a1dae884c2..bd504ef0e0b883cdd7917b73b3574eb9ce669905:/bsd/netat/adsp_Write.c

diff --git a/bsd/netat/adsp_Write.c b/bsd/netat/adsp_Write.c
index 9a170cf50..acc5ad4e9 100644
--- a/bsd/netat/adsp_Write.c
+++ b/bsd/netat/adsp_Write.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@
  */
 /* dspWrite.c 
  * From Mike Shoemaker v01.13 06/21/90 mbs for MacOS
@@ -49,7 +55,8 @@
 #include <netat/adsp.h>
 #include <netat/adsp_internal.h>
 
-void completepb();
+
+int FillSendQueue(CCBPtr, struct adspcmd *);
 
 /*
  * FillSendQueue
@@ -59,15 +66,14 @@ void completepb();
  * OUTPUTS:
  * 		none
  */
-int FillSendQueue(sp, pb)		/* (CCBPtr sp) */
-    register CCBPtr sp;
-    register struct adspcmd *pb; /* The write PB we're playing with */
+int FillSendQueue(		/* (CCBPtr sp) */
+    register CCBPtr sp,
+    register struct adspcmd *pb) /* The write PB we're playing with */
 {
 	gbuf_t *mb, *nmb;
 	int eom;		/* True if should set eom in header */
 	int cnt;		/* # of bytes in this write */
 	int err = 0;
-	int s;
 
 	cnt = pb->u.ioParams.reqCount - pb->u.ioParams.actCount;
 	eom = pb->u.ioParams.eom ? F_EOM : 0;
@@ -96,7 +102,6 @@ int FillSendQueue(sp, pb)		/* (CCBPtr sp) */
 	}
 	gbuf_cont(mb) = 0;
 
-	ATDISABLE(s, sp->lock);
 	sp->sData = 1;		/* note that there is data to send */
 	if ((mb = sp->csbuf_mb)) {	/* add to the current message */
 	    gbuf_linkb(mb, nmb);
@@ -112,7 +117,6 @@ int FillSendQueue(sp, pb)		/* (CCBPtr sp) */
 	    sp->csbuf_mb = 0;	/* if its done, no current buffer */
 	}
 	pb->u.ioParams.actCount += cnt; /* Update count field in param blk */
-	ATENABLE(s, sp->lock);
 	
 	if (pb->u.ioParams.actCount == pb->u.ioParams.reqCount) {
 	    /* Write is complete */
@@ -150,24 +154,20 @@ int adspWrite(sp, pb)		/* (DSPPBPtr pb) */
     CCBPtr sp;
     struct adspcmd *pb;
 {
-    int	s;
 	
     if (sp == 0) {
 	pb->ioResult = errRefNum;
 	return EINVAL;		/* no stream, so drop the message */
     }
 	
-    ATDISABLE(s, sp->lock);
     if (sp->state != sOpen) {	/* Not allowed */
 	pb->ioResult = errState;
-	ATENABLE(s, sp->lock);
 	atalk_notify(sp->gref, ENOTCONN);
 	gbuf_freem(pb->mp);
 	return 0;
     }
 	
     pb->u.ioParams.actCount = 0; /* Set # of bytes so far to zero */
-    ATENABLE(s, sp->lock);
     
     FillSendQueue(sp, pb);	/* Copy from write param block to send queue */