<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/14340">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lapdm: Use new libosmocore API to ensure per-channel-type N200 values<br><br>By using new libosmocore LAPDm API we can specify the GSM channel type<br>and hence enable the LAPDm code to use a per-channel-type specific N200<br>value.<br><br>At the same time, this new API also allows us to specify T200 values<br>when initializing the LAPDm channel, so we don't have to fiddle with<br>low-level lapdm data structures in what used to be oml_set_lchan_t200().<br><br>Change-Id: I0e814fbae13e0feddd148c47255dcc38cb718f48<br>Depends: libosmocore I90fdc4dd4720d4e02213197c894eb0a55a39158c<br>Closes: OS#4037<br>---<br>M include/osmo-bts/oml.h<br>M src/common/bts.c<br>M src/common/oml.c<br>3 files changed, 40 insertions(+), 59 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/40/14340/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/oml.h b/include/osmo-bts/oml.h</span><br><span>index 14da70e..b92a974 100644</span><br><span>--- a/include/osmo-bts/oml.h</span><br><span>+++ b/include/osmo-bts/oml.h</span><br><span>@@ -40,8 +40,6 @@</span><br><span> int oml_mo_fom_ack_nack(const struct gsm_abis_mo *mo, uint8_t orig_msg_type,</span><br><span> uint8_t cause);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Configure LAPDm T200 timers for this lchan according to OML */</span><br><span style="color: hsl(0, 100%, 40%);">-int oml_set_lchan_t200(struct gsm_lchan *lchan);</span><br><span> extern const unsigned int oml_default_t200_ms[7];</span><br><span> </span><br><span> /* Transmit failure event report */</span><br><span>diff --git a/src/common/bts.c b/src/common/bts.c</span><br><span>index 3626b05..25717ac 100644</span><br><span>--- a/src/common/bts.c</span><br><span>+++ b/src/common/bts.c</span><br><span>@@ -377,15 +377,53 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* prepare the per-SAPI T200 arrays for a given lchan */</span><br><span style="color: hsl(120, 100%, 40%);">+static int t200_by_lchan(int *t200_ms_dcch, int *t200_ms_acch, struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = lchan->ts->trx->bts;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* we have to compensate for the "RTS advance" due to the asynchronous interface between</span><br><span style="color: hsl(120, 100%, 40%);">+ * the BTS (LAPDm) and the PHY/L1 (OsmoTRX or DSP in case of osmo-bts-{sysmo,lc15,oc2g,octphy} */</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t fn_advance = bts_get_avg_fn_advance(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ int32_t fn_advance_us = fn_advance * 4615;</span><br><span style="color: hsl(120, 100%, 40%);">+ int fn_advance_ms = fn_advance_us / 1000;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ t200_ms_acch[DL_SAPI0] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms;</span><br><span style="color: hsl(120, 100%, 40%);">+ t200_ms_acch[DL_SAPI3] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (lchan->type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_LCHAN_SDCCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ t200_ms_dcch[DL_SAPI0] = bts->t200_ms[T200_SDCCH] + fn_advance_ms;</span><br><span style="color: hsl(120, 100%, 40%);">+ t200_ms_dcch[DL_SAPI3] = bts->t200_ms[T200_SDCCH_SAPI3] + fn_advance_ms;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_LCHAN_TCH_F:</span><br><span style="color: hsl(120, 100%, 40%);">+ t200_ms_dcch[DL_SAPI0] = bts->t200_ms[T200_FACCH_F] + fn_advance_ms;</span><br><span style="color: hsl(120, 100%, 40%);">+ t200_ms_dcch[DL_SAPI3] = bts->t200_ms[T200_FACCH_F] + fn_advance_ms;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_LCHAN_TCH_H:</span><br><span style="color: hsl(120, 100%, 40%);">+ t200_ms_dcch[DL_SAPI0] = bts->t200_ms[T200_FACCH_H] + fn_advance_ms;</span><br><span style="color: hsl(120, 100%, 40%);">+ t200_ms_dcch[DL_SAPI3] = bts->t200_ms[T200_FACCH_H] + fn_advance_ms;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int lchan_init_lapdm(struct gsm_lchan *lchan)</span><br><span> {</span><br><span> struct lapdm_channel *lc = &lchan->lapdm_ch;</span><br><span style="color: hsl(120, 100%, 40%);">+ int t200_ms_dcch[_NR_DL_SAPI], t200_ms_acch[_NR_DL_SAPI];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- lapdm_channel_init(lc, LAPDM_MODE_BTS);</span><br><span style="color: hsl(120, 100%, 40%);">+ t200_by_lchan(t200_ms_dcch, t200_ms_acch, lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DLLAPD, LOGL_DEBUG, "Setting T200 D0=%u, D3=%u, S0=%u, S3=%u (all in ms)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ t200_ms_dcch[DL_SAPI0], t200_ms_dcch[DL_SAPI3], t200_ms_acch[DL_SAPI0], t200_ms_acch[DL_SAPI3]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ lapdm_channel_init2(lc, LAPDM_MODE_BTS, t200_ms_dcch, t200_ms_acch, lchan->type);</span><br><span> lapdm_channel_set_flags(lc, LAPDM_ENT_F_POLLING_ONLY);</span><br><span> lapdm_channel_set_l1(lc, NULL, lchan);</span><br><span> lapdm_channel_set_l3(lc, lapdm_rll_tx_cb, lchan);</span><br><span style="color: hsl(0, 100%, 40%);">- oml_set_lchan_t200(lchan);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/src/common/oml.c b/src/common/oml.c</span><br><span>index 7d24509..8ecafbb 100644</span><br><span>--- a/src/common/oml.c</span><br><span>+++ b/src/common/oml.c</span><br><span>@@ -488,61 +488,6 @@</span><br><span> [T200_SACCH_TCH_SAPI3] = 1500,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void dl_set_t200(struct gsm_bts *bts, struct lapdm_datalink *dl, unsigned int t200_msec)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int32_t fn_advance = bts_get_avg_fn_advance(bts);</span><br><span style="color: hsl(0, 100%, 40%);">- int32_t fn_advance_us = fn_advance * 4615; /* 4.615 ms per frame */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* we have to compensate for the "RTS advance" due to the asynchronous interface between</span><br><span style="color: hsl(0, 100%, 40%);">- * the BTS (LAPDm) and the PHY/L1 (OsmoTRX or DSP in case of osmo-bts-{sysmo,lc15,oc2g,octphy} */</span><br><span style="color: hsl(0, 100%, 40%);">- t200_msec += fn_advance_us / 1000;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- dl->dl.t200_sec = t200_msec / 1000;</span><br><span style="color: hsl(0, 100%, 40%);">- dl->dl.t200_usec = (t200_msec % 1000) * 1000;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Configure LAPDm T200 timers for this lchan according to OML */</span><br><span style="color: hsl(0, 100%, 40%);">-int oml_set_lchan_t200(struct gsm_lchan *lchan)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *bts = lchan->ts->trx->bts;</span><br><span style="color: hsl(0, 100%, 40%);">- struct lapdm_channel *lc = &lchan->lapdm_ch;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int t200_dcch, t200_dcch_sapi3, t200_acch, t200_acch_sapi3;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* set T200 for main and associated channel */</span><br><span style="color: hsl(0, 100%, 40%);">- switch (lchan->type) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_LCHAN_SDCCH:</span><br><span style="color: hsl(0, 100%, 40%);">- t200_dcch = bts->t200_ms[T200_SDCCH];</span><br><span style="color: hsl(0, 100%, 40%);">- t200_dcch_sapi3 = bts->t200_ms[T200_SDCCH_SAPI3];</span><br><span style="color: hsl(0, 100%, 40%);">- t200_acch = bts->t200_ms[T200_SACCH_SDCCH];</span><br><span style="color: hsl(0, 100%, 40%);">- t200_acch_sapi3 = bts->t200_ms[T200_SACCH_SDCCH];</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_LCHAN_TCH_F:</span><br><span style="color: hsl(0, 100%, 40%);">- t200_dcch = bts->t200_ms[T200_FACCH_F];</span><br><span style="color: hsl(0, 100%, 40%);">- t200_dcch_sapi3 = bts->t200_ms[T200_FACCH_F];</span><br><span style="color: hsl(0, 100%, 40%);">- t200_acch = bts->t200_ms[T200_SACCH_TCH_SAPI0];</span><br><span style="color: hsl(0, 100%, 40%);">- t200_acch_sapi3 = bts->t200_ms[T200_SACCH_TCH_SAPI3];</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_LCHAN_TCH_H:</span><br><span style="color: hsl(0, 100%, 40%);">- t200_dcch = bts->t200_ms[T200_FACCH_H];</span><br><span style="color: hsl(0, 100%, 40%);">- t200_dcch_sapi3 = bts->t200_ms[T200_FACCH_H];</span><br><span style="color: hsl(0, 100%, 40%);">- t200_acch = bts->t200_ms[T200_SACCH_TCH_SAPI0];</span><br><span style="color: hsl(0, 100%, 40%);">- t200_acch_sapi3 = bts->t200_ms[T200_SACCH_TCH_SAPI3];</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPLCHAN(lchan, DLLAPD, LOGL_DEBUG, "Setting T200 D0=%u, D3=%u, S0=%u, S3=%u (all in ms)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- t200_dcch, t200_dcch_sapi3, t200_acch, t200_acch_sapi3);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- dl_set_t200(bts, &lc->lapdm_dcch.datalink[DL_SAPI0], t200_dcch);</span><br><span style="color: hsl(0, 100%, 40%);">- dl_set_t200(bts, &lc->lapdm_dcch.datalink[DL_SAPI3], t200_dcch_sapi3);</span><br><span style="color: hsl(0, 100%, 40%);">- dl_set_t200(bts, &lc->lapdm_acch.datalink[DL_SAPI0], t200_acch);</span><br><span style="color: hsl(0, 100%, 40%);">- dl_set_t200(bts, &lc->lapdm_acch.datalink[DL_SAPI3], t200_acch_sapi3);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* 3GPP TS 52.021 ยง8.11.1 Get Attributes has been received */</span><br><span> static int oml_rx_get_attr(struct gsm_bts *bts, struct msgb *msg)</span><br><span> {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/14340">change 14340</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bts/+/14340"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0e814fbae13e0feddd148c47255dcc38cb718f48 </div>
<div style="display:none"> Gerrit-Change-Number: 14340 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>