X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/e5568f75972dfc723778653c11cb6b4dc825716a..2d21ac55c334faf3a56e5634905ed6987fc787d4:/bsd/netat/adsp_attention.c

diff --git a/bsd/netat/adsp_attention.c b/bsd/netat/adsp_attention.c
index 18ce61f65..095780c1e 100644
--- a/bsd/netat/adsp_attention.c
+++ b/bsd/netat/adsp_attention.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@
  */
 /* 
  * dspAttention.c 
@@ -70,11 +76,8 @@
  *	errAttention		attention message too long
  *	errAborted		request aborted by Remove or Close call
  */
-int adspAttention(sp, pb)	/* (DSPPBPtr pb) */
-    register struct adspcmd *pb;
-    register CCBPtr sp;
+int adspAttention(register struct adspcmd *pb, register CCBPtr sp)
 {
-    int	s;
     register gbuf_t *mp, *nmp;
     unsigned char uerr;
 	
@@ -117,16 +120,13 @@ l_err:
 	}
     }
     pb->ioDirection = 1;	/* outgoing attention data */
-    ATDISABLE(s, sp->lock);
     if (sp->sapb) {		/* Pending attentions already? */
-	qAddToEnd(&sp->sapb, pb); /* Just add to end of queue */
-	ATENABLE(s, sp->lock);
+		qAddToEnd((struct qlink **)&sp->sapb, (struct qlink *)pb); /* Just add to end of queue */
     } else {
-	sp->sendAttnData = 1;	/* Start off this attention */
-	pb->qLink = 0;
-	sp->sapb = pb;
-	ATENABLE(s, sp->lock);
-	CheckSend(sp);
+		sp->sendAttnData = 1;	/* Start off this attention */
+		pb->qLink = 0;
+		sp->sapb = pb;
+		CheckSend(sp);
     }
     pb->ioResult = 1;	/* indicate that the IO is not complete */
     return 0;