<p>Stefan Sperling has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10275">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">move caching of FAACH data to common BTS code<br><br>Move caching of FAACH data to the common BTS code to reduce<br>duplicatation between sysmobts and litecell5.<br><br>Change-Id: I252679206235c538335626d8075d003c0a27316f<br>Related: OS#1950<br>---<br>M src/common/l1sap.c<br>M src/osmo-bts-litecell15/l1_if.c<br>M src/osmo-bts-sysmo/l1_if.c<br>3 files changed, 27 insertions(+), 26 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/75/10275/1</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 8936674..cddba47 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -778,6 +778,31 @@</span><br><span> }</span><br><span> msgb_free(pp.oph.msg);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dtx_dl_amr_enabled(lchan)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (lchan->tch.dtx.dl_amr_fsm->state) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case ST_ONSET_F:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ST_U_INH_F:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ST_F1_INH_F:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (L1SAP_IS_CHAN_TCHH(chan_nr) || L1SAP_IS_CHAN_TCHF(chan_nr) ||</span><br><span style="color: hsl(120, 100%, 40%);">+ (L1SAP_IS_CHAN_PDCH(chan_nr) && !ts_is_pdch(&trx->ts[tn]))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FACCH interruption of DTX silence */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* cache FACCH data */</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(lchan->tch.dtx.facch, msg->l2h, msgb_l2len(msg));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* update FN so it can be checked by TCH silence</span><br><span style="color: hsl(120, 100%, 40%);">+ resume handler */</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->tch.dtx.fn = LCHAN_FN_DUMMY;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case ST_FACCH:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* update FN so it can be checked by TCH silence</span><br><span style="color: hsl(120, 100%, 40%);">+ resume handler */</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->tch.dtx.fn = LCHAN_FN_DUMMY;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> } else if (L1SAP_IS_CHAN_AGCH_PCH(chan_nr)) {</span><br><span> p = msgb_put(msg, GSM_MACBLOCK_LEN);</span><br><span> rc = bts_ccch_copy_msg(trx->bts, p, &g_time,</span><br><span>diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c</span><br><span>index e6cdfd4..b734942 100644</span><br><span>--- a/src/osmo-bts-litecell15/l1_if.c</span><br><span>+++ b/src/osmo-bts-litecell15/l1_if.c</span><br><span>@@ -422,9 +422,6 @@</span><br><span> }</span><br><span> if (sapi == GsmL1_Sapi_TchH || sapi == GsmL1_Sapi_TchF) {</span><br><span> /* FACCH interruption of DTX silence */</span><br><span style="color: hsl(0, 100%, 40%);">- /* cache FACCH data */</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(lchan->tch.dtx.facch, msg->l2h,</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_l2len(msg));</span><br><span> /* prepare ONSET or INH message */</span><br><span> if(lchan->tch.dtx.dl_amr_fsm->state == ST_ONSET_F)</span><br><span> l1p->u.phDataReq.msgUnitParam.u8Buffer[0] =</span><br><span>@@ -441,17 +438,8 @@</span><br><span> /* update length */</span><br><span> data_req_from_l1sap(l1p, fl1, u8Tn, u32Fn, sapi,</span><br><span> subCh, u8BlockNbr, 3);</span><br><span style="color: hsl(0, 100%, 40%);">- /* update FN so it can be checked by TCH silence</span><br><span style="color: hsl(0, 100%, 40%);">- resume handler */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->tch.dtx.fn = LCHAN_FN_DUMMY;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (dtx_dl_amr_enabled(lchan) &&</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->tch.dtx.dl_amr_fsm->state == ST_FACCH) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* update FN so it can be checked by TCH silence</span><br><span style="color: hsl(0, 100%, 40%);">- resume handler */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->tch.dtx.fn = LCHAN_FN_DUMMY;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- else {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> OSMO_ASSERT(msgb_l2len(msg) <= sizeof(l1p->u.phDataReq.msgUnitParam.u8Buffer));</span><br><span> memcpy(l1p->u.phDataReq.msgUnitParam.u8Buffer, msg->l2h,</span><br><span> msgb_l2len(msg));</span><br><span>diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c</span><br><span>index 3adb442..18fc9b8 100644</span><br><span>--- a/src/osmo-bts-sysmo/l1_if.c</span><br><span>+++ b/src/osmo-bts-sysmo/l1_if.c</span><br><span>@@ -419,9 +419,6 @@</span><br><span> }</span><br><span> if (sapi == GsmL1_Sapi_TchH || sapi == GsmL1_Sapi_TchF) {</span><br><span> /* FACCH interruption of DTX silence */</span><br><span style="color: hsl(0, 100%, 40%);">- /* cache FACCH data */</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(lchan->tch.dtx.facch, msg->l2h,</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_l2len(msg));</span><br><span> /* prepare ONSET or INH message */</span><br><span> if(lchan->tch.dtx.dl_amr_fsm->state == ST_ONSET_F)</span><br><span> l1p->u.phDataReq.msgUnitParam.u8Buffer[0] =</span><br><span>@@ -438,17 +435,8 @@</span><br><span> /* update length */</span><br><span> data_req_from_l1sap(l1p, fl1, u8Tn, u32Fn, sapi,</span><br><span> subCh, u8BlockNbr, 3);</span><br><span style="color: hsl(0, 100%, 40%);">- /* update FN so it can be checked by TCH silence</span><br><span style="color: hsl(0, 100%, 40%);">- resume handler */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->tch.dtx.fn = LCHAN_FN_DUMMY;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (dtx_dl_amr_enabled(lchan) &&</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->tch.dtx.dl_amr_fsm->state == ST_FACCH) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* update FN so it can be checked by TCH silence</span><br><span style="color: hsl(0, 100%, 40%);">- resume handler */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->tch.dtx.fn = LCHAN_FN_DUMMY;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- else {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> OSMO_ASSERT(msgb_l2len(msg) <= sizeof(l1p->u.phDataReq.msgUnitParam.u8Buffer));</span><br><span> memcpy(l1p->u.phDataReq.msgUnitParam.u8Buffer, msg->l2h,</span><br><span> msgb_l2len(msg));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10275">change 10275</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/10275"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I252679206235c538335626d8075d003c0a27316f </div>
<div style="display:none"> Gerrit-Change-Number: 10275 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>