From 77cd10f0db6ebd0e3a5b6d8136470bc4adccdd57 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Thu, 5 Sep 2019 13:30:48 +0200 Subject: tdef: Introduce API osmo_tdef_set() This API is already useful for users willing to set a given timer to a given value. It will also contain code later that checks for value being inside valid range for that timer. Related: OS#4190 Change-Id: Id56a1226d724a374f04231df85fe5b49ffd2c43c --- include/osmocom/core/tdef.h | 1 + src/tdef.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/include/osmocom/core/tdef.h b/include/osmocom/core/tdef.h index 566f5dd3..a1ad4ccb 100644 --- a/include/osmocom/core/tdef.h +++ b/include/osmocom/core/tdef.h @@ -97,6 +97,7 @@ void osmo_tdefs_reset(struct osmo_tdef *tdefs); unsigned long osmo_tdef_get(const struct osmo_tdef *tdefs, int T, enum osmo_tdef_unit as_unit, long val_if_not_present); struct osmo_tdef *osmo_tdef_get_entry(struct osmo_tdef *tdefs, int T); +int osmo_tdef_set(struct osmo_tdef *tdefs, int T, unsigned long val, enum osmo_tdef_unit as_unit); /*! Using osmo_tdef for osmo_fsm_inst: array entry for a mapping of state numbers to timeout definitions. * For a usage example, see osmo_tdef_get_state_timeout() and test_tdef_state_timeout() in tdef_test.c. */ diff --git a/src/tdef.c b/src/tdef.c index 40a99002..dfb47f68 100644 --- a/src/tdef.c +++ b/src/tdef.c @@ -25,6 +25,7 @@ */ #include +#include #include #include @@ -210,6 +211,25 @@ struct osmo_tdef *osmo_tdef_get_entry(struct osmo_tdef *tdefs, int T) return NULL; } +/*! Set value in entry matching T, converting val from val_unit to unit of T. + * \param[in] tdefs Array of timer definitions, last entry being fully zero. + * \param[in] T Timer number to set the value for. + * \param[in] val The new timer value to set. + * \param[in] val_unit Units of value in parameter val. + * \return 0 on success, negative on error. + */ +int osmo_tdef_set(struct osmo_tdef *tdefs, int T, unsigned long val, enum osmo_tdef_unit val_unit) +{ + struct osmo_tdef *t; + osmo_tdef_for_each(t, tdefs) { + if (t->T == T) { + t->val = osmo_tdef_round(val, val_unit, t->unit); + return 0; + } + } + return -EEXIST; +} + /*! Using osmo_tdef for osmo_fsm_inst: find a given state's osmo_tdef_state_timeout entry. * * The timeouts_array shall contain exactly 32 elements, regardless whether only some of them are actually populated -- cgit v1.2.3