<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10457">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/scheduler: fix: properly generate BFI for TCH/H<br><br>When relying on GSM 04.08 channel mode (GSM48_CMODE_*), one should<br>distinguish between Bm (full rate) and Lm (half rate) channels.<br><br>This change prevents the scheduler from generating TCH/F BFI<br>instead of TCH/H BFI on the corresponding channels.<br><br>Change-Id: I4547aa7f6d38637692fef8a0122e85fb52039a46<br>---<br>M src/host/trxcon/sched_lchan_common.c<br>1 file changed, 10 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/sched_lchan_common.c b/src/host/trxcon/sched_lchan_common.c</span><br><span>index 03cdc67..76a32fe 100644</span><br><span>--- a/src/host/trxcon/sched_lchan_common.c</span><br><span>+++ b/src/host/trxcon/sched_lchan_common.c</span><br><span>@@ -151,10 +151,16 @@</span><br><span> </span><br><span>  switch (lchan->tch_mode) {</span><br><span>        case GSM48_CMODE_SIGN:</span><br><span style="color: hsl(0, 100%, 40%);">-  case GSM48_CMODE_SPEECH_V1: /* Full Rate */</span><br><span style="color: hsl(0, 100%, 40%);">-             memset(l2, 0x00, GSM_FR_BYTES);</span><br><span style="color: hsl(0, 100%, 40%);">-         l2[0] = 0xd0;</span><br><span style="color: hsl(0, 100%, 40%);">-           return GSM_FR_BYTES;</span><br><span style="color: hsl(120, 100%, 40%);">+  case GSM48_CMODE_SPEECH_V1:</span><br><span style="color: hsl(120, 100%, 40%);">+           if (lchan->type == TRXC_TCHF) { /* Full Rate */</span><br><span style="color: hsl(120, 100%, 40%);">+                    memset(l2, 0x00, GSM_FR_BYTES);</span><br><span style="color: hsl(120, 100%, 40%);">+                       l2[0] = 0xd0;</span><br><span style="color: hsl(120, 100%, 40%);">+                 return GSM_FR_BYTES;</span><br><span style="color: hsl(120, 100%, 40%);">+          } else { /* Half Rate */</span><br><span style="color: hsl(120, 100%, 40%);">+                      memset(l2 + 1, 0x00, GSM_HR_BYTES);</span><br><span style="color: hsl(120, 100%, 40%);">+                   l2[0] = 0x70; /* F = 0, FT = 111 */</span><br><span style="color: hsl(120, 100%, 40%);">+                   return GSM_HR_BYTES + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+              }</span><br><span>    case GSM48_CMODE_SPEECH_EFR: /* Enhanced Full Rate */</span><br><span>                memset(l2, 0x00, GSM_EFR_BYTES);</span><br><span>             l2[0] = 0xc0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10457">change 10457</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/10457"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I4547aa7f6d38637692fef8a0122e85fb52039a46 </div>
<div style="display:none"> Gerrit-Change-Number: 10457 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>