<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24626">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add lchan->vamos.is_secondary flag<br><br>VAMOS shadow lchans do not exist yet, but add the indicator flag that<br>tells whether an lchan pointer is a primary or a shadow lchan.<br><br>In Mode Modify: based on the flag, choose a different default TSC Set<br>for shadow lchans; do BTS type compat checking for shadow lchan use.<br><br>Actual lchans with vamos.is_secondary == true will be introduced by<br>patch: 'add VAMOS secondary lchans to timeslot struct'<br>I928af99498bba488d317693f3144d4fccbbe9af3<br><br>Change-Id: I4072fc7703c592df699fe8e27c02df09acde0909<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/lchan_fsm.c<br>2 files changed, 9 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/26/24626/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 7e90579..0670232 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -745,6 +745,10 @@</span><br><span>    uint8_t tsc;</span><br><span> </span><br><span>     struct {</span><br><span style="color: hsl(120, 100%, 40%);">+              /* Whether this lchan represents a secondary "shadow" lchan to multiplex a second MS onto a primary</span><br><span style="color: hsl(120, 100%, 40%);">+          * "normal" lchan */</span><br><span style="color: hsl(120, 100%, 40%);">+                bool is_secondary;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>                 /* Whether this lchan is activated/modified into a mode that allows VAMOS multiplexing at this moment */</span><br><span>             bool enabled;</span><br><span>        } vamos;</span><br><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index 0613fcb..b486b40 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -382,7 +382,8 @@</span><br><span> {</span><br><span>     OSMO_ASSERT(lchan && info);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (info->vamos && !osmo_bts_has_feature(&lchan->ts->trx->bts->features, BTS_FEAT_VAMOS)) {</span><br><span style="color: hsl(120, 100%, 40%);">+        if ((info->vamos || lchan->vamos.is_secondary)</span><br><span style="color: hsl(120, 100%, 40%);">+      && !osmo_bts_has_feature(&lchan->ts->trx->bts->features, BTS_FEAT_VAMOS)) {</span><br><span>              lchan->last_error = talloc_strdup(lchan->ts->trx, "VAMOS related Channel Mode Modify requested,"</span><br><span>                                            " but BTS does not support VAMOS");</span><br><span>              LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span>@@ -1145,10 +1146,12 @@</span><br><span>                       }</span><br><span>            }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+         /* If enabling VAMOS mode and no specific TSC Set was selected, make sure to select a sane TSC Set by</span><br><span style="color: hsl(120, 100%, 40%);">+          * default: Set 1 for the primary and Set 2 for the shadow lchan. For non-VAMOS lchans, TSC Set 1. */</span><br><span>                if (lchan->modify.info.tsc_set > 0)</span><br><span>                    lchan->modify.tsc_set = lchan->modify.info.tsc_set;</span><br><span>            else</span><br><span style="color: hsl(0, 100%, 40%);">-                    lchan->modify.tsc_set = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+                 lchan->modify.tsc_set = lchan->vamos.is_secondary ? 2 : 1;</span><br><span> </span><br><span>                 /* Use the TSC provided in the modification request, if any. Otherwise use the timeslot's configured</span><br><span>              * TSC. */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24626">change 24626</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-bsc/+/24626"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4072fc7703c592df699fe8e27c02df09acde0909 </div>
<div style="display:none"> Gerrit-Change-Number: 24626 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>