<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14204">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">L1CTL: Add support for CCCH_MODE_COMBINED_CBCH<br><br>In OsmocomBB/trxcon Change-Id Ia94ebf22a2ec439dfe1f31d703b832ae57b48ef2<br>we introduced a new mode CCCH_MODE_COMBINED_CBCH to indicate that the<br>channel combination is a CCCH+SDCCH/4 with one SDCCH stolen for CBCH.<br><br>Let's make sure we actually use that mode in our CBCH related tests<br><br>Change-Id: I27ee2c81bec7175c1ea09d4f3f6037f2866fe242<br>---<br>M bts/BTS_Tests.ttcn<br>M bts/BTS_Tests_SMSCB.ttcn<br>M library/L1CTL_Types.ttcn<br>3 files changed, 5 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn</span><br><span>index 1c20657..47c16c2 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -451,8 +451,8 @@</span><br><span>  }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-friend function f_l1_tune(L1CTL_PT L1CTL) {</span><br><span style="color: hsl(0, 100%, 40%);">-   f_L1CTL_FBSB(L1CTL, { false, mp_trx0_arfcn }, CCCH_MODE_COMBINED, mp_rxlev_exp);</span><br><span style="color: hsl(120, 100%, 40%);">+friend function f_l1_tune(L1CTL_PT L1CTL, L1ctlCcchMode ccch_mode := CCCH_MODE_COMBINED) {</span><br><span style="color: hsl(120, 100%, 40%);">+  f_L1CTL_FBSB(L1CTL, { false, mp_trx0_arfcn }, ccch_mode, mp_rxlev_exp);</span><br><span> }</span><br><span> </span><br><span> private function f_trxc_connect() runs on ConnHdlr {</span><br><span>diff --git a/bts/BTS_Tests_SMSCB.ttcn b/bts/BTS_Tests_SMSCB.ttcn</span><br><span>index 0712a90..c02522b 100644</span><br><span>--- a/bts/BTS_Tests_SMSCB.ttcn</span><br><span>+++ b/bts/BTS_Tests_SMSCB.ttcn</span><br><span>@@ -216,7 +216,7 @@</span><br><span>  f_init(testcasename());</span><br><span> </span><br><span>  f_init_l1ctl();</span><br><span style="color: hsl(0, 100%, 40%);">- f_l1_tune(L1CTL);</span><br><span style="color: hsl(120, 100%, 40%);">+     f_l1_tune(L1CTL, ccch_mode := CCCH_MODE_COMBINED_CBCH);</span><br><span>      /* FIXME: switch to dedicated mode for SDCCH/8 */</span><br><span> </span><br><span>        /* send SMSCB[s] via RSL */</span><br><span>diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn</span><br><span>index 69e7dbe..87849f5 100644</span><br><span>--- a/library/L1CTL_Types.ttcn</span><br><span>+++ b/library/L1CTL_Types.ttcn</span><br><span>@@ -62,7 +62,8 @@</span><br><span>         type enumerated L1ctlCcchMode {</span><br><span>              CCCH_MODE_NONE (0),</span><br><span>          CCCH_MODE_NON_COMBINED,</span><br><span style="color: hsl(0, 100%, 40%);">-         CCCH_MODE_COMBINED</span><br><span style="color: hsl(120, 100%, 40%);">+            CCCH_MODE_COMBINED,</span><br><span style="color: hsl(120, 100%, 40%);">+           CCCH_MODE_COMBINED_CBCH</span><br><span>      } with { variant "FIELDLENGTH(8)" };</span><br><span> </span><br><span>   type enumerated L1ctlNeighMode {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14204">change 14204</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/14204"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I27ee2c81bec7175c1ea09d4f3f6037f2866fe242 </div>
<div style="display:none"> Gerrit-Change-Number: 14204 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>