laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/33006 )
Change subject: trxcon/l1sched: do not align Tx burst transmission
......................................................................
trxcon/l1sched: do not align Tx burst transmission
This is no longer needed thanks to recent patch b0be904b.
Change-Id: Ia397cbe16f719729a814b7ef0b7035c7fe8ba165
Related: b0be904b "trxcon: do not call l1sched_prim_dequeue() at ul_bid != 0"
---
M src/host/trxcon/src/sched_lchan_pdtch.c
M src/host/trxcon/src/sched_lchan_tchf.c
M src/host/trxcon/src/sched_lchan_tchh.c
M src/host/trxcon/src/sched_lchan_xcch.c
4 files changed, 18 insertions(+), 25 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/host/trxcon/src/sched_lchan_pdtch.c
b/src/host/trxcon/src/sched_lchan_pdtch.c
index b6c3b4c..4b5ffdf 100644
--- a/src/host/trxcon/src/sched_lchan_pdtch.c
+++ b/src/host/trxcon/src/sched_lchan_pdtch.c
@@ -114,13 +114,8 @@
mask = &lchan->tx_burst_mask;
bursts_p = lchan->tx_bursts;
- if (br->bid > 0) {
- /* If we have encoded bursts */
- if (*mask)
- goto send_burst;
- else
- return 0;
- }
+ if (br->bid > 0)
+ goto send_burst;
/* Encode payload */
rc = gsm0503_pdtch_encode(bursts_p, msgb_l2(lchan->prim),
msgb_l2len(lchan->prim));
diff --git a/src/host/trxcon/src/sched_lchan_tchf.c
b/src/host/trxcon/src/sched_lchan_tchf.c
index f38c82a..691ad5a 100644
--- a/src/host/trxcon/src/sched_lchan_tchf.c
+++ b/src/host/trxcon/src/sched_lchan_tchf.c
@@ -224,13 +224,8 @@
mask = &lchan->tx_burst_mask;
bursts_p = lchan->tx_bursts;
- /* If we have encoded bursts */
- if (*mask)
- goto send_burst;
-
- /* Wait until a first burst in period */
if (br->bid > 0)
- return 0;
+ goto send_burst;
/* Shift buffer by 4 bursts back for interleaving */
memcpy(bursts_p, bursts_p + 464, 464);
diff --git a/src/host/trxcon/src/sched_lchan_tchh.c
b/src/host/trxcon/src/sched_lchan_tchh.c
index f3b7877..bff9b1b 100644
--- a/src/host/trxcon/src/sched_lchan_tchh.c
+++ b/src/host/trxcon/src/sched_lchan_tchh.c
@@ -431,12 +431,8 @@
mask = &lchan->tx_burst_mask;
bursts_p = lchan->tx_bursts;
- if (br->bid > 0) {
- /* Align to the first burst */
- if (*mask == 0x00)
- return 0;
+ if (br->bid > 0)
goto send_burst;
- }
if (*mask == 0x00) {
/* Align transmission of the first FACCH/H frame */
diff --git a/src/host/trxcon/src/sched_lchan_xcch.c
b/src/host/trxcon/src/sched_lchan_xcch.c
index b246a17..f76d518 100644
--- a/src/host/trxcon/src/sched_lchan_xcch.c
+++ b/src/host/trxcon/src/sched_lchan_xcch.c
@@ -110,13 +110,8 @@
mask = &lchan->tx_burst_mask;
bursts_p = lchan->tx_bursts;
- if (br->bid > 0) {
- /* If we have encoded bursts */
- if (*mask)
- goto send_burst;
- else
- return 0;
- }
+ if (br->bid > 0)
+ goto send_burst;
/* Check the prim payload length */
if (msgb_l2len(lchan->prim) != GSM_MACBLOCK_LEN) {
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33006
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Ia397cbe16f719729a814b7ef0b7035c7fe8ba165
Gerrit-Change-Number: 33006
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
