summaryrefslogtreecommitdiff
path: root/sys/arch/sgi/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/sgi/dev')
-rw-r--r--sys/arch/sgi/dev/if_mec.c6
-rw-r--r--sys/arch/sgi/dev/mkbc.c12
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/sgi/dev/if_mec.c b/sys/arch/sgi/dev/if_mec.c
index 064543c0f1e..f973bf09cb9 100644
--- a/sys/arch/sgi/dev/if_mec.c
+++ b/sys/arch/sgi/dev/if_mec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_mec.c,v 1.16 2008/10/02 20:21:13 brad Exp $ */
+/* $OpenBSD: if_mec.c,v 1.17 2008/10/15 19:12:19 blambert Exp $ */
/* $NetBSD: if_mec_mace.c,v 1.5 2004/08/01 06:36:36 tsutsui Exp $ */
/*
@@ -679,7 +679,7 @@ mec_init(struct ifnet *ifp)
MEC_DMA_TX_DMA_ENABLE | /* MEC_DMA_TX_INT_ENABLE | */
MEC_DMA_RX_DMA_ENABLE | MEC_DMA_RX_INT_ENABLE);
- timeout_add(&sc->sc_tick_ch, hz);
+ timeout_add_sec(&sc->sc_tick_ch, 1);
ifp->if_flags |= IFF_RUNNING;
ifp->if_flags &= ~IFF_OACTIVE;
@@ -1131,7 +1131,7 @@ mec_tick(void *arg)
mii_tick(&sc->sc_mii);
splx(s);
- timeout_add(&sc->sc_tick_ch, hz);
+ timeout_add_sec(&sc->sc_tick_ch, 1);
}
void
diff --git a/sys/arch/sgi/dev/mkbc.c b/sys/arch/sgi/dev/mkbc.c
index 249a8fba3a2..ca0bfb40f34 100644
--- a/sys/arch/sgi/dev/mkbc.c
+++ b/sys/arch/sgi/dev/mkbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkbc.c,v 1.7 2008/06/14 18:29:52 miod Exp $ */
+/* $OpenBSD: mkbc.c,v 1.8 2008/10/15 19:12:19 blambert Exp $ */
/*
* Copyright (c) 2006, 2007, Joel Sing
@@ -323,7 +323,7 @@ mkbcintr_internal(struct pckbc_internal *t, struct pckbc_softc *sc)
/* Reschedule timeout further into the idle times. */
if (timeout_pending(&t->t_poll))
- timeout_add(&t->t_poll, hz);
+ timeout_add_sec(&t->t_poll, 1);
/*
* Need to check both "slots" since interrupt could be from
@@ -754,7 +754,7 @@ pckbc_enqueue_cmd(pckbc_tag_t self, pckbc_slot_t slot, u_char *cmd, int len,
} else
res = nc->status;
} else
- timeout_add(&t->t_cleanup, hz);
+ timeout_add_sec(&t->t_cleanup, 1);
if (sync) {
if (respbuf)
@@ -799,7 +799,7 @@ pckbc_set_inputhandler(pckbc_tag_t self, pckbc_slot_t slot, pckbc_inputfcn func,
sc->subname[slot] = name;
if (mkbc_console && slot == PCKBC_KBD_SLOT)
- timeout_add(&t->t_poll, hz);
+ timeout_add_sec(&t->t_poll, 1);
}
void
@@ -831,7 +831,7 @@ pckbc_slot_enable(pckbc_tag_t self, pckbc_slot_t slot, int on)
if (slot == PCKBC_KBD_SLOT) {
if (on)
- timeout_add(&t->t_poll, hz);
+ timeout_add_sec(&t->t_poll, 1);
else
timeout_del(&t->t_poll);
}
@@ -924,6 +924,6 @@ mkbc_poll(void *self)
s = spltty();
(void)mkbcintr_internal(t, t->t_sc);
- timeout_add(&t->t_poll, hz);
+ timeout_add_sec(&t->t_poll, 1);
splx(s);
}