fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29174 )

Change subject: mobile: lapdm_channel_init() is deprecated, use lapdm_channel_init3() ......................................................................

mobile: lapdm_channel_init() is deprecated, use lapdm_channel_init3()

Change-Id: I320381488046f9b1780a53b8d5d27e470da727c4 --- M src/host/layer23/src/mobile/app_mobile.c 1 file changed, 12 insertions(+), 7 deletions(-)

Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified

diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 57b472f..7b28bb4 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -186,13 +186,18 @@

gsm_settings_arfcn(ms);

- lapdm_channel_init(&ms->lapdm_channel, LAPDM_MODE_MS); - ms->lapdm_channel.lapdm_dcch.datalink[DL_SAPI3].dl.t200_sec = - T200_DCCH_SHARED; - ms->lapdm_channel.lapdm_dcch.datalink[DL_SAPI3].dl.t200_usec = 0; - ms->lapdm_channel.lapdm_acch.datalink[DL_SAPI3].dl.t200_sec = - T200_ACCH; - ms->lapdm_channel.lapdm_acch.datalink[DL_SAPI3].dl.t200_usec = 0; + const int t200_ms_dcch[_NR_DL_SAPI] = { + [DL_SAPI0] = 1000, + [DL_SAPI3] = 1000 * T200_DCCH_SHARED + }; + const int t200_ms_acch[_NR_DL_SAPI] = { + [DL_SAPI0] = 2000, + [DL_SAPI3] = 1000 * T200_ACCH + }; + + lapdm_channel_init3(&ms->lapdm_channel, LAPDM_MODE_MS, + t200_ms_dcch, t200_ms_acch, + GSM_LCHAN_SDCCH, NULL); lapdm_channel_set_l1(&ms->lapdm_channel, l1ctl_ph_prim_cb, ms);

/* init SAP client before SIM card starts up */