Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/12699 )
Change subject: scheduler_trx: Fix erroneous multiply-by-four
......................................................................
scheduler_trx: Fix erroneous multiply-by-four
Commit acefd0586e5d463b2e7a6a039131994bc12573fc introduced the "toa256"
resolution change.
Before the change, _sched_compose_ph_data_ind() used quarter-bits as
units, so multiplying the old "toa" value by four made sense.
However, after said change, the value is in 1/256th of bits, and hence
we need to report the toa256 value without any multiply-by-four.
Change-Id: I9f980236ea1cd635cb229290e187747cc8c86d8d
Related: OS#2977
---
M src/osmo-bts-trx/scheduler_trx.c
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
dexter: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c
index fa3aed2..1b0ba73 100644
--- a/src/osmo-bts-trx/scheduler_trx.c
+++ b/src/osmo-bts-trx/scheduler_trx.c
@@ -846,7 +846,7 @@
ber10k = compute_ber10k(n_bits_total, n_errors);
return _sched_compose_ph_data_ind(l1t, tn, *first_fn, chan, l2, l2_len,
*rssi_sum / *rssi_num,
- 4 * (*toa256_sum) / *toa_num, 0,
ber10k,
+ *toa256_sum / *toa_num, 0, ber10k,
PRES_INFO_UNKNOWN);
}
@@ -947,7 +947,7 @@
}
ber10k = compute_ber10k(n_bits_total, n_errors);
return _sched_compose_ph_data_ind(l1t, tn, (fn + GSM_HYPERFRAME - 3) %
GSM_HYPERFRAME, chan,
- l2, rc, *rssi_sum / *rssi_num, 4 * (*toa256_sum) / *toa_num, 0,
+ l2, rc, *rssi_sum / *rssi_num, *toa256_sum / *toa_num, 0,
ber10k, PRES_INFO_BOTH);
}
@@ -1071,7 +1071,7 @@
if (rc == GSM_MACBLOCK_LEN) {
uint16_t ber10k = compute_ber10k(n_bits_total, n_errors);
_sched_compose_ph_data_ind(l1t, tn, (fn + GSM_HYPERFRAME - 7) %
GSM_HYPERFRAME, chan,
- tch_data + amr, GSM_MACBLOCK_LEN, rssi, 4 * toa256, 0,
+ tch_data + amr, GSM_MACBLOCK_LEN, rssi, toa256, 0,
ber10k, PRES_INFO_UNKNOWN);
bfi:
if (rsl_cmode == RSL_CMOD_SPD_SPEECH) {
@@ -1263,7 +1263,7 @@
uint16_t ber10k = compute_ber10k(n_bits_total, n_errors);
_sched_compose_ph_data_ind(l1t, tn,
(fn + GSM_HYPERFRAME - 10 - ((fn % 26) >= 19)) %
GSM_HYPERFRAME, chan,
- tch_data + amr, GSM_MACBLOCK_LEN, rssi, toa256/64, 0,
+ tch_data + amr, GSM_MACBLOCK_LEN, rssi, toa256, 0,
ber10k, PRES_INFO_UNKNOWN);
bfi:
if (rsl_cmode == RSL_CMOD_SPD_SPEECH) {
--
To view, visit https://gerrit.osmocom.org/12699
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f980236ea1cd635cb229290e187747cc8c86d8d
Gerrit-Change-Number: 12699
Gerrit-PatchSet: 2
Gerrit-Owner: Harald Welte <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: dexter <[email protected]>
