<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/25579">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  osmith: Looks good to me, approved
  laforge: Looks good to me, but someone else must approve

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">l1sap: unify channel (de)activation/modification messages<br><br>LOGPLCHAN() prepends the contextual information for us, there<br>is no need to print trx->nr again.  Take a chance to apply<br>some additional cosmetic changes, like fixing capital letter.<br><br>Change-Id: Ia199d584c937eef4118c99af4523fd91b2e46107<br>---<br>M src/common/l1sap.c<br>1 file changed, 9 insertions(+), 7 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 b9bc675..2ebd39a 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -2040,7 +2040,7 @@</span><br><span>   struct gsm_lchan *lchan = get_lchan_by_chan_nr(trx, chan_nr);</span><br><span>        int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     LOGPLCHAN(lchan, DL1C, LOGL_INFO, "activating channel %s\n", rsl_chan_nr_str(chan_nr));</span><br><span style="color: hsl(120, 100%, 40%);">+     LOGPLCHAN(lchan, DL1C, LOGL_INFO, "Activating channel %s\n", rsl_chan_nr_str(chan_nr));</span><br><span> </span><br><span>        lchan->s = trx->bts->radio_link_timeout.current;</span><br><span> </span><br><span>@@ -2073,8 +2073,8 @@</span><br><span> int l1sap_chan_rel(struct gsm_bts_trx *trx, uint8_t chan_nr)</span><br><span> {</span><br><span>   struct gsm_lchan *lchan = get_lchan_by_chan_nr(trx, chan_nr);</span><br><span style="color: hsl(0, 100%, 40%);">-   LOGPLCHAN(lchan, DL1C, LOGL_INFO, "deactivating channel chan_nr=%s trx=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">-           rsl_chan_nr_str(chan_nr), trx->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+      LOGPLCHAN(lchan, DL1C, LOGL_INFO, "Deactivating channel %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                rsl_chan_nr_str(chan_nr));</span><br><span> </span><br><span>     if (lchan->tch.dtx.dl_amr_fsm) {</span><br><span>          osmo_fsm_inst_free(lchan->tch.dtx.dl_amr_fsm);</span><br><span>@@ -2089,8 +2089,8 @@</span><br><span> {</span><br><span>       struct gsm_lchan *lchan = get_lchan_by_chan_nr(trx, chan_nr);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       LOGPLCHAN(lchan, DL1C, LOGL_INFO, "deactivating sacch chan_nr=%s trx=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">-             rsl_chan_nr_str(chan_nr), trx->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+      LOGPLCHAN(lchan, DL1C, LOGL_INFO, "Deactivating SACCH on channel %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+               rsl_chan_nr_str(chan_nr));</span><br><span> </span><br><span>     return l1sap_chan_act_dact_modify(trx, chan_nr, PRIM_INFO_DEACTIVATE,</span><br><span>                1);</span><br><span>@@ -2098,8 +2098,10 @@</span><br><span> </span><br><span> int l1sap_chan_modify(struct gsm_bts_trx *trx, uint8_t chan_nr)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        LOGP(DL1C, LOGL_INFO, "modifying channel chan_nr=%s trx=%d\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                rsl_chan_nr_str(chan_nr), trx->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+        struct gsm_lchan *lchan = get_lchan_by_chan_nr(trx, chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+       LOGPLCHAN(lchan, DL1C, LOGL_INFO, "Modifying channel %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+         rsl_chan_nr_str(chan_nr));</span><br><span> </span><br><span>       return l1sap_chan_act_dact_modify(trx, chan_nr, PRIM_INFO_MODIFY, 0);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/25579">change 25579</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/c/osmo-bts/+/25579"/><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-Change-Id: Ia199d584c937eef4118c99af4523fd91b2e46107 </div>
<div style="display:none"> Gerrit-Change-Number: 25579 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>