Changed arguments of timer library functions.

diff --git a/kernel/clock.c b/kernel/clock.c
index 1f1c8e62394e67861c7410dff55636302d613b0a..7329f3ba303512029daeba4794789aa9f7a8df27 100755 (executable)
--- 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 2023c8c363ea34ad6ac2c0f0e5d78d7b26dc8c61..4cd225d6990c4557282b99e6befad7f26850f280 100755 (executable)
--- 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