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/bsc_subscr_conn_fsm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/osmo-bsc/bsc_subscr_conn_fsm.c') diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 1cc0c78b4..4466404f3 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include @@ -85,7 +85,7 @@ static const struct value_string gscon_fsm_event_names[] = { {} }; -struct state_timeout conn_fsm_timeouts[32] = { +struct osmo_tdef_state_timeout conn_fsm_timeouts[32] = { [ST_WAIT_CC] = { .T = 993210 }, [ST_CLEARING] = { .T = 999 }, }; @@ -94,10 +94,10 @@ struct state_timeout conn_fsm_timeouts[32] = { * The actual timeout value is in turn obtained from network->T_defs. * Assumes local variable 'conn' exists. */ #define conn_fsm_state_chg(state) \ - fsm_inst_state_chg_T(conn->fi, state, \ - conn_fsm_timeouts, \ - conn->network->T_defs, \ - -1) + osmo_tdef_fsm_inst_state_chg(conn->fi, state, \ + conn_fsm_timeouts, \ + conn->network->T_defs, \ + -1) /* forward MT DTAP from BSSAP side to RSL side */ static inline void submit_dtap(struct gsm_subscriber_connection *conn, struct msgb *msg) -- cgit v1.2.3