From: Ben Gras <ben@minix3.org>
Date: Fri, 17 Jun 2005 13:36:01 +0000 (+0000)
Subject: Changed arguments of timer library functions.
X-Git-Tag: v3.1.0~740
X-Git-Url: http://zhaoyanbai.com/repos/host.html?a=commitdiff_plain;h=3c7120d830af64497602212c04a01a909542fe7c;p=minix.git

Changed arguments of timer library functions.
---

diff --git a/kernel/clock.c b/kernel/clock.c
index 1f1c8e623..7329f3ba3 100755
--- a/kernel/clock.c
+++ b/kernel/clock.c
@@ -157,7 +157,7 @@ message *m_ptr;				/* pointer to request message */
 
   /* Check if a clock timer expired and run its watchdog function. */
   if (next_timeout <= realtime) { 
-  	tmrs_exptimers(&clock_timers, realtime);
+  	tmrs_exptimers(&clock_timers, realtime, NULL);
   	next_timeout = clock_timers == NULL ? 
 		TMR_NEVER : clock_timers->tmr_exp_time;
   }
@@ -309,7 +309,7 @@ tmr_func_t watchdog;		/* watchdog to be called */
 /* Insert the new timer in the active timers list. Always update the 
  * next timeout time by setting it to the front of the active list.
  */
-  tmrs_settimer(&clock_timers, tp, exp_time, watchdog);
+  tmrs_settimer(&clock_timers, tp, exp_time, watchdog, NULL);
   next_timeout = clock_timers->tmr_exp_time;
 }
 
@@ -324,7 +324,7 @@ struct timer *tp;		/* pointer to timer structure */
  * active and expired lists. Always update the next timeout time by setting
  * it to the front of the active list.
  */
-  tmrs_clrtimer(&clock_timers, tp);
+  tmrs_clrtimer(&clock_timers, tp, NULL);
   next_timeout = (clock_timers == NULL) ? 
 	TMR_NEVER : clock_timers->tmr_exp_time;
 }
diff --git a/kernel/const.h b/kernel/const.h
index 2023c8c36..4cd225d69 100755
--- a/kernel/const.h
+++ b/kernel/const.h
@@ -74,8 +74,8 @@
 #endif
 
 /* Disable/Enable hardware interrupts. */
-#define lock(c, v)	do { intr_disable(); locktimestart(c, v); } while(0);
-#define unlock(c)	do { locktimeend(c); intr_enable();   } while(0);
+#define lock(c, v)	do { intr_disable(); locktimestart(c, v); } while(0)
+#define unlock(c)	do { locktimeend(c); intr_enable(); } while(0)
 
 /* Sizes of memory tables. The boot monitor distinguishes three memory areas, 
  * namely low mem below 1M, 1M-16M, and mem after 16M. More chunks are needed