Change in osmocom-bb[master]: trxcon/scheduler: fix: properly generate BFI for TCH/H

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/10457 )

Change subject: trxcon/scheduler: fix: properly generate BFI for TCH/H
......................................................................

trxcon/scheduler: fix: properly generate BFI for TCH/H

When relying on GSM 04.08 channel mode (GSM48_CMODE_*), one should
distinguish between Bm (full rate) and Lm (half rate) channels.

This change prevents the scheduler from generating TCH/F BFI
instead of TCH/H BFI on the corresponding channels.

Change-Id: I4547aa7f6d38637692fef8a0122e85fb52039a46
---
M src/host/trxcon/sched_lchan_common.c
1 file changed, 10 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/sched_lchan_common.c
index 03cdc67..76a32fe 100644
--- a/src/host/trxcon/sched_lchan_common.c
+++ b/src/host/trxcon/sched_lchan_common.c
@@ -151,10 +151,16 @@
 
 	switch (lchan->tch_mode) {
 	case GSM48_CMODE_SIGN:
-	case GSM48_CMODE_SPEECH_V1: /* Full Rate */
-		memset(l2, 0x00, GSM_FR_BYTES);
-		l2[0] = 0xd0;
-		return GSM_FR_BYTES;
+	case GSM48_CMODE_SPEECH_V1:
+		if (lchan->type == TRXC_TCHF) { /* Full Rate */
+			memset(l2, 0x00, GSM_FR_BYTES);
+			l2[0] = 0xd0;
+			return GSM_FR_BYTES;
+		} else { /* Half Rate */
+			memset(l2 + 1, 0x00, GSM_HR_BYTES);
+			l2[0] = 0x70; /* F = 0, FT = 111 */
+			return GSM_HR_BYTES + 1;
+		}
 	case GSM48_CMODE_SPEECH_EFR: /* Enhanced Full Rate */
 		memset(l2, 0x00, GSM_EFR_BYTES);
 		l2[0] = 0xc0;

-- 
To view, visit https://gerrit.osmocom.org/10457
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I4547aa7f6d38637692fef8a0122e85fb52039a46
Gerrit-Change-Number: 10457
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180815/0e973984/attachment.htm>