xnu-1228.5.18.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 e0f97fc918699018305dd91cf8aeecbc80824dc2..095780c1eff4621e1e8806da1854f29a16a36409 100644 (file)
--- a/bsd/netat/adsp_attention.c
+++ b/bsd/netat/adsp_attention.c
@@ -1,31 +1,29 @@
 /*
- * Copyright (c) 2006 Apple Computer, Inc. All Rights Reserved.
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * 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 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.
- *
- * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* 
  * dspAttention.c 
@@ -80,7 +78,6 @@
  */
 int adspAttention(register struct adspcmd *pb, register CCBPtr sp)
 {
-    int        s;
     register gbuf_t *mp, *nmp;
     unsigned char uerr;
        
@@ -123,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;