summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Sommer <jan.sommer@dlr.de>2020-08-14 21:57:51 +0200
committerChris Johns <chrisj@rtems.org>2020-09-16 15:52:58 +1000
commit5cfbb629b6b63d420d741016ff8df21b1666be1d (patch)
treee2eddfe5c2db9f9ba582d31242bf4a05b539262f
parentcc1b05084e16c0f23ef88c07bc9f933688d6688a (diff)
downloadrtems-libbsd-5cfbb629b6b63d420d741016ff8df21b1666be1d.tar.bz2
Callout: Redefine callout_reset_on for rtems
- callout_reset_on takes a cpu which is ignored by the subsequent call to callout_reset_sbt_on in RTEMS. - The macro is redefined to discard the cpu argument directly which enables uses of it with cpu-dependent variables (disabled in RETMS) without further changes, e.g. in iflib.c.
-rw-r--r--freebsd/sys/sys/callout.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/freebsd/sys/sys/callout.h b/freebsd/sys/sys/callout.h
index e5e5df85..d7b9965a 100644
--- a/freebsd/sys/sys/callout.h
+++ b/freebsd/sys/sys/callout.h
@@ -112,9 +112,15 @@ int callout_reset_sbt_on(struct callout *, sbintime_t, sbintime_t,
#define callout_reset_sbt_curcpu(c, sbt, pr, fn, arg, flags) \
callout_reset_sbt_on((c), (sbt), (pr), (fn), (arg), PCPU_GET(cpuid),\
(flags))
+#ifndef __rtems__
#define callout_reset_on(c, to_ticks, fn, arg, cpu) \
callout_reset_sbt_on((c), tick_sbt * (to_ticks), 0, (fn), (arg), \
(cpu), C_HARDCLOCK)
+#else /* __rtems__ */
+#define callout_reset_on(c, to_ticks, fn, arg, cpu) \
+ callout_reset_sbt_on((c), tick_sbt * (to_ticks), 0, (fn), (arg), \
+ -1, C_HARDCLOCK)
+#endif /* __rtems__ */
#define callout_reset(c, on_tick, fn, arg) \
callout_reset_on((c), (on_tick), (fn), (arg), -1)
#define callout_reset_curcpu(c, on_tick, fn, arg) \