From a6078fe1d8701d15262e7eb5b3d50d13d1702bbc Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Mon, 28 Jan 2019 03:52:14 +0100 Subject: use libosmocore osmo_tdef Move the T_defs API to libosmocore as osmo_tdefs: remove the local T_defs API and use libosmocore's osmo_tdef* API instead. The root reason is moving the mgw_endpoint_fsm to libosmo-mgcp-client to be able to use it in osmo-msc for inter-MSC handover. When adding osmo_tdef, the new concept of timer groups was added to the API. It would make sense to apply group names here as well, but do not modify the VTY configuration for timers. The future might bring separate groups (or not). Depends: Ibd6b1ed7f1bd6e1f2e0fde53352055a4468f23e5 (libosmocore) Change-Id: I66674a5d8403d820038762888c846bae10ceac58 --- src/osmo-bsc/handover_fsm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/osmo-bsc/handover_fsm.c') diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 421c32efb..fe3b8b2db 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -159,7 +159,7 @@ struct gsm_subscriber_connection *ho_fi_conn(struct osmo_fsm_inst *fi) return fi->priv; } -static const struct state_timeout ho_fsm_timeouts[32] = { +static const struct osmo_tdef_state_timeout ho_fsm_timeouts[32] = { [HO_ST_WAIT_LCHAN_ACTIVE] = { .T = 23042 }, [HO_ST_WAIT_RR_HO_DETECT] = { .T = 23042 }, [HO_ST_WAIT_RR_HO_COMPLETE] = { .T = 23042 }, @@ -173,10 +173,10 @@ static const struct state_timeout ho_fsm_timeouts[32] = { * The actual timeout value is in turn obtained from network->T_defs. * Assumes local variable fi exists. */ #define ho_fsm_state_chg(state) \ - fsm_inst_state_chg_T(fi, state, \ - ho_fsm_timeouts, \ - ((struct gsm_subscriber_connection*)(fi->priv))->network->T_defs, \ - 5) + osmo_tdef_fsm_inst_state_chg(fi, state, \ + ho_fsm_timeouts, \ + ((struct gsm_subscriber_connection*)(fi->priv))->network->T_defs, \ + 5) /* Log failure and transition to HO_ST_FAILURE, which triggers the appropriate actions. */ #define ho_fail(result, fmt, args...) do { \ -- cgit v1.2.3