Change in osmo-bts[master]: scheduler: Fix lqual_cb not populated for TCH.ind

[pespin]

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25620 )


Change subject: scheduler: Fix lqual_cb not populated for TCH.ind
......................................................................

scheduler: Fix lqual_cb not populated for TCH.ind

Change-Id: I79c83b974149b1e94155bc61172b57de8003891e
---
M include/osmo-bts/scheduler_backend.h
M src/common/scheduler.c
M src/osmo-bts-trx/sched_lchan_tchf.c
M src/osmo-bts-trx/sched_lchan_tchh.c
4 files changed, 10 insertions(+), 5 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/20/25620/1

diff --git a/include/osmo-bts/scheduler_backend.h b/include/osmo-bts/scheduler_backend.h
index 50ba822..3b1388f 100644
--- a/include/osmo-bts/scheduler_backend.h
+++ b/include/osmo-bts/scheduler_backend.h
@@ -51,7 +51,7 @@
 int _sched_compose_tch_ind(struct l1sched_ts *l1ts, uint32_t fn,
 			   enum trx_chan_type chan, uint8_t *tch, uint8_t tch_len,
 			   int16_t ta_offs_256bits, uint16_t ber10k, float rssi,
-			   uint8_t is_sub);
+			   int16_t link_qual_cb, uint8_t is_sub);
 
 int tx_fcch_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br);
 int tx_sch_fn(struct l1sched_ts *l1ts, struct trx_dl_burst_req *br);
diff --git a/src/common/scheduler.c b/src/common/scheduler.c
index 0826eda..4579f2f 100644
--- a/src/common/scheduler.c
+++ b/src/common/scheduler.c
@@ -804,7 +804,7 @@
 int _sched_compose_tch_ind(struct l1sched_ts *l1ts, uint32_t fn,
 			   enum trx_chan_type chan, uint8_t *tch, uint8_t tch_len,
 			   int16_t ta_offs_256bits, uint16_t ber10k, float rssi,
-			   uint8_t is_sub)
+			   int16_t link_qual_cb, uint8_t is_sub)
 {
 	struct msgb *msg;
 	struct osmo_phsap_prim *l1sap;
@@ -825,6 +825,7 @@
 	l1sap->u.tch.rssi = (int8_t) (rssi);
 	l1sap->u.tch.ber10k = ber10k;
 	l1sap->u.tch.ta_offs_256bits = ta_offs_256bits;
+	l1sap->u.tch.lqual_cb = link_qual_cb;
 	l1sap->u.tch.is_sub = is_sub & 1;
 
 	msg->l2h = msgb_put(msg, tch_len);
diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c
index 85fe207..1fcc27f 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -304,7 +304,9 @@
 	return _sched_compose_tch_ind(l1ts, fn_begin, bi->chan, tch_data, rc,
 				      /* FIXME: what should we use for BFI here? */
 				      bfi_flag ? bi->toa256 : meas_avg.toa256, ber10k,
-				      bfi_flag ? bi->rssi : meas_avg.rssi, is_sub);
+				      bfi_flag ? bi->rssi : meas_avg.rssi,
+				      bfi_flag ? bi->ci_cb : meas_avg.ci_cb,
+				      is_sub);
 }
 
 /* common section for generation of TCH bursts (TCH/H and TCH/F).
@@ -366,7 +368,7 @@
 			/* Note: RSSI/ToA256 is set to 0 to indicate to the higher
 			 * layers that this is a faked tch_ind */
 			_sched_compose_tch_ind(l1ts, br->fn, br->chan,
-					       tch_data, len, 0, 10000, 0, 0);
+					       tch_data, len, 0, 10000, 0, 0, 0);
 		}
 	}
 
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c
index a1ed996..314430e 100644
--- a/src/osmo-bts-trx/sched_lchan_tchh.c
+++ b/src/osmo-bts-trx/sched_lchan_tchh.c
@@ -375,7 +375,9 @@
 	return _sched_compose_tch_ind(l1ts, fn_begin, bi->chan, tch_data, rc,
 				      /* FIXME: what should we use for BFI here? */
 				      bfi_flag ? bi->toa256 : meas_avg.toa256, ber10k,
-				      bfi_flag ? bi->rssi : meas_avg.rssi, is_sub);
+				      bfi_flag ? bi->rssi : meas_avg.rssi,
+				      bfi_flag ? bi->ci_cb : meas_avg.ci_cb,
+				      is_sub);
 }
 
 /* common section for generation of TCH bursts (TCH/H and TCH/F).

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25620
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I79c83b974149b1e94155bc61172b57de8003891e
Gerrit-Change-Number: 25620
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210927/ad729c35/attachment.htm>