<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18117">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">om2k: Use the "from config" TS config to setup OM objects<br><br>During the configuration of the TS object through OML we must use<br>pchan_from_config since it's too early to use anything else.<br><br>Signed-off-by: Sylvain Munaut <tnt@246tNt.com><br>Change-Id: Iecdc911a79b66d8f3d746347710ad697cb288174<br>---<br>M src/osmo-bsc/abis_om2000.c<br>1 file changed, 3 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/abis_om2000.c b/src/osmo-bsc/abis_om2000.c</span><br><span>index 936fd67..b99fbc5 100644</span><br><span>--- a/src/osmo-bsc/abis_om2000.c</span><br><span>+++ b/src/osmo-bsc/abis_om2000.c</span><br><span>@@ -1375,7 +1375,7 @@</span><br><span>            * message for it. Rather fail completely right now: */</span><br><span>              return 0;</span><br><span>    }</span><br><span style="color: hsl(0, 100%, 40%);">-       return pchan2comb(ts->pchan_is);</span><br><span style="color: hsl(120, 100%, 40%);">+   return pchan2comb(ts->pchan_from_config);</span><br><span> }</span><br><span> </span><br><span> static int put_freq_list(uint8_t *buf, uint16_t arfcn)</span><br><span>@@ -1438,7 +1438,7 @@</span><br><span>      msgb_tv_put(msg, OM2K_DEI_EXT_RANGE, 0); /* Off */</span><br><span>   /* Optional: Interference Rejection Combining */</span><br><span>     msgb_tv_put(msg, OM2K_DEI_INTERF_REJ_COMB, 0x00);</span><br><span style="color: hsl(0, 100%, 40%);">-       switch (ts->pchan_is) {</span><br><span style="color: hsl(120, 100%, 40%);">+    switch (ts->pchan_from_config) {</span><br><span>  case GSM_PCHAN_CCCH:</span><br><span>                 msgb_tv_put(msg, OM2K_DEI_BA_PA_MFRMS, 0x06);</span><br><span>                msgb_tv_put(msg, OM2K_DEI_BS_AG_BKS_RES, 0x01);</span><br><span>@@ -1482,7 +1482,7 @@</span><br><span>              msgb_tv_fixed_put(msg, OM2K_DEI_ICM_BOUND_PARAMS,</span><br><span>                              sizeof(icm_bound_params), icm_bound_params);</span><br><span>               msgb_tv_put(msg, OM2K_DEI_TTA, 10); /* Timer for Time Alignment */</span><br><span style="color: hsl(0, 100%, 40%);">-              if (ts->pchan_is == GSM_PCHAN_TCH_H)</span><br><span style="color: hsl(120, 100%, 40%);">+               if (ts->pchan_from_config == GSM_PCHAN_TCH_H)</span><br><span>                     msgb_tv_put(msg, OM2K_DEI_ICM_CHAN_RATE, 1); /* TCH/H */</span><br><span>             else</span><br><span>                         msgb_tv_put(msg, OM2K_DEI_ICM_CHAN_RATE, 0); /* TCH/F */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18117">change 18117</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/+/18117"/><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: Iecdc911a79b66d8f3d746347710ad697cb288174 </div>
<div style="display:none"> Gerrit-Change-Number: 18117 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: tnt <tnt@246tNt.com> </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>