diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2019-01-28 03:52:14 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2019-04-23 21:57:44 +0200 |
| commit | a6078fe1d8701d15262e7eb5b3d50d13d1702bbc (patch) | |
| tree | f59a29deaff503daf3b7354685148a1cbc6eaf5f /src/osmo-bsc/abis_om2000.c | |
| parent | 62f3b302b09ec183b601776e4a3d2b5658a5abe2 (diff) | |
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
Diffstat (limited to 'src/osmo-bsc/abis_om2000.c')
| -rw-r--r-- | src/osmo-bsc/abis_om2000.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c index 9715dfc17..fda273de9 100644 --- a/src/osmo-bsc/abis_om2000.c +++ b/src/osmo-bsc/abis_om2000.c @@ -42,7 +42,6 @@ #include <osmocom/bsc/abis_rsl.h> #include <osmocom/bsc/abis_om2000.h> #include <osmocom/bsc/signal.h> -#include <osmocom/bsc/gsm_timers.h> #include <osmocom/bsc/timeslot_fsm.h> #include <osmocom/abis/e1_input.h> @@ -1381,7 +1380,7 @@ int abis_om2k_tx_ts_conf_req(struct gsm_bts_trx_ts *ts) break; case GSM_PCHAN_CCCH_SDCCH4: msgb_tv_put(msg, OM2K_DEI_T3105, - T_def_get(ts->trx->bts->network->T_defs, 3105, T_MS, -1) / 10); + osmo_tdef_get(ts->trx->bts->network->T_defs, 3105, OSMO_TDEF_MS, -1) / 10); msgb_tv_put(msg, OM2K_DEI_NY1, 35); msgb_tv_put(msg, OM2K_DEI_BA_PA_MFRMS, 0x06); msgb_tv_put(msg, OM2K_DEI_CBCH_INDICATOR, 0); @@ -1396,7 +1395,7 @@ int abis_om2k_tx_ts_conf_req(struct gsm_bts_trx_ts *ts) break; case GSM_PCHAN_SDCCH8_SACCH8C: msgb_tv_put(msg, OM2K_DEI_T3105, - T_def_get(ts->trx->bts->network->T_defs, 3105, T_MS, -1) / 10); + osmo_tdef_get(ts->trx->bts->network->T_defs, 3105, OSMO_TDEF_MS, -1) / 10); msgb_tv_put(msg, OM2K_DEI_NY1, 35); msgb_tv_put(msg, OM2K_DEI_CBCH_INDICATOR, 0); msgb_tv_put(msg, OM2K_DEI_TSC, gsm_ts_tsc(ts)); @@ -1407,7 +1406,7 @@ int abis_om2k_tx_ts_conf_req(struct gsm_bts_trx_ts *ts) break; default: msgb_tv_put(msg, OM2K_DEI_T3105, - T_def_get(ts->trx->bts->network->T_defs, 3105, T_MS, -1) / 10); + osmo_tdef_get(ts->trx->bts->network->T_defs, 3105, OSMO_TDEF_MS, -1) / 10); msgb_tv_put(msg, OM2K_DEI_NY1, 35); msgb_tv_put(msg, OM2K_DEI_TSC, gsm_ts_tsc(ts)); /* Disable RF RESOURCE INDICATION on idle channels */ |