X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/43866e378188c25dd1e2208016ab3cbeb086ae6c..0c530ab8987f0ae6a1a3d9284f40182b88852816:/bsd/netat/adsp_TimerElem.c

diff --git a/bsd/netat/adsp_TimerElem.c b/bsd/netat/adsp_TimerElem.c
index 1da85f127..2ed056d3b 100644
--- a/bsd/netat/adsp_TimerElem.c
+++ b/bsd/netat/adsp_TimerElem.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@
  */
@@ -49,7 +46,6 @@
 #include <netat/adsp.h>
 #include <netat/adsp_internal.h>
 
-atlock_t adsptmr_lock;
 
 extern	void DoTimerElem();	/* (TimerElemPtr t);  
 				 * External routine called to 
@@ -72,17 +68,13 @@ 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;
 
@@ -104,7 +96,6 @@ void InsertTimerElem(qhead, t, val)
     t->timer = val;		/* this is our value */
     t->link = n;		/* we point to n */
     
-    ATENABLE(s, adsptmr_lock);
 }
 
 
@@ -122,17 +113,13 @@ 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;
 
@@ -150,7 +137,6 @@ void RemoveTimerElem(qhead, t)	/* (TimerElemPtr *qhead, TimerElemPtr t) */
 	p = n;
     }				/* while */
 	
-    ATENABLE(s, adsptmr_lock);
 }
 
 
@@ -168,29 +154,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 */
+    }
 }