<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/21274">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rename to release_sapi_ul_rach(), simplify<br><br>The sapis_for_ho have only one member, so it's silly to iterate. A<br>subsequent commit will drop sapis_for_ho.<br><br>Change-Id: I896fbca9876fd274ff9c426250b18b50faebfa89<br>---<br>M src/osmo-bts-lc15/oml.c<br>M src/osmo-bts-oc2g/oml.c<br>M src/osmo-bts-sysmo/oml.c<br>3 files changed, 12 insertions(+), 36 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/74/21274/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c</span><br><span>index 1fe7205..70be419 100644</span><br><span>--- a/src/osmo-bts-lc15/oml.c</span><br><span>+++ b/src/osmo-bts-lc15/oml.c</span><br><span>@@ -1736,17 +1736,9 @@</span><br><span>        return enqueue_sapi_deact_cmd(lchan, sapi, dir);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int release_sapis_for_ho(struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+static int release_sapi_ul_rach(struct gsm_lchan *lchan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        int res = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-    int i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  const struct lchan_sapis *s4l = &sapis_for_ho;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-      for (i = s4l->num_sapis-1; i >= 0; i--)</span><br><span style="color: hsl(0, 100%, 40%);">-           res |= check_sapi_release(lchan,</span><br><span style="color: hsl(0, 100%, 40%);">-                                s4l->sapis[i].sapi, s4l->sapis[i].dir);</span><br><span style="color: hsl(0, 100%, 40%);">-   return res;</span><br><span style="color: hsl(120, 100%, 40%);">+   return check_sapi_release(lchan, GsmL1_Sapi_Rach, GsmL1_Dir_RxUplink);</span><br><span> }</span><br><span> </span><br><span> static int lchan_deactivate_sapis(struct gsm_lchan *lchan)</span><br><span>@@ -1768,7 +1760,7 @@</span><br><span>        }</span><br><span> </span><br><span>        /* always attempt to disable the RACH burst */</span><br><span style="color: hsl(0, 100%, 40%);">-  res |= release_sapis_for_ho(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+   res |= release_sapi_ul_rach(lchan);</span><br><span> </span><br><span>      /* nothing was queued */</span><br><span>     if (res == 0) {</span><br><span>@@ -2002,7 +1994,7 @@</span><br><span>              gsm_lchan_name(lchan));</span><br><span> </span><br><span>  /* Give up listening to RACH bursts */</span><br><span style="color: hsl(0, 100%, 40%);">-  release_sapis_for_ho(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+  release_sapi_ul_rach(lchan);</span><br><span> </span><br><span>     /* Activate the normal SAPIs */</span><br><span>      for (i = 0; i < s4l->num_sapis; i++) {</span><br><span>diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c</span><br><span>index 6403a22..53f8519 100644</span><br><span>--- a/src/osmo-bts-oc2g/oml.c</span><br><span>+++ b/src/osmo-bts-oc2g/oml.c</span><br><span>@@ -1745,17 +1745,9 @@</span><br><span>       return enqueue_sapi_deact_cmd(lchan, sapi, dir);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int release_sapis_for_ho(struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+static int release_sapi_ul_rach(struct gsm_lchan *lchan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        int res = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-    int i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  const struct lchan_sapis *s4l = &sapis_for_ho;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-      for (i = s4l->num_sapis-1; i >= 0; i--)</span><br><span style="color: hsl(0, 100%, 40%);">-           res |= check_sapi_release(lchan,</span><br><span style="color: hsl(0, 100%, 40%);">-                                s4l->sapis[i].sapi, s4l->sapis[i].dir);</span><br><span style="color: hsl(0, 100%, 40%);">-   return res;</span><br><span style="color: hsl(120, 100%, 40%);">+   return check_sapi_release(lchan, GsmL1_Sapi_Rach, GsmL1_Dir_RxUplink);</span><br><span> }</span><br><span> </span><br><span> static int lchan_deactivate_sapis(struct gsm_lchan *lchan)</span><br><span>@@ -1777,7 +1769,7 @@</span><br><span>        }</span><br><span> </span><br><span>        /* always attempt to disable the RACH burst */</span><br><span style="color: hsl(0, 100%, 40%);">-  res |= release_sapis_for_ho(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+   res |= release_sapi_ul_rach(lchan);</span><br><span> </span><br><span>      /* nothing was queued */</span><br><span>     if (res == 0) {</span><br><span>@@ -2008,7 +2000,7 @@</span><br><span>              gsm_lchan_name(lchan));</span><br><span> </span><br><span>  /* Give up listening to RACH bursts */</span><br><span style="color: hsl(0, 100%, 40%);">-  release_sapis_for_ho(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+  release_sapi_ul_rach(lchan);</span><br><span> </span><br><span>     /* Activate the normal SAPIs */</span><br><span>      for (i = 0; i < s4l->num_sapis; i++) {</span><br><span>diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c</span><br><span>index e8bfb2d..6121f76 100644</span><br><span>--- a/src/osmo-bts-sysmo/oml.c</span><br><span>+++ b/src/osmo-bts-sysmo/oml.c</span><br><span>@@ -1651,17 +1651,9 @@</span><br><span>   return enqueue_sapi_deact_cmd(lchan, sapi, dir);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int release_sapis_for_ho(struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+static int release_sapi_ul_rach(struct gsm_lchan *lchan)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        int res = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-    int i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  const struct lchan_sapis *s4l = &sapis_for_ho;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-      for (i = s4l->num_sapis-1; i >= 0; i--)</span><br><span style="color: hsl(0, 100%, 40%);">-           res |= check_sapi_release(lchan,</span><br><span style="color: hsl(0, 100%, 40%);">-                                s4l->sapis[i].sapi, s4l->sapis[i].dir);</span><br><span style="color: hsl(0, 100%, 40%);">-   return res;</span><br><span style="color: hsl(120, 100%, 40%);">+   return check_sapi_release(lchan, GsmL1_Sapi_Rach, GsmL1_Dir_RxUplink);</span><br><span> }</span><br><span> </span><br><span> static int lchan_deactivate_sapis(struct gsm_lchan *lchan)</span><br><span>@@ -1683,7 +1675,7 @@</span><br><span>        }</span><br><span> </span><br><span>        /* always attempt to disable the RACH burst */</span><br><span style="color: hsl(0, 100%, 40%);">-  res |= release_sapis_for_ho(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+   res |= release_sapi_ul_rach(lchan);</span><br><span> </span><br><span>      /* nothing was queued */</span><br><span>     if (res == 0) {</span><br><span>@@ -1886,7 +1878,7 @@</span><br><span>              gsm_lchan_name(lchan));</span><br><span> </span><br><span>  /* Give up listening to RACH bursts */</span><br><span style="color: hsl(0, 100%, 40%);">-  release_sapis_for_ho(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+  release_sapi_ul_rach(lchan);</span><br><span> </span><br><span>     /* Activate the normal SAPIs */</span><br><span>      for (i = 0; i < s4l->num_sapis; i++) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/21274">change 21274</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/+/21274"/><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: I896fbca9876fd274ff9c426250b18b50faebfa89 </div>
<div style="display:none"> Gerrit-Change-Number: 21274 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>