Catch up to the new swi code.

Noticed by:	phk
This commit is contained in:
John Baldwin 2000-10-25 20:21:42 +00:00
parent 3b4d27f6d7
commit cba5b33d1a
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=67580
5 changed files with 4 additions and 16 deletions

View file

@ -241,7 +241,6 @@ clkintr(struct clockframe frame)
switch (timer0_state) {
case RELEASED:
setdelayed();
break;
case ACQUIRED:
@ -249,7 +248,6 @@ clkintr(struct clockframe frame)
>= hardclock_max_count) {
timer0_prescaler_count -= hardclock_max_count;
hardclock(&frame);
setdelayed();
}
break;
@ -264,7 +262,6 @@ clkintr(struct clockframe frame)
mtx_exit(&clock_lock, MTX_SPIN);
timer_func = new_function;
timer0_state = ACQUIRED;
setdelayed();
break;
case RELEASE_PENDING:
@ -283,7 +280,6 @@ clkintr(struct clockframe frame)
timer_func = hardclock;
timer0_state = RELEASED;
hardclock(&frame);
setdelayed();
}
break;
}

View file

@ -241,7 +241,6 @@ clkintr(struct clockframe frame)
switch (timer0_state) {
case RELEASED:
setdelayed();
break;
case ACQUIRED:
@ -249,7 +248,6 @@ clkintr(struct clockframe frame)
>= hardclock_max_count) {
timer0_prescaler_count -= hardclock_max_count;
hardclock(&frame);
setdelayed();
}
break;
@ -264,7 +262,6 @@ clkintr(struct clockframe frame)
mtx_exit(&clock_lock, MTX_SPIN);
timer_func = new_function;
timer0_state = ACQUIRED;
setdelayed();
break;
case RELEASE_PENDING:
@ -283,7 +280,6 @@ clkintr(struct clockframe frame)
timer_func = hardclock;
timer0_state = RELEASED;
hardclock(&frame);
setdelayed();
}
break;
}

View file

@ -420,7 +420,7 @@ static void siointr1 __P((struct com_s *com));
static void siointr __P((void *arg));
static int commctl __P((struct com_s *com, int bits, int how));
static int comparam __P((struct tty *tp, struct termios *t));
static swihand_t siopoll;
static void siopoll __P((void *dummy));
static int sioprobe __P((device_t dev, int xrid));
static int sio_isa_probe __P((device_t dev));
static void siosettimeout __P((void));
@ -3354,7 +3354,7 @@ sioioctl(dev, cmd, data, flag, p)
/* software interrupt handler for SWI_TTY */
static void
siopoll()
siopoll(void *dummy)
{
int unit;
int intrsave;

View file

@ -241,7 +241,6 @@ clkintr(struct clockframe frame)
switch (timer0_state) {
case RELEASED:
setdelayed();
break;
case ACQUIRED:
@ -249,7 +248,6 @@ clkintr(struct clockframe frame)
>= hardclock_max_count) {
timer0_prescaler_count -= hardclock_max_count;
hardclock(&frame);
setdelayed();
}
break;
@ -264,7 +262,6 @@ clkintr(struct clockframe frame)
mtx_exit(&clock_lock, MTX_SPIN);
timer_func = new_function;
timer0_state = ACQUIRED;
setdelayed();
break;
case RELEASE_PENDING:
@ -283,7 +280,6 @@ clkintr(struct clockframe frame)
timer_func = hardclock;
timer0_state = RELEASED;
hardclock(&frame);
setdelayed();
}
break;
}

View file

@ -420,7 +420,7 @@ static void siointr1 __P((struct com_s *com));
static void siointr __P((void *arg));
static int commctl __P((struct com_s *com, int bits, int how));
static int comparam __P((struct tty *tp, struct termios *t));
static swihand_t siopoll;
static void siopoll __P((void *dummy));
static int sioprobe __P((device_t dev, int xrid));
static int sio_isa_probe __P((device_t dev));
static void siosettimeout __P((void));
@ -3354,7 +3354,7 @@ sioioctl(dev, cmd, data, flag, p)
/* software interrupt handler for SWI_TTY */
static void
siopoll()
siopoll(void *dummy)
{
int unit;
int intrsave;