X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/c0fea4742e91338fffdcf79f86a7c1d5e2b97eb1..21362eb3e66fd2c787aee132bce100a44d71a99c:/bsd/netat/adsp_TimerElem.c

diff --git a/bsd/netat/adsp_TimerElem.c b/bsd/netat/adsp_TimerElem.c
index 2ed056d3b..4cf461c88 100644
--- a/bsd/netat/adsp_TimerElem.c
+++ b/bsd/netat/adsp_TimerElem.c
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * 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. 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 Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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 OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* 
  * TimerElem.c 
@@ -46,6 +52,7 @@
 #include <netat/adsp.h>
 #include <netat/adsp_internal.h>
 
+atlock_t adsptmr_lock;
 
 extern	void DoTimerElem();	/* (TimerElemPtr t);  
 				 * External routine called to 
@@ -68,13 +75,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
-	 	*/
-		return;
+	 * 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;
     }
     p = (TimerElemPtr)qhead;
 
@@ -96,6 +107,7 @@ void InsertTimerElem(qhead, t, val)
     t->timer = val;		/* this is our value */
     t->link = n;		/* we point to n */
     
+    ATENABLE(s, adsptmr_lock);
 }
 
 
@@ -113,13 +125,17 @@ 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
-	 	*/
-		return;
+	 * 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;
     }
     p = (TimerElemPtr)qhead;
 
@@ -137,6 +153,7 @@ void RemoveTimerElem(qhead, t)	/* (TimerElemPtr *qhead, TimerElemPtr t) */
 	p = n;
     }				/* while */
 	
+    ATENABLE(s, adsptmr_lock);
 }
 
 
@@ -154,19 +171,29 @@ 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 */
-	while ((n = p->link) && 
-	       (n->timer == 0)) /* Next guy needs to be serviced */
-	{
-		p->link = n->link;	/* Unlink us */
-		n->onQ	= 0;
+    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;
 
-		DoTimerElem(n);
+	ATENABLE(s, adsptmr_lock);
+	DoTimerElem(n);
+	ATDISABLE(s, adsptmr_lock);
 
-		p = (TimerElemPtr)qhead;
-	}				/* while */
-    }
+	p = (TimerElemPtr)qhead;
+    }				/* while */
+	
+done:
+    ATENABLE(s, adsptmr_lock);
 }