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

8
drivers/tty/arch/i386/console.c
View File

@@ -123,7 +123,7 @@ static void flush(console_t *cons);
static void parse_escape(console_t *cons, int c);
static void scroll_screen(console_t *cons, int dir);
static void set_6845(int reg, unsigned val);
static void stop_beep(timer_t *tmrp);
static void stop_beep(minix_timer_t *tmrp);
static void cons_org0(void);
static void disable_console(void);
static void reenable_console(void);
@@ -789,7 +789,7 @@ static void beep()
* This routine works by turning on the bits 0 and 1 in port B of the 8255
* chip that drive the speaker.
*/
static timer_t tmr_stop_beep;
static minix_timer_t tmr_stop_beep;
pvb_pair_t char_out[3];
u32_t port_b_val;
@@ -885,7 +885,7 @@ clock_t dur;
* This routine works by turning on the bits 0 and 1 in port B of the 8255
* chip that drive the speaker.
*/
static timer_t tmr_stop_beep;
static minix_timer_t tmr_stop_beep;
pvb_pair_t char_out[3];
u32_t port_b_val;
@@ -914,7 +914,7 @@ clock_t dur;
/*===========================================================================*
* stop_beep *
*===========================================================================*/
static void stop_beep(timer_t *UNUSED(tmrp))
static void stop_beep(minix_timer_t *UNUSED(tmrp))
{
/* Turn off the beeper by turning off bits 0 and 1 in PORT_B. */
u32_t port_b_val;

6
drivers/tty/arch/i386/keyboard.c
View File

@@ -151,7 +151,7 @@ static int kbd_watchdog_set= 0;
static int kbd_alive= 1;
static long sticky_alt_mode = 0;
static long debug_fkeys = 1;
static timer_t tmr_kbd_wd;
static minix_timer_t tmr_kbd_wd;
static void kbc_cmd0(int cmd);
static void kbc_cmd1(int cmd, int data);
@@ -166,7 +166,7 @@ static void set_leds(void);
static void show_key_mappings(void);
static int kb_read(struct tty *tp, int try);
static unsigned map_key(int scode);
static void kbd_watchdog(timer_t *tmrp);
static void kbd_watchdog(minix_timer_t *tmrp);
static int kbd_open(devminor_t minor, int access, endpoint_t user_endpt);
static int kbd_close(devminor_t minor);
@@ -1323,7 +1323,7 @@ int *isauxp;
/*===========================================================================*
* kbd_watchdog *
*===========================================================================*/
static void kbd_watchdog(timer_t *UNUSED(tmrp))
static void kbd_watchdog(minix_timer_t *UNUSED(tmrp))
{
kbd_watchdog_set= 0;

4
drivers/tty/tty.c
View File

@@ -63,7 +63,7 @@ unsigned long rs_irq_set = 0;
struct kmessages kmess;
static void tty_timed_out(timer_t *tp);
static void tty_timed_out(minix_timer_t *tp);
static void settimer(tty_t *tty_ptr, int enable);
static void in_transfer(tty_t *tp);
static int tty_echo(tty_t *tp, int ch);
@@ -1608,7 +1608,7 @@ static void tty_init()
/*===========================================================================*
* tty_timed_out *
*===========================================================================*/
static void tty_timed_out(timer_t *tp)
static void tty_timed_out(minix_timer_t *tp)
{
/* This timer has expired. Set the events flag, to force processing. */
tty_t *tty_ptr;

4
drivers/tty/tty.h
View File

@@ -1,7 +1,7 @@
/* tty.h - Terminals */
#include <minix/chardriver.h>
#include <timers.h>
#include <minix/timers.h>
#undef lock
#undef unlock
@@ -42,7 +42,7 @@ typedef struct tty {
devfun_t tty_devread; /* routine to read from low level buffers */
devfun_t tty_icancel; /* cancel any device input */
int tty_min; /* minimum requested #chars in input queue */
timer_t tty_tmr; /* the timer for this tty */
minix_timer_t tty_tmr; /* the timer for this tty */
/* Output section. */
devfun_t tty_devwrite; /* routine to start actual device output */