xnu-1228.0.2.tar.gz

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

diff --git a/bsd/netat/adsp_TimerElem.c b/bsd/netat/adsp_TimerElem.c
index 8f8a9ce52c18eba5d781ffa3f56a5609f50fa736..dd04ee2449ed78873cded9476de17211e3c015a2 100644 (file)
--- a/bsd/netat/adsp_TimerElem.c
+++ b/bsd/netat/adsp_TimerElem.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@
  */
 /* 
  * TimerElem.c 
@@ -54,9 +52,8 @@
 #include <netat/adsp.h>
 #include <netat/adsp_internal.h>
 
-atlock_t adsptmr_lock;
 
-extern void DoTimerElem();     /* (TimerElemPtr t);  
+extern void DoTimerElem(TimerElemPtr); /* (TimerElemPtr t);  
                                 * External routine called to 
                                 * process each one. */
 
@@ -77,21 +74,17 @@ void InsertTimerElem(qhead, t, val)
 {
     TimerElemPtr p;            /* parent pointer */
     TimerElemPtr n;            /* current */
-    int        s;
-       
-    ATDISABLE(s, adsptmr_lock);
-       
+               
     if (t->onQ) {
         /*
-        * someone else beat us to the punch and put this
-        * element back on the queue, just return in this case
-        */
-        ATENABLE(s, adsptmr_lock);
-       return;
+               * someone else beat us to the punch and put this
+               * element back on the queue, just return in this case
+               */
+               return;
     }
     p = (TimerElemPtr)qhead;
 
-    while (n = p->link) {
+    while ((n = p->link)) {
        if (val <= n->timer)    /* Do we go in front of this? */
        {
            n->timer -= val;    /* Yes, adjust his delta */
@@ -109,7 +102,6 @@ void InsertTimerElem(qhead, t, val)
     t->timer = val;            /* this is our value */
     t->link = n;               /* we point to n */
     
-    ATENABLE(s, adsptmr_lock);
 }
 
 
@@ -127,25 +119,21 @@ void RemoveTimerElem(qhead, t)    /* (TimerElemPtr *qhead, TimerElemPtr t) */
 {
     TimerElemPtr p;            /* parent pointer */
     TimerElemPtr n;            /* current */
-    int        s;
-       
-    ATDISABLE(s, adsptmr_lock);
-       
+               
     if ( !t->onQ) {
         /*
-        * someone else beat us to the punch and took this
-        * element off of the queue, just return in this case
-        */
-        ATENABLE(s, adsptmr_lock);
-       return;
+               * someone else beat us to the punch and took this
+               * element off of the queue, just return in this case
+               */
+               return;
     }
     p = (TimerElemPtr)qhead;
 
-    while (n = p->link)        /* Get next item in queue */
+    while ((n = p->link))      /* Get next item in queue */
     {
        if (n == t)             /* Is it us? */
        {
-           if (p->link = n->link) /* Link our parent to our child */
+           if ((p->link = n->link)) /* Link our parent to our child */
            {
                n->link->timer += t->timer; /* and update child's timer */
            }
@@ -155,7 +143,6 @@ void RemoveTimerElem(qhead, t)      /* (TimerElemPtr *qhead, TimerElemPtr t) */
        p = n;
     }                          /* while */
        
-    ATENABLE(s, adsptmr_lock);
 }
 
 
@@ -173,29 +160,19 @@ void TimerQueueTick(qhead)        /* (TimerElemPtr *qhead) */
 {
     TimerElemPtr p;            /* parent pointer */
     TimerElemPtr n;            /* current */
-    int        s;
-       
-    ATDISABLE(s, adsptmr_lock);
-       
+               
     p = (TimerElemPtr)qhead;
-    if (p->link)               /* Is anything on queue? */
+    if (p->link) {             /* Is anything on queue? */
        p->link->timer--;       /* Yes, decrement by a tick */
-    else
-       goto done;              /* No, we're outta' here */
-               
-    while ((n = p->link) && 
-          (n->timer == 0)) /* Next guy needs to be serviced */
-    {
-       p->link = n->link;      /* Unlink us */
-       n->onQ  = 0;
+       while ((n = p->link) && 
+              (n->timer == 0)) /* Next guy needs to be serviced */
+       {
+               p->link = n->link;      /* Unlink us */
+               n->onQ  = 0;
 
-       ATENABLE(s, adsptmr_lock);
-       DoTimerElem(n);
-       ATDISABLE(s, adsptmr_lock);
+               DoTimerElem(n);
 
-       p = (TimerElemPtr)qhead;
-    }                          /* while */
-       
-done:
-    ATENABLE(s, adsptmr_lock);
+               p = (TimerElemPtr)qhead;
+       }                               /* while */
+    }
 }