oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed arguments of timer library functions.

Browse Source
This commit is contained in:
Ben Gras 2005-06-17 13:36:01 +00:00
parent 2f25279105
commit 3c7120d830
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/clock.c
View File

@ -157,7 +157,7 @@ message *m_ptr; /* pointer to request message */
/* Check if a clock timer expired and run its watchdog function. */ /* Check if a clock timer expired and run its watchdog function. */
if (next_timeout <= realtime) { if (next_timeout <= realtime) {
tmrs_exptimers(&clock_timers, realtime); tmrs_exptimers(&clock_timers, realtime, NULL);
next_timeout = clock_timers == NULL ? next_timeout = clock_timers == NULL ?
TMR_NEVER : clock_timers->tmr_exp_time; 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 /* 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. * 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; 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 * active and expired lists. Always update the next timeout time by setting
* it to the front of the active list. * it to the front of the active list.
*/ */
tmrs_clrtimer(&clock_timers, tp); tmrs_clrtimer(&clock_timers, tp, NULL);
next_timeout = (clock_timers == NULL) ? next_timeout = (clock_timers == NULL) ?
TMR_NEVER : clock_timers->tmr_exp_time; TMR_NEVER : clock_timers->tmr_exp_time;
} }

4
kernel/const.h
View File

@ -74,8 +74,8 @@
#endif #endif
/* Disable/Enable hardware interrupts. */ /* Disable/Enable hardware interrupts. */
#define lock(c, v) do { intr_disable(); locktimestart(c, v); } while(0); #define lock(c, v) do { intr_disable(); locktimestart(c, v); } while(0)
#define unlock(c) do { locktimeend(c); intr_enable(); } while(0); #define unlock(c) do { locktimeend(c); intr_enable(); } while(0)
/* Sizes of memory tables. The boot monitor distinguishes three memory areas, /* 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 * namely low mem below 1M, 1M-16M, and mem after 16M. More chunks are needed