<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25620">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">scheduler: Fix lqual_cb not populated for TCH.ind<br><br>Change-Id: I79c83b974149b1e94155bc61172b57de8003891e<br>---<br>M include/osmo-bts/scheduler_backend.h<br>M src/common/scheduler.c<br>M src/osmo-bts-trx/sched_lchan_tchf.c<br>M src/osmo-bts-trx/sched_lchan_tchh.c<br>4 files changed, 10 insertions(+), 5 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/20/25620/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/scheduler_backend.h b/include/osmo-bts/scheduler_backend.h</span><br><span>index 50ba822..3b1388f 100644</span><br><span>--- a/include/osmo-bts/scheduler_backend.h</span><br><span>+++ b/include/osmo-bts/scheduler_backend.h</span><br><span>@@ -51,7 +51,7 @@</span><br><span> int _sched_compose_tch_ind(struct l1sched_ts *l1ts, uint32_t fn,</span><br><span> enum trx_chan_type chan, uint8_t *tch, uint8_t tch_len,</span><br><span> int16_t ta_offs_256bits, uint16_t ber10k, float rssi,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t is_sub);</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t link_qual_cb, uint8_t is_sub);</span><br><span> </span><br><span> int tx_fcch_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br);</span><br><span> int tx_sch_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br);</span><br><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index 0826eda..4579f2f 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -804,7 +804,7 @@</span><br><span> int _sched_compose_tch_ind(struct l1sched_ts *l1ts, uint32_t fn,</span><br><span> enum trx_chan_type chan, uint8_t *tch, uint8_t tch_len,</span><br><span> int16_t ta_offs_256bits, uint16_t ber10k, float rssi,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t is_sub)</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t link_qual_cb, uint8_t is_sub)</span><br><span> {</span><br><span> struct msgb *msg;</span><br><span> struct osmo_phsap_prim *l1sap;</span><br><span>@@ -825,6 +825,7 @@</span><br><span> l1sap->u.tch.rssi = (int8_t) (rssi);</span><br><span> l1sap->u.tch.ber10k = ber10k;</span><br><span> l1sap->u.tch.ta_offs_256bits = ta_offs_256bits;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1sap->u.tch.lqual_cb = link_qual_cb;</span><br><span> l1sap->u.tch.is_sub = is_sub & 1;</span><br><span> </span><br><span> msg->l2h = msgb_put(msg, tch_len);</span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>index 85fe207..1fcc27f 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>@@ -304,7 +304,9 @@</span><br><span> return _sched_compose_tch_ind(l1ts, fn_begin, bi->chan, tch_data, rc,</span><br><span> /* FIXME: what should we use for BFI here? */</span><br><span> bfi_flag ? bi->toa256 : meas_avg.toa256, ber10k,</span><br><span style="color: hsl(0, 100%, 40%);">- bfi_flag ? bi->rssi : meas_avg.rssi, is_sub);</span><br><span style="color: hsl(120, 100%, 40%);">+ bfi_flag ? bi->rssi : meas_avg.rssi,</span><br><span style="color: hsl(120, 100%, 40%);">+ bfi_flag ? bi->ci_cb : meas_avg.ci_cb,</span><br><span style="color: hsl(120, 100%, 40%);">+ is_sub);</span><br><span> }</span><br><span> </span><br><span> /* common section for generation of TCH bursts (TCH/H and TCH/F).</span><br><span>@@ -366,7 +368,7 @@</span><br><span> /* Note: RSSI/ToA256 is set to 0 to indicate to the higher</span><br><span> * layers that this is a faked tch_ind */</span><br><span> _sched_compose_tch_ind(l1ts, br->fn, br->chan,</span><br><span style="color: hsl(0, 100%, 40%);">- tch_data, len, 0, 10000, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ tch_data, len, 0, 10000, 0, 0, 0);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>index a1ed996..314430e 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>@@ -375,7 +375,9 @@</span><br><span> return _sched_compose_tch_ind(l1ts, fn_begin, bi->chan, tch_data, rc,</span><br><span> /* FIXME: what should we use for BFI here? */</span><br><span> bfi_flag ? bi->toa256 : meas_avg.toa256, ber10k,</span><br><span style="color: hsl(0, 100%, 40%);">- bfi_flag ? bi->rssi : meas_avg.rssi, is_sub);</span><br><span style="color: hsl(120, 100%, 40%);">+ bfi_flag ? bi->rssi : meas_avg.rssi,</span><br><span style="color: hsl(120, 100%, 40%);">+ bfi_flag ? bi->ci_cb : meas_avg.ci_cb,</span><br><span style="color: hsl(120, 100%, 40%);">+ is_sub);</span><br><span> }</span><br><span> </span><br><span> /* common section for generation of TCH bursts (TCH/H and TCH/F).</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25620">change 25620</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/+/25620"/><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: I79c83b974149b1e94155bc61172b57de8003891e </div>
<div style="display:none"> Gerrit-Change-Number: 25620 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>