summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/alpha/alpha/lock_machdep.c12
-rw-r--r--sys/arch/amd64/amd64/lock_machdep.c8
-rw-r--r--sys/arch/hppa/hppa/lock_machdep.c8
-rw-r--r--sys/arch/i386/i386/lock_machdep.c8
-rw-r--r--sys/arch/m88k/m88k/mplock.c8
-rw-r--r--sys/arch/mips64/mips64/lock_machdep.c8
-rw-r--r--sys/arch/mips64/mips64/mutex.c8
-rw-r--r--sys/arch/octeon/stand/boot/machdep.c6
-rw-r--r--sys/arch/powerpc/powerpc/lock_machdep.c8
-rw-r--r--sys/arch/powerpc/powerpc/mutex.c6
-rw-r--r--sys/arch/sparc/stand/common/promdev.c6
-rw-r--r--sys/arch/sparc64/dev/beep.c12
-rw-r--r--sys/arch/sparc64/dev/beeper.c12
-rw-r--r--sys/arch/sparc64/sparc64/lock_machdep.c8
-rw-r--r--sys/arch/sparc64/sparc64/openfirm.c6
-rw-r--r--sys/dev/ic/aic79xx_openbsd.c22
-rw-r--r--sys/dev/ic/re.c8
-rw-r--r--sys/dev/isa/spkr.c18
-rw-r--r--sys/dev/pci/ichwdt.c12
-rw-r--r--sys/dev/sbus/stp4020.c16
-rw-r--r--sys/dev/usb/uthum.c16
21 files changed, 108 insertions, 108 deletions
diff --git a/sys/arch/alpha/alpha/lock_machdep.c b/sys/arch/alpha/alpha/lock_machdep.c
index 36cd7dab6ee..4c03840657b 100644
--- a/sys/arch/alpha/alpha/lock_machdep.c
+++ b/sys/arch/alpha/alpha/lock_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lock_machdep.c,v 1.3 2015/02/11 03:56:00 dlg Exp $ */
+/* $OpenBSD: lock_machdep.c,v 1.4 2016/03/19 11:34:22 mpi Exp $ */
/*
* Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
@@ -71,14 +71,14 @@ __mp_lock_spin(struct __mp_lock *mpl)
while (mpl->mpl_count != 0)
SPINLOCK_SPIN_HOOK;
#else
- int ticks = __mp_lock_spinout;
- if (!CPU_IS_PRIMARY(curcpu())) /* XXX */
- ticks += ticks; /* XXX */
+ int nticks = __mp_lock_spinout;
+ if (!CPU_IS_PRIMARY(curcpu()))
+ nticks += nticks;
- while (mpl->mpl_count != 0 && --ticks > 0)
+ while (mpl->mpl_count != 0 && --nticks > 0)
SPINLOCK_SPIN_HOOK;
- if (ticks == 0) {
+ if (nticks == 0) {
db_printf("__mp_lock(%p): lock spun out", mpl);
Debugger();
}
diff --git a/sys/arch/amd64/amd64/lock_machdep.c b/sys/arch/amd64/amd64/lock_machdep.c
index 5d15d2b74c0..ef348c2dfe9 100644
--- a/sys/arch/amd64/amd64/lock_machdep.c
+++ b/sys/arch/amd64/amd64/lock_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lock_machdep.c,v 1.9 2015/06/25 00:58:49 dlg Exp $ */
+/* $OpenBSD: lock_machdep.c,v 1.10 2016/03/19 11:34:22 mpi Exp $ */
/*
* Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
@@ -50,12 +50,12 @@ __mp_lock_spin(struct __mp_lock *mpl, u_int me)
while (mpl->mpl_ticket != me)
SPINLOCK_SPIN_HOOK;
#else
- int ticks = __mp_lock_spinout;
+ int nticks = __mp_lock_spinout;
- while (mpl->mpl_ticket != me && --ticks > 0)
+ while (mpl->mpl_ticket != me && --nticks > 0)
SPINLOCK_SPIN_HOOK;
- if (ticks == 0) {
+ if (nticks == 0) {
db_printf("__mp_lock(%p): lock spun out", mpl);
Debugger();
}
diff --git a/sys/arch/hppa/hppa/lock_machdep.c b/sys/arch/hppa/hppa/lock_machdep.c
index 2c154b0e01a..7b23204fc13 100644
--- a/sys/arch/hppa/hppa/lock_machdep.c
+++ b/sys/arch/hppa/hppa/lock_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lock_machdep.c,v 1.8 2015/02/11 01:58:57 dlg Exp $ */
+/* $OpenBSD: lock_machdep.c,v 1.9 2016/03/19 11:34:22 mpi Exp $ */
/*
* Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
@@ -81,12 +81,12 @@ __mp_lock_spin(struct __mp_lock *mpl)
while (mpl->mpl_count != 0)
SPINLOCK_SPIN_HOOK;
#else
- int ticks = __mp_lock_spinout;
+ int nticks = __mp_lock_spinout;
- while (mpl->mpl_count != 0 && --ticks > 0)
+ while (mpl->mpl_count != 0 && --nticks > 0)
SPINLOCK_SPIN_HOOK;
- if (ticks == 0) {
+ if (nticks == 0) {
db_printf("__mp_lock(%p): lock spun out", mpl);
Debugger();
}
diff --git a/sys/arch/i386/i386/lock_machdep.c b/sys/arch/i386/i386/lock_machdep.c
index 4d0fb1157da..3cc962a5730 100644
--- a/sys/arch/i386/i386/lock_machdep.c
+++ b/sys/arch/i386/i386/lock_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lock_machdep.c,v 1.18 2015/05/30 08:41:30 kettenis Exp $ */
+/* $OpenBSD: lock_machdep.c,v 1.19 2016/03/19 11:34:22 mpi Exp $ */
/* $NetBSD: lock_machdep.c,v 1.1.2.3 2000/05/03 14:40:30 sommerfeld Exp $ */
/*-
@@ -80,12 +80,12 @@ __mp_lock_spin(struct __mp_lock *mpl, u_int me)
while (mpl->mpl_ticket != me)
SPINLOCK_SPIN_HOOK;
#else
- int ticks = __mp_lock_spinout;
+ int nticks = __mp_lock_spinout;
- while (mpl->mpl_ticket != me && --ticks > 0)
+ while (mpl->mpl_ticket != me && --nticks > 0)
SPINLOCK_SPIN_HOOK;
- if (ticks == 0) {
+ if (nticks == 0) {
db_printf("__mp_lock(%p): lock spun out", mpl);
Debugger();
}
diff --git a/sys/arch/m88k/m88k/mplock.c b/sys/arch/m88k/m88k/mplock.c
index 243a9826f54..bdbf9d517e3 100644
--- a/sys/arch/m88k/m88k/mplock.c
+++ b/sys/arch/m88k/m88k/mplock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mplock.c,v 1.3 2015/02/11 07:05:39 dlg Exp $ */
+/* $OpenBSD: mplock.c,v 1.4 2016/03/19 11:34:22 mpi Exp $ */
/*
* Copyright (c) 2004 Niklas Hallqvist. All rights reserved.
@@ -50,12 +50,12 @@ __mp_lock_spin(struct __mp_lock *mpl)
while (mpl->mpl_count != 0)
SPINLOCK_SPIN_HOOK;
#else
- int ticks = __mp_lock_spinout;
+ int nticks = __mp_lock_spinout;
- while (mpl->mpl_count != 0 && ticks-- > 0)
+ while (mpl->mpl_count != 0 && nticks-- > 0)
SPINLOCK_SPIN_HOOK;
- if (ticks == 0) {
+ if (nticks == 0) {
db_printf("__mp_lock(0x%x): lock spun out", mpl);
Debugger();
}
diff --git a/sys/arch/mips64/mips64/lock_machdep.c b/sys/arch/mips64/mips64/lock_machdep.c
index e393c4664c9..61c32b51d59 100644
--- a/sys/arch/mips64/mips64/lock_machdep.c
+++ b/sys/arch/mips64/mips64/lock_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lock_machdep.c,v 1.1 2015/09/09 15:48:52 visa Exp $ */
+/* $OpenBSD: lock_machdep.c,v 1.2 2016/03/19 11:34:22 mpi Exp $ */
/*
* Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
@@ -51,12 +51,12 @@ __mp_lock_spin(struct __mp_lock *mpl)
while (mpl->mpl_count != 0)
SPINLOCK_SPIN_HOOK;
#else
- int ticks = __mp_lock_spinout;
+ int nticks = __mp_lock_spinout;
- while (mpl->mpl_count != 0 && --ticks > 0)
+ while (mpl->mpl_count != 0 && --nticks > 0)
SPINLOCK_SPIN_HOOK;
- if (ticks == 0) {
+ if (nticks == 0) {
db_printf("__mp_lock(%p): lock spun out", mpl);
Debugger();
}
diff --git a/sys/arch/mips64/mips64/mutex.c b/sys/arch/mips64/mips64/mutex.c
index 6a14441227a..f05db1894ef 100644
--- a/sys/arch/mips64/mips64/mutex.c
+++ b/sys/arch/mips64/mips64/mutex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mutex.c,v 1.3 2015/09/26 04:03:25 visa Exp $ */
+/* $OpenBSD: mutex.c,v 1.4 2016/03/19 11:34:22 mpi Exp $ */
/*
* Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
@@ -57,15 +57,15 @@ void
mtx_enter(struct mutex *mtx)
{
#ifdef MP_LOCKDEBUG
- int ticks = __mp_lock_spinout;
+ int nticks = __mp_lock_spinout;
#endif
while (mtx_enter_try(mtx) == 0) {
#ifdef MP_LOCKDEBUG
- if (--ticks == 0) {
+ if (--nticks == 0) {
db_printf("%s(%p): lock spun out", __func__, mtx);
Debugger();
- ticks = __mp_lock_spinout;
+ nticks = __mp_lock_spinout;
}
#endif
}
diff --git a/sys/arch/octeon/stand/boot/machdep.c b/sys/arch/octeon/stand/boot/machdep.c
index cd5d8cf4ac7..b3587f6db37 100644
--- a/sys/arch/octeon/stand/boot/machdep.c
+++ b/sys/arch/octeon/stand/boot/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.7 2014/07/18 07:27:47 jasper Exp $ */
+/* $OpenBSD: machdep.c,v 1.8 2016/03/19 11:34:22 mpi Exp $ */
/*
* Copyright (c) 2009, 2010 Miodrag Vallat.
@@ -161,10 +161,10 @@ parse_rootdev(void)
time_t
getsecs(void)
{
- u_int ticks = cp0_get_count();
+ u_int nticks = cp0_get_count();
uint32_t freq = boot_desc->eclock;
- return (time_t)((0xffffffff - ticks) / freq);
+ return (time_t)((0xffffffff - nticks) / freq);
}
void
diff --git a/sys/arch/powerpc/powerpc/lock_machdep.c b/sys/arch/powerpc/powerpc/lock_machdep.c
index 45d1df387ac..c1ab6e6c678 100644
--- a/sys/arch/powerpc/powerpc/lock_machdep.c
+++ b/sys/arch/powerpc/powerpc/lock_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lock_machdep.c,v 1.3 2015/08/14 06:14:19 dlg Exp $ */
+/* $OpenBSD: lock_machdep.c,v 1.4 2016/03/19 11:34:22 mpi Exp $ */
/*
* Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
@@ -49,12 +49,12 @@ __mp_lock_spin(struct __mp_lock *mpl)
while (mpl->mpl_count != 0)
SPINLOCK_SPIN_HOOK;
#else
- int ticks = __mp_lock_spinout;
+ int nticks = __mp_lock_spinout;
- while (mpl->mpl_count != 0 && --ticks > 0)
+ while (mpl->mpl_count != 0 && --nticks > 0)
SPINLOCK_SPIN_HOOK;
- if (ticks == 0) {
+ if (nticks == 0) {
db_printf("__mp_lock(%p): lock spun out", mpl);
Debugger();
}
diff --git a/sys/arch/powerpc/powerpc/mutex.c b/sys/arch/powerpc/powerpc/mutex.c
index 2e51bba22c7..1428dfb595a 100644
--- a/sys/arch/powerpc/powerpc/mutex.c
+++ b/sys/arch/powerpc/powerpc/mutex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mutex.c,v 1.2 2015/09/21 06:21:49 kettenis Exp $ */
+/* $OpenBSD: mutex.c,v 1.3 2016/03/19 11:34:22 mpi Exp $ */
/*
* Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
@@ -57,14 +57,14 @@ void
mtx_enter(struct mutex *mtx)
{
#if defined(MP_LOCKDEBUG)
- int ticks = __mp_lock_spinout;
+ int nticks = __mp_lock_spinout;
#endif
while (mtx_enter_try(mtx) == 0) {
SPINLOCK_SPIN_HOOK;
#if defined(MP_LOCKDEBUG)
- if (--ticks == 0) {
+ if (--nticks == 0) {
db_printf("%s: %p lock spun out", __func__, mtx);
Debugger();
}
diff --git a/sys/arch/sparc/stand/common/promdev.c b/sys/arch/sparc/stand/common/promdev.c
index afe89c90356..2ac8d6c12f4 100644
--- a/sys/arch/sparc/stand/common/promdev.c
+++ b/sys/arch/sparc/stand/common/promdev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: promdev.c,v 1.17 2015/01/11 18:10:33 miod Exp $ */
+/* $OpenBSD: promdev.c,v 1.18 2016/03/19 11:34:22 mpi Exp $ */
/* $NetBSD: promdev.c,v 1.16 1995/11/14 15:04:01 pk Exp $ */
/*
@@ -476,8 +476,8 @@ int hz = 1000;
time_t
getsecs(void)
{
- register int ticks = getticks();
- return ((time_t)(ticks / hz));
+ register int nticks = getticks();
+ return ((time_t)(nticks / hz));
}
int
diff --git a/sys/arch/sparc64/dev/beep.c b/sys/arch/sparc64/dev/beep.c
index fa9f7bae4a7..bcb7067e260 100644
--- a/sys/arch/sparc64/dev/beep.c
+++ b/sys/arch/sparc64/dev/beep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: beep.c,v 1.6 2016/01/08 15:54:13 jcs Exp $ */
+/* $OpenBSD: beep.c,v 1.7 2016/03/19 11:34:22 mpi Exp $ */
/*
* Copyright (c) 2006 Jason L. Wright (jason@thought.net)
@@ -219,11 +219,11 @@ void
beep_bell(void *vsc, u_int pitch, u_int period, u_int volume, int poll)
{
struct beep_softc *sc = vsc;
- int s, ticks;
+ int s, nticks;
- ticks = (period * hz) / 1000;
- if (ticks <= 0)
- ticks = 1;
+ nticks = (period * hz) / 1000;
+ if (nticks <= 0)
+ nticks = 1;
s = spltty();
if (sc->sc_bellactive) {
@@ -240,7 +240,7 @@ beep_bell(void *vsc, u_int pitch, u_int period, u_int volume, int poll)
sc->sc_belltimeout = 1;
bus_space_write_1(sc->sc_iot, sc->sc_ioh, BEEP_CTRL,
BEEP_CTRL_ON);
- timeout_add(&sc->sc_to, ticks);
+ timeout_add(&sc->sc_to, nticks);
}
splx(s);
}
diff --git a/sys/arch/sparc64/dev/beeper.c b/sys/arch/sparc64/dev/beeper.c
index 9d7e3900f84..73fd981a336 100644
--- a/sys/arch/sparc64/dev/beeper.c
+++ b/sys/arch/sparc64/dev/beeper.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: beeper.c,v 1.10 2005/12/20 16:50:33 martin Exp $ */
+/* $OpenBSD: beeper.c,v 1.11 2016/03/19 11:34:22 mpi Exp $ */
/*
* Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -148,11 +148,11 @@ beeper_bell(vsc, pitch, period, volume, poll)
int poll;
{
struct beeper_softc *sc = vsc;
- int s, ticks;
+ int s, nticks;
- ticks = (period * hz) / 1000;
- if (ticks <= 0)
- ticks = 1;
+ nticks = (period * hz) / 1000;
+ if (nticks <= 0)
+ nticks = 1;
s = spltty();
if (sc->sc_bellactive) {
@@ -168,7 +168,7 @@ beeper_bell(vsc, pitch, period, volume, poll)
sc->sc_bellactive = 1;
sc->sc_belltimeout = 1;
bus_space_write_4(sc->sc_iot, sc->sc_ioh, BEEP_REG, 1);
- timeout_add(&sc->sc_to, ticks);
+ timeout_add(&sc->sc_to, nticks);
}
splx(s);
}
diff --git a/sys/arch/sparc64/sparc64/lock_machdep.c b/sys/arch/sparc64/sparc64/lock_machdep.c
index 4a4211f8296..f458d378a3c 100644
--- a/sys/arch/sparc64/sparc64/lock_machdep.c
+++ b/sys/arch/sparc64/sparc64/lock_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lock_machdep.c,v 1.10 2015/06/25 00:53:19 dlg Exp $ */
+/* $OpenBSD: lock_machdep.c,v 1.11 2016/03/19 11:34:22 mpi Exp $ */
/*
* Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
@@ -93,12 +93,12 @@ __mp_lock_spin(struct __mp_lock *mpl, u_int me)
while (mpl->mpl_ticket != me)
SPINLOCK_SPIN_HOOK;
#else
- int ticks = __mp_lock_spinout;
+ int nticks = __mp_lock_spinout;
- while (mpl->mpl_ticket != me && --ticks > 0)
+ while (mpl->mpl_ticket != me && --nticks > 0)
SPINLOCK_SPIN_HOOK;
- if (ticks == 0) {
+ if (nticks == 0) {
db_printf("__mp_lock(%p): lock spun out", mpl);
Debugger();
}
diff --git a/sys/arch/sparc64/sparc64/openfirm.c b/sys/arch/sparc64/sparc64/openfirm.c
index bdc1c4dc418..3c7561e88d8 100644
--- a/sys/arch/sparc64/sparc64/openfirm.c
+++ b/sys/arch/sparc64/sparc64/openfirm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openfirm.c,v 1.17 2016/03/07 13:21:51 naddy Exp $ */
+/* $OpenBSD: openfirm.c,v 1.18 2016/03/19 11:34:22 mpi Exp $ */
/* $NetBSD: openfirm.c,v 1.13 2001/06/21 00:08:02 eeh Exp $ */
/*
@@ -737,7 +737,7 @@ OF_milliseconds(void)
cell_t name;
cell_t nargs;
cell_t nreturns;
- cell_t ticks;
+ cell_t nticks;
} args;
args.name = ADR2CELL("milliseconds");
@@ -745,7 +745,7 @@ OF_milliseconds(void)
args.nreturns = 1;
if (openfirmware(&args) == -1)
return -1;
- return (args.ticks);
+ return (args.nticks);
}
#ifdef DDB
diff --git a/sys/dev/ic/aic79xx_openbsd.c b/sys/dev/ic/aic79xx_openbsd.c
index ee636eb146f..c396b30fdff 100644
--- a/sys/dev/ic/aic79xx_openbsd.c
+++ b/sys/dev/ic/aic79xx_openbsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic79xx_openbsd.c,v 1.43 2015/07/17 21:42:49 krw Exp $ */
+/* $OpenBSD: aic79xx_openbsd.c,v 1.44 2016/03/19 11:34:22 mpi Exp $ */
/*
* Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -692,24 +692,24 @@ void
aic_timer_reset(aic_timer_t *timer, u_int msec, ahd_callback_t *func,
void *arg)
{
- uint64_t ticks;
+ uint64_t nticks;
- ticks = msec;
- ticks *= hz;
- ticks /= 1000;
- callout_reset(timer, ticks, func, arg);
+ nticks = msec;
+ nticks *= hz;
+ nticks /= 1000;
+ callout_reset(timer, nticks, func, arg);
}
void
aic_scb_timer_reset(struct scb *scb, u_int msec)
{
- uint64_t ticks;
+ uint64_t nticks;
- ticks = msec;
- ticks *= hz;
- ticks /= 1000;
+ nticks = msec;
+ nticks *= hz;
+ nticks /= 1000;
if (!(scb->xs->xs_control & XS_CTL_POLL))
- callout_reset(&scb->xs->xs_callout, ticks, ahd_timeout, scb);
+ callout_reset(&scb->xs->xs_callout, nticks, ahd_timeout, scb);
}
void
diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c
index f8f77a59244..6330e4432fb 100644
--- a/sys/dev/ic/re.c
+++ b/sys/dev/ic/re.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: re.c,v 1.189 2016/01/04 05:41:22 dlg Exp $ */
+/* $OpenBSD: re.c,v 1.190 2016/03/19 11:34:22 mpi Exp $ */
/* $FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -2262,15 +2262,15 @@ re_setup_sim_im(struct rl_softc *sc)
if (sc->sc_hwrev == RL_HWREV_8139CPLUS)
CSR_WRITE_4(sc, RL_TIMERINT, 0x400); /* XXX */
else {
- u_int32_t ticks;
+ u_int32_t nticks;
/*
* Datasheet says tick decreases at bus speed,
* but it seems the clock runs a little bit
* faster, so we do some compensation here.
*/
- ticks = (sc->rl_sim_time * sc->rl_bus_speed * 8) / 5;
- CSR_WRITE_4(sc, RL_TIMERINT_8169, ticks);
+ nticks = (sc->rl_sim_time * sc->rl_bus_speed * 8) / 5;
+ CSR_WRITE_4(sc, RL_TIMERINT_8169, nticks);
}
CSR_WRITE_4(sc, RL_TIMERCNT, 1); /* reload */
sc->rl_timerintr = 1;
diff --git a/sys/dev/isa/spkr.c b/sys/dev/isa/spkr.c
index d8a54c45425..26cc2434802 100644
--- a/sys/dev/isa/spkr.c
+++ b/sys/dev/isa/spkr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spkr.c,v 1.20 2015/11/25 04:49:10 tedu Exp $ */
+/* $OpenBSD: spkr.c,v 1.21 2016/03/19 11:34:22 mpi Exp $ */
/* $NetBSD: spkr.c,v 1.1 1998/04/15 20:26:18 drochner Exp $ */
/*
@@ -83,16 +83,16 @@ static void playstring(char *, size_t);
/* emit tone of frequency hz for given number of ticks */
static void
-tone(hz, ticks)
- u_int hz, ticks;
+tone(hz, nticks)
+ u_int hz, nticks;
{
- pcppi_bell(ppicookie, hz, ticks, PCPPI_BELL_SLEEP);
+ pcppi_bell(ppicookie, hz, nticks, PCPPI_BELL_SLEEP);
}
/* rest for given number of ticks */
static void
-rest(ticks)
- int ticks;
+rest(nticks)
+ int nticks;
{
/*
* Set timeout to endrest function, then give up the timeslice.
@@ -100,10 +100,10 @@ rest(ticks)
* waited out.
*/
#ifdef SPKRDEBUG
- printf("rest: %d\n", ticks);
+ printf("rest: %d\n", nticks);
#endif /* SPKRDEBUG */
- if (ticks > 0)
- tsleep(rest, SPKRPRI | PCATCH, "rest", ticks);
+ if (nticks > 0)
+ tsleep(rest, SPKRPRI | PCATCH, "rest", nticks);
}
/**************** PLAY STRING INTERPRETER BEGINS HERE **********************
diff --git a/sys/dev/pci/ichwdt.c b/sys/dev/pci/ichwdt.c
index ef03dc979ba..a87b6844708 100644
--- a/sys/dev/pci/ichwdt.c
+++ b/sys/dev/pci/ichwdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ichwdt.c,v 1.5 2014/12/10 12:27:57 mikeb Exp $ */
+/* $OpenBSD: ichwdt.c,v 1.6 2016/03/19 11:34:22 mpi Exp $ */
/*
* Copyright (c) 2004, 2005 Alexander Yurchenko <grange@openbsd.org>
@@ -158,7 +158,7 @@ int
ichwdt_cb(void *arg, int period)
{
struct ichwdt_softc *sc = arg;
- int ticks;
+ int nticks;
if (period == 0) {
if (sc->sc_period != 0) {
@@ -178,11 +178,11 @@ ichwdt_cb(void *arg, int period)
if (sc->sc_period != period) {
/* Set new timeout */
- ticks = (period * 33000000) / sc->sc_divisor;
- ichwdt_unlock_write(sc, ICH_WDT_PRE1, ticks);
+ nticks = (period * 33000000) / sc->sc_divisor;
+ ichwdt_unlock_write(sc, ICH_WDT_PRE1, nticks);
ichwdt_unlock_write(sc, ICH_WDT_PRE2, 2);
- DPRINTF(("%s: timeout %ds (%d ticks)\n",
- sc->sc_dev.dv_xname, period, ticks));
+ DPRINTF(("%s: timeout %ds (%d nticks)\n",
+ sc->sc_dev.dv_xname, period, nticks));
}
if (sc->sc_period == 0) {
/* Enable watchdog */
diff --git a/sys/dev/sbus/stp4020.c b/sys/dev/sbus/stp4020.c
index cde691ef8d9..1fd19684546 100644
--- a/sys/dev/sbus/stp4020.c
+++ b/sys/dev/sbus/stp4020.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: stp4020.c,v 1.18 2013/11/19 01:23:51 deraadt Exp $ */
+/* $OpenBSD: stp4020.c,v 1.19 2016/03/19 11:34:22 mpi Exp $ */
/* $NetBSD: stp4020.c,v 1.23 2002/06/01 23:51:03 lukem Exp $ */
/*-
@@ -898,21 +898,21 @@ void
stp4020_delay(ms)
unsigned int ms;
{
- unsigned int ticks;
+ unsigned int nticks;
- /* Convert to ticks */
- ticks = (ms * hz) / 1000000;
+ /* Convert to nticks */
+ nticks = (ms * hz) / 1000000;
- if (cold || ticks == 0) {
+ if (cold || nticks == 0) {
delay(ms);
return;
}
#ifdef DEBUG
- if (ticks > 60 * hz)
- panic("stp4020: preposterous delay: %u", ticks);
+ if (nticks > 60 * hz)
+ panic("stp4020: preposterous delay: %u", nticks);
#endif
- tsleep(&ticks, 0, "stp4020_delay", ticks);
+ tsleep(&nticks, 0, "stp4020_delay", nticks);
}
#ifdef STP4020_DEBUG
diff --git a/sys/dev/usb/uthum.c b/sys/dev/usb/uthum.c
index b8c65754bb2..56f3695e84f 100644
--- a/sys/dev/usb/uthum.c
+++ b/sys/dev/usb/uthum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uthum.c,v 1.30 2016/01/09 04:14:42 jcs Exp $ */
+/* $OpenBSD: uthum.c,v 1.31 2016/03/19 11:34:22 mpi Exp $ */
/*
* Copyright (c) 2009, 2010 Yojiro UO <yuo@nui.org>
@@ -742,7 +742,7 @@ uthum_ds75_temp(uint8_t msb, uint8_t lsb)
int
uthum_sht1x_temp(uint8_t msb, uint8_t lsb)
{
- int ticks;
+ int nticks;
/* sensor device VDD-bias value table
* ----------------------------------------------
@@ -754,20 +754,20 @@ uthum_sht1x_temp(uint8_t msb, uint8_t lsb)
* bias -3970 will be best for that device.
*/
- ticks = (msb * 256 + lsb) & 0x3fff;
- return (ticks - 3970);
+ nticks = (msb * 256 + lsb) & 0x3fff;
+ return (nticks - 3970);
}
/* return %RH * 1000 */
int
uthum_sht1x_rh(uint8_t msb, uint8_t lsb, int temp)
{
- int ticks, rh_l;
+ int nticks, rh_l;
- ticks = (msb * 256 + lsb) & 0x0fff;
- rh_l = (-40000 + 405 * ticks) - ((7 * ticks * ticks) / 250);
+ nticks = (msb * 256 + lsb) & 0x0fff;
+ rh_l = (-40000 + 405 * nticks) - ((7 * nticks * nticks) / 250);
- return ((temp - 2500) * (1 + (ticks >> 7)) + rh_l) / 10;
+ return ((temp - 2500) * (1 + (nticks >> 7)) + rh_l) / 10;
}
/* return muK */
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 21:27:36 +0000