<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24329">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[VAMOS] l1sap_chan_act(): handle Osmocom specific TSC IE<br><br>This is an Osmocom specific RSL IE that, if present, takes<br>precedence over the values indicated via the A-bis/OML.<br><br>Change-Id: I717e5b2a6ca5b4faeaab9cae4bb971907945871b<br>Related: SYS#4895, OS#4941<br>---<br>M src/common/rsl.c<br>1 file changed, 33 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index bb53aa5..516e609 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -134,6 +134,16 @@</span><br><span> case RSL_CMOD_CRT_TCH_Bm:</span><br><span> case RSL_CMOD_CRT_TCH_Lm:</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case RSL_CMOD_CRT_OSMO_TCH_VAMOS_Bm:</span><br><span style="color: hsl(120, 100%, 40%);">+ case RSL_CMOD_CRT_OSMO_TCH_VAMOS_Lm:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Make sure that Osmocom specific TSC IE is present */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!TLVP_PRES_LEN(tp, RSL_IE_OSMO_TRAINING_SEQUENCE, 2)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DRSL, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Training Sequence IE is not present\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ *cause = RSL_ERR_MAND_IE_ERROR;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENODEV;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Channel Mode IE contains "</span><br><span> "unknown 'Channel rate and type' value 0x%02x\n",</span><br><span>@@ -265,6 +275,24 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Handle Osmocom specific TSC IE */</span><br><span style="color: hsl(120, 100%, 40%);">+static int rsl_handle_osmo_tsc_ie(struct gsm_lchan *lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct tlv_parsed *tp,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *cause)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Osmocom specific IE indicating Training Sequence Code and Set */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (TLVP_PRES_LEN(tp, RSL_IE_OSMO_TRAINING_SEQUENCE, 2)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *ie = TLVP_VAL(tp, RSL_IE_OSMO_TRAINING_SEQUENCE);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ts->tsc_set = ie[0] & 0x03; /* Range: 0..3 */</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ts->tsc = ie[1] & 0x07; /* Range: 0..7 */</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ts->tsc = lchan->ts->tsc_oml;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ts->tsc_set = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</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> </span><br><span> /*</span><br><span> * support</span><br><span>@@ -1482,6 +1510,8 @@</span><br><span> return rsl_tx_chan_act_nack(lchan, cause);</span><br><span> if (rsl_handle_chan_ident_ie(lchan, &tp, &cause) != 0)</span><br><span> return rsl_tx_chan_act_nack(lchan, cause);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rsl_handle_osmo_tsc_ie(lchan, &tp, &cause) != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rsl_tx_chan_act_nack(lchan, cause);</span><br><span> }</span><br><span> </span><br><span> /* 9.3.7 Encryption Information */</span><br><span>@@ -1996,6 +2026,9 @@</span><br><span> /* 9.3.5 Channel Identification */</span><br><span> if (rsl_handle_chan_ident_ie(lchan, &tp, &cause) != 0)</span><br><span> return rsl_tx_mode_modif_nack(lchan, cause);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Osmocom specific TSC IE for VAMOS */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rsl_handle_osmo_tsc_ie(lchan, &tp, &cause) != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rsl_tx_mode_modif_nack(lchan, cause);</span><br><span> </span><br><span> /* 9.3.7 Encryption Information */</span><br><span> if (TLVP_PRESENT(&tp, RSL_IE_ENCR_INFO)) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24329">change 24329</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/+/24329"/><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: I717e5b2a6ca5b4faeaab9cae4bb971907945871b </div>
<div style="display:none"> Gerrit-Change-Number: 24329 </div>
<div style="display:none"> Gerrit-PatchSet: 9 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>