<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10415">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">send TCH/F fill frames in DTX mode (WIP)<br><br>Send DTX TCH fill frames according to GSM 05.08, section 8.3.<br><br>Change-Id: I7bff00b8cf41dc1b0e6e668173bebce23be0d253<br>Related: OS#1950<br>---<br>M src/common/l1sap.c<br>1 file changed, 64 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/l1sap.c b/src/common/l1sap.c</span><br><span>index b8cec0e..5cc303b 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -666,6 +666,31 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Determine whether we need to send a DTX TCH fill frame according to GSM 05.08, section 8.3. */</span><br><span style="color: hsl(120, 100%, 40%);">+static bool is_required_tchf_fill_frame_dtx(uint32_t fn, struct gsm_time *g_time) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* On TCHF this subset of TDMA frames (mod 104) is always used for transmission during DTX: */</span><br><span style="color: hsl(120, 100%, 40%);">+ const int tchf_required_fn_dtx[] = { 52, 53, 54, 55, 56, 57, 58, 59 };</span><br><span style="color: hsl(120, 100%, 40%);">+ /* And the subset of those frames which corresponds to a TCH/F block boundary,</span><br><span style="color: hsl(120, 100%, 40%);">+ * which is the level at which L1SAP operates: */</span><br><span style="color: hsl(120, 100%, 40%);">+ const int tchf_required_block_fn_dtx[] = { 52, 56 };</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ARRAY_SIZE(tchf_required_block_fn_dtx); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (fn % 104 == tchf_required_block_fn_dtx[i])</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* We should only see block-level frame numbers here. Log a warning otherwise. */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ARRAY_SIZE(tchf_required_fn_dtx); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (fn % 104 == tchf_required_fn_dtx[i])</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPGT(DL1P, LOGL_NOTICE, g_time,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unexpected TCH/F frame number received in RTS.IND "</span><br><span style="color: hsl(120, 100%, 40%);">+ "(not at TCH/F block boundary): %u (mod 104: %u)\n", fn, fn % 104);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* PH-RTS-IND prim received from bts model */</span><br><span> static int l1sap_ph_rts_ind(struct gsm_bts_trx *trx,</span><br><span> struct osmo_phsap_prim *l1sap, struct ph_data_param *rts_ind)</span><br><span>@@ -725,14 +750,18 @@</span><br><span> si = bts_sysinfo_get(trx->bts, &g_time);</span><br><span> if (si)</span><br><span> memcpy(p, si, GSM_MACBLOCK_LEN);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(120, 100%, 40%);">+ else {</span><br><span> memcpy(p, fill_frame, GSM_MACBLOCK_LEN);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGPGT(DL1P, &g_time, "sending fill frame BCCH chan_nr=%d fn=%u\n", chan_nr, fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> } else if (!(chan_nr & 0x80)) { /* only TCH/F, TCH/H, SDCCH/4 and SDCCH/8 have C5 bit cleared */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool dtxd = false;</span><br><span> lchan = get_active_lchan_by_chan_nr(trx, chan_nr);</span><br><span> if (!lchan) {</span><br><span> LOGPGT(DL1P, LOGL_ERROR, &g_time, "No lchan for PH-RTS.ind (chan_nr=%u)\n", chan_nr);</span><br><span> return 0;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ dtxd = lchan->ts->trx->bts->dtxd;</span><br><span> if (L1SAP_IS_LINK_SACCH(link_id)) {</span><br><span> p = msgb_put(msg, GSM_MACBLOCK_LEN);</span><br><span> /* L1-header, if not set/modified by layer 1 */</span><br><span>@@ -752,20 +781,39 @@</span><br><span> if (si) {</span><br><span> /* The +2 is empty space where the DSP inserts the L1 hdr */</span><br><span> memcpy(p + 2, si, GSM_MACBLOCK_LEN - 2);</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> memcpy(p + 2, fill_frame, GSM_MACBLOCK_LEN - 2);</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (L1SAP_IS_CHAN_SDCCH4(chan_nr) || L1SAP_IS_CHAN_SDCCH8(chan_nr) ||</span><br><span style="color: hsl(0, 100%, 40%);">- (lchan->rsl_cmode == RSL_CMOD_SPD_SIGN && !lchan->ts->trx->bts->dtxd)) {</span><br><span style="color: hsl(0, 100%, 40%);">- /*</span><br><span style="color: hsl(0, 100%, 40%);">- * SDCCH or TCH in signalling mode without DTX.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * Send fill frame according to GSM 05.08, section 8.3: "On the SDCCH and on the</span><br><span style="color: hsl(0, 100%, 40%);">- * half rate speech traffic channel in signalling only mode DTX is not allowed.</span><br><span style="color: hsl(0, 100%, 40%);">- * In these cases and during signalling on the TCH when DTX is not used, the same</span><br><span style="color: hsl(0, 100%, 40%);">- * L2 fill frame shall be transmitted in case there is nothing else to transmit."</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGPGT(DL1P, &g_time, "sending fill frame SACCH chan_nr=%d fn=%u dtx=%s\n", chan_nr, fn, dtxd ? "enabled" : "disabled");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (L1SAP_IS_CHAN_SDCCH4(chan_nr) || L1SAP_IS_CHAN_SDCCH8(chan_nr)) {</span><br><span> p = msgb_put(msg, GSM_MACBLOCK_LEN);</span><br><span> memcpy(p, fill_frame, GSM_MACBLOCK_LEN);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGPGT(DL1P, &g_time, "sending fill frame SDCCH chan_nr=%d fn=%u dtx=%s\n", chan_nr, fn, dtxd ? "enabled" : "disabled");</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (lchan->rsl_cmode == RSL_CMOD_SPD_SIGN) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dtxd_facch) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span style="color: hsl(120, 100%, 40%);">+ * TCH in signalling mode with DTX.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Send fill frame according to GSM 05.08, section 8.3.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (L1SAP_IS_CHAN_TCHF(chan_nr) && is_required_tchf_fill_frame_dtx(fn, &g_time)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ p = msgb_put(msg, GSM_MACBLOCK_LEN);</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(p, fill_frame, GSM_MACBLOCK_LEN);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGPGT(DL1P, &g_time, "sending fill frame TCH chan_nr=%d fn=%u dtx=%s\n", chan_nr, fn, dtxd ? "enabled" : "disabled");</span><br><span style="color: hsl(120, 100%, 40%);">+ //dtx_dispatch(lchan, E_FACCH); /* XXX is this needed? */</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span style="color: hsl(120, 100%, 40%);">+ * TCH in signalling mode without DTX.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Send fill frame according to GSM 05.08, section 8.3: "On the SDCCH and on the</span><br><span style="color: hsl(120, 100%, 40%);">+ * half rate speech traffic channel in signalling only mode DTX is not allowed.</span><br><span style="color: hsl(120, 100%, 40%);">+ * In these cases and during signalling on the TCH when DTX is not used, the same</span><br><span style="color: hsl(120, 100%, 40%);">+ * L2 fill frame shall be transmitted in case there is nothing else to transmit."</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ p = msgb_put(msg, GSM_MACBLOCK_LEN);</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(p, fill_frame, GSM_MACBLOCK_LEN);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGPGT(DL1P, &g_time, "sending fill frame TCH chan_nr=%d fn=%u dtx=%s\n", chan_nr, fn, dtxd ? "enabled" : "disabled");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> } /* else the message remains empty, so TCH frames are sent */</span><br><span> } else {</span><br><span> /* The +2 is empty space where the DSP inserts the L1 hdr */</span><br><span>@@ -786,8 +834,10 @@</span><br><span> rc = bts_ccch_copy_msg(trx->bts, p, &g_time,</span><br><span> (L1SAP_FN2CCCHBLOCK(fn) <</span><br><span> num_agch(trx, "PH-RTS-IND")));</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc <= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc <= 0) {</span><br><span> memcpy(p, fill_frame, GSM_MACBLOCK_LEN);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGPGT(DL1P, &g_time, "sending fill frame AGCH PCH chan_nr=%d fn=%u\n", chan_nr, fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> DEBUGPGT(DL1P, &g_time, "Tx PH-DATA.req chan_nr=0x%02x link_id=0x%02x\n", chan_nr, link_id);</span><br><span>@@ -1436,6 +1486,7 @@</span><br><span> char name[32];</span><br><span> snprintf(name, sizeof(name), "bts%u-trx%u-ts%u-ss%u", lchan->ts->trx->bts->nr,</span><br><span> lchan->ts->trx->nr, lchan->ts->nr, lchan->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DL1C, LOGL_NOTICE, "allocating DTX FSM for chan_nr=%d\n", chan_nr);</span><br><span> lchan->tch.dtx.dl_amr_fsm = osmo_fsm_inst_alloc(&dtx_dl_amr_fsm,</span><br><span> tall_bts_ctx,</span><br><span> lchan,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10415">change 10415</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/10415"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I7bff00b8cf41dc1b0e6e668173bebce23be0d253 </div>
<div style="display:none"> Gerrit-Change-Number: 10415 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <ssperling@sysmocom.de> </div>