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

4
servers/pm/alarm.c
View File

@@ -26,7 +26,7 @@ static void getset_vtimer(struct mproc *mp, int nwhich, struct
itimerval *value, struct itimerval *ovalue);
static void get_realtimer(struct mproc *mp, struct itimerval *value);
static void set_realtimer(struct mproc *mp, struct itimerval *value);
static void cause_sigalrm(struct timer *tp);
static void cause_sigalrm(minix_timer_t *tp);
/*===========================================================================*
* ticks_from_timeval *
@@ -345,7 +345,7 @@ clock_t ticks; /* how many ticks delay before the signal */
* cause_sigalrm *
*===========================================================================*/
static void cause_sigalrm(tp)
struct timer *tp;
minix_timer_t *tp;
{
int proc_nr_n;
register struct mproc *rmp;

4
servers/pm/mproc.h
View File

@@ -5,7 +5,7 @@
* of corresponding slots referring to the same process in all three.
*/
#include <limits.h>
#include <timers.h>
#include <minix/timers.h>
#include <signal.h>
#include <sys/cdefs.h>
@@ -50,7 +50,7 @@ EXTERN struct mproc {
char mp_padding[60]; /* align structure with new libc */
#endif
vir_bytes mp_sigreturn; /* address of C library __sigreturn function */
struct timer mp_timer; /* watchdog timer for alarm(2), setitimer(2) */
minix_timer_t mp_timer; /* watchdog timer for alarm(2), setitimer(2) */
clock_t mp_interval[NR_ITIMERS]; /* setitimer(2) repetition intervals */
unsigned mp_flags; /* flag bits */

2
servers/pm/proto.h
View File

@@ -5,7 +5,7 @@ struct stat;
struct mem_map;
struct memory;
#include <timers.h>
#include <minix/timers.h>
/* alarm.c */
int do_alarm(void);

2
servers/pm/schedule.c
View File

@@ -11,7 +11,7 @@
#include "mproc.h"
#include <machine/archtypes.h>
#include <timers.h>
#include <minix/timers.h>
#include "kernel/proc.h"
/*===========================================================================*

2
servers/pm/utility.c
View File

@@ -22,7 +22,7 @@
#include "param.h"
#include <minix/config.h>
#include <timers.h>
#include <minix/timers.h>
#include <string.h>
#include <machine/archtypes.h>
#include "kernel/const.h"