xnu-1228.3.13.tar.gz

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

diff --git a/bsd/netat/adsp_misc.c b/bsd/netat/adsp_misc.c
index 7a6c1f5f36d4a282ff74db48e0880475ef20ccb8..f546b316061374d1be7d17d446f704647a1c6acb 100644 (file)
--- a/bsd/netat/adsp_misc.c
+++ b/bsd/netat/adsp_misc.c
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_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
  * 
  * 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.
+ * 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
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 #include <sys/errno.h>
 #include <sys/types.h>
  */
 #include <sys/errno.h>
 #include <sys/types.h>


@@ -47,12 +50,7 @@
  *    Modified for MP, 1996 by Tuyen Nguyen
  *   Modified, April 9, 1997 by Tuyen Nguyen for MacOSX.
  */
  *    Modified for MP, 1996 by Tuyen Nguyen
  *   Modified, April 9, 1997 by Tuyen Nguyen for MacOSX.
  */

-extern atlock_t adspgen_lock;
-

 
 

-struct qlink {
-       struct qlink *qlinkp;
-};

 
 /* ----------------------------------------------------------------------
  * void qAddToEnd(void *qhead, void *qelem)
 
 /* ----------------------------------------------------------------------
  * void qAddToEnd(void *qhead, void *qelem)


@@ -127,17 +125,14 @@ void* qfind_m(qhead, match, compare_fnx)
        void  *match;
        ProcPtr compare_fnx;
 {
        void  *match;
        ProcPtr compare_fnx;
 {

-       int s;

        CCBPtr queue_item = qhead;
 
        CCBPtr queue_item = qhead;
 

-       ATDISABLE(s, adspgen_lock);

        while (queue_item) { 
                if ((*compare_fnx)(queue_item,match)) 
                        break;
                
                queue_item = queue_item->ccbLink;
        }
        while (queue_item) { 
                if ((*compare_fnx)(queue_item,match)) 
                        break;
                
                queue_item = queue_item->ccbLink;
        }

-       ATENABLE(s, adspgen_lock);

 
        return (queue_item);
 }
 
        return (queue_item);
 }