Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replacing timer_t by netbsd's timer_t

Browse Source 
* Renamed struct timer to struct minix_timer
 * Renamed timer_t to minix_timer_t
 * Ensured all the code uses the minix_timer_t typedef
 * Removed ifdef around _BSD_TIMER_T
 * Removed include/timers.h and merged it into include/minix/timers.h
 * Resolved prototype conflict by renaming kernel's (re)set_timer
   to (re)set_kernel_timer.

Change-Id: I56f0f30dfed96e1a0575d92492294cf9a06468a5
This commit is contained in:
Lionel Sambuc
2013-09-19 10:57:10 +02:00
parent 214c4e152b
commit 9fab85c2de
67 changed files with 256 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
servers/inet/clock.c
View File

@@ -16,10 +16,10 @@ int clck_call_expire;
static clock_t curr_time;
static clock_t prev_time;
static timer_t *timer_chain;
static minix_timer_t *timer_chain;
static time_t next_timeout;
static void clck_fast_release(timer_t *timer);
static void clck_fast_release(minix_timer_t *timer);
static void set_timer(void);
void clck_init()
@@ -66,12 +66,12 @@ void reset_time()
}
void clck_timer(timer, timeout, func, fd)
timer_t *timer;
minix_timer_t *timer;
time_t timeout;
timer_func_t func;
int fd;
{
timer_t *timer_index;
minix_timer_t *timer_index;
if (timer->tim_active)
clck_fast_release(timer);
@@ -111,9 +111,9 @@ message *mess;
}
static void clck_fast_release (timer)
timer_t *timer;
minix_timer_t *timer;
{
timer_t *timer_index;
minix_timer_t *timer_index;
if (!timer->tim_active)
return;
@@ -158,7 +158,7 @@ static void set_timer()
}
void clck_untimer (timer)
timer_t *timer;
minix_timer_t *timer;
{
clck_fast_release (timer);
set_timer();
@@ -167,7 +167,7 @@ timer_t *timer;
void clck_expire_timers()
{
time_t now;
timer_t *timer_index;
minix_timer_t *timer_index;
clck_call_expire= 0;