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

11
servers/vfs/proto.h
View File

@@ -3,11 +3,12 @@
/* Function prototypes. */
#include "timers.h"
#include "request.h"
#include "tll.h"
#include "threads.h"
#include <minix/rs.h>
#include <minix/timers.h>
#include "request.h"
#include "threads.h"
#include "tll.h"
/* Structs used in prototypes must be declared as such first. */
struct filp;
@@ -357,7 +358,7 @@ void select_callback(struct filp *, int ops);
void select_forget(void);
void select_reply1(endpoint_t driver_e, int minor, int status);
void select_reply2(endpoint_t driver_e, int minor, int status);
void select_timeout_check(timer_t *);
void select_timeout_check(minix_timer_t *);
void select_unsuspend_by_endpt(endpoint_t proc);
/* worker.c */

4
servers/vfs/select.c
View File

@@ -45,7 +45,7 @@ static struct selectentry {
char block;
char starting;
clock_t expiry;
timer_t timer; /* if expiry > 0 */
minix_timer_t timer; /* if expiry > 0 */
} selecttab[MAXSELECTS];
static int copy_fdsets(struct selectentry *se, int nfds, int direction);
@@ -704,7 +704,7 @@ void select_forget(void)
/*===========================================================================*
* select_timeout_check *
*===========================================================================*/
void select_timeout_check(timer_t *timer)
void select_timeout_check(minix_timer_t *timer)
{
/* An alarm has gone off for one of the select queries. This function MUST NOT
* block its calling thread.