xnu-792.10.96.tar.gz

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

diff --git a/bsd/netat/adsp_attention.c b/bsd/netat/adsp_attention.c
index 80e52686dee9f4d9cc4e3f9f4403eab8a3ac045f..726692d45bff4828c15b89f35c1b761e14097040 100644 (file)
--- a/bsd/netat/adsp_attention.c
+++ b/bsd/netat/adsp_attention.c
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -73,11 +70,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;
        
@@ -120,16 +114,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(&sp->sapb, 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;