<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24786">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
neels: Looks good to me, approved
daniel: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Support SDCCH8 in osmo dyn ts<br><br>This feature signals support to configure Osmocom Dynamic Timeslot type<br>as SDCCH8, on top of historically supported TCH/H and TCH/F.<br>The idea is that when unneeded, the TS is configured as PDCH, and as<br>soon as there's need for an SDCCH and there's none available, the TS is<br>dynamically reconfigured to SDCCH8. Once all logical channels in the<br>dynamic TS are released and hence becomes free, the BSC will reconfigure<br>it to PDCH.<br><br>Related: SYS#5309<br>Depends: libosmocore.git Change-Id Ifc0ca8916bd3e93e5a60a7dd7391d2588fdb5532<br>Change-Id: I29ac8b90168dba3ac309daeb0b6cfdbbcb8e9172<br>---<br>M src/osmo-bsc/gsm_data.c<br>M src/osmo-bsc/lchan_select.c<br>M src/osmo-bsc/timeslot_fsm.c<br>3 files changed, 12 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index 30590fb..7140ad7 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -792,6 +792,8 @@</span><br><span> return GSM_PCHAN_TCH_F;</span><br><span> case GSM_LCHAN_TCH_H:</span><br><span> return GSM_PCHAN_TCH_H;</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_LCHAN_SDCCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ return GSM_PCHAN_SDCCH8_SACCH8C;</span><br><span> case GSM_LCHAN_NONE:</span><br><span> case GSM_LCHAN_PDTCH:</span><br><span> /* TODO: so far lchan->type is NONE in PDCH mode. PDTCH is only</span><br><span>@@ -837,6 +839,7 @@</span><br><span> case GSM_PCHAN_TCH_F:</span><br><span> case GSM_PCHAN_TCH_H:</span><br><span> case GSM_PCHAN_PDCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PCHAN_SDCCH8_SACCH8C:</span><br><span> return true;</span><br><span> default:</span><br><span> return false;</span><br><span>@@ -909,6 +912,7 @@</span><br><span> case GSM_LCHAN_TCH_F:</span><br><span> case GSM_LCHAN_TCH_H:</span><br><span> case GSM_LCHAN_PDTCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_LCHAN_SDCCH:</span><br><span> return true;</span><br><span> default:</span><br><span> return false;</span><br><span>diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c</span><br><span>index 5e9d800..efa2ff2 100644</span><br><span>--- a/src/osmo-bsc/lchan_select.c</span><br><span>+++ b/src/osmo-bsc/lchan_select.c</span><br><span>@@ -216,6 +216,12 @@</span><br><span> lchan = _lc_find_bts(bts, second, log);</span><br><span> if (lchan == NULL)</span><br><span> lchan = _lc_find_bts(bts, second_cbch, log);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* No dedicated SDCCH available -- try fully dynamic</span><br><span style="color: hsl(120, 100%, 40%);">+ * TCH/F_TCH/H_SDCCH8_PDCH if BTS supports it: */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan == NULL && osmo_bts_has_feature(&bts->features, BTS_FEAT_DYN_TS_SDCCH8))</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan = _lc_dyn_find_bts(bts,</span><br><span style="color: hsl(120, 100%, 40%);">+ GSM_PCHAN_OSMO_DYN,</span><br><span style="color: hsl(120, 100%, 40%);">+ GSM_PCHAN_SDCCH8_SACCH8C, log);</span><br><span> break;</span><br><span> case GSM_LCHAN_TCH_F:</span><br><span> lchan = _lc_find_bts(bts, GSM_PCHAN_TCH_F, log);</span><br><span>diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c</span><br><span>index 2664245..adca31d 100644</span><br><span>--- a/src/osmo-bsc/timeslot_fsm.c</span><br><span>+++ b/src/osmo-bsc/timeslot_fsm.c</span><br><span>@@ -86,6 +86,8 @@</span><br><span> </span><br><span> switch (ts->pchan_on_init) {</span><br><span> case GSM_PCHAN_OSMO_DYN:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->type == GSM_LCHAN_SDCCH)</span><br><span style="color: hsl(120, 100%, 40%);">+ return LCHAN_NEEDS_PCHAN_CHANGE;</span><br><span> if (lchan->type == GSM_LCHAN_TCH_H)</span><br><span> return LCHAN_NEEDS_PCHAN_CHANGE;</span><br><span> /* fall thru */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24786">change 24786</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/+/24786"/><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: I29ac8b90168dba3ac309daeb0b6cfdbbcb8e9172 </div>
<div style="display:none"> Gerrit-Change-Number: 24786 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>