<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24484">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[VAMOS] oml_rx_set_chan_attr(): clarify NM_ATT_CHAN_COMB handling<br><br>Change-Id: I8a4aace97515ca59ac4c6b5d50a9ee242edfe409<br>---<br>M src/common/oml.c<br>1 file changed, 8 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/84/24484/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/oml.c b/src/common/oml.c</span><br><span>index 7bf89c5..cf83903 100644</span><br><span>--- a/src/common/oml.c</span><br><span>+++ b/src/common/oml.c</span><br><span>@@ -789,9 +789,12 @@</span><br><span>   return bts_model_apply_oml(trx->bts, msg, tp_merged, NM_OC_RADIO_CARRIER, trx);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int conf_lchans(struct gsm_bts_trx_ts *ts)</span><br><span style="color: hsl(120, 100%, 40%);">+static int handle_chan_comb(struct gsm_bts_trx_ts *ts, const uint8_t comb)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   enum gsm_phys_chan_config pchan = ts->pchan;</span><br><span style="color: hsl(120, 100%, 40%);">+       enum gsm_phys_chan_config pchan;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    pchan = abis_nm_pchan4chcomb(comb);</span><br><span style="color: hsl(120, 100%, 40%);">+   ts->pchan = pchan;</span><br><span> </span><br><span>    /* RSL_MT_IPAC_PDCH_ACT style dyn PDCH */</span><br><span>    if (pchan == GSM_PCHAN_TCH_F_PDCH)</span><br><span>@@ -946,12 +949,10 @@</span><br><span> </span><br><span>       /* 9.4.13 Channel Combination */</span><br><span>     if (TLVP_PRES_LEN(&tp, NM_ATT_CHAN_COMB, 1)) {</span><br><span style="color: hsl(0, 100%, 40%);">-              uint8_t comb = *TLVP_VAL(&tp, NM_ATT_CHAN_COMB);</span><br><span style="color: hsl(0, 100%, 40%);">-            ts->pchan = abis_nm_pchan4chcomb(comb);</span><br><span style="color: hsl(0, 100%, 40%);">-              rc = conf_lchans(ts);</span><br><span style="color: hsl(0, 100%, 40%);">-           if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+              const uint8_t comb = *TLVP_VAL(&tp, NM_ATT_CHAN_COMB);</span><br><span style="color: hsl(120, 100%, 40%);">+            if ((rc = handle_chan_comb(ts, comb)) != 0) {</span><br><span>                        LOGPFOH(DOML, LOGL_ERROR, foh, "SET CHAN ATTR: invalid Chan Comb 0x%x"</span><br><span style="color: hsl(0, 100%, 40%);">-                                " (pchan=%s, conf_lchans()->%d)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                              " (pchan=%s, handle_chan_comb() returns %d)\n",</span><br><span>                            comb, gsm_pchan_name(ts->pchan), rc);</span><br><span>                     talloc_free(tp_merged);</span><br><span>                      /* Send NACK */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24484">change 24484</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/+/24484"/><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: I8a4aace97515ca59ac4c6b5d50a9ee242edfe409 </div>
<div style="display:none"> Gerrit-Change-Number: 24484 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>