<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/19479">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">firmware/layer1: refactor multi-frame task mask composition<br><br>Change-Id: I91780146d066c45c42b037c22cb49fd8a96e832b<br>---<br>M src/target/firmware/layer1/l23_api.c<br>1 file changed, 10 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/79/19479/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/firmware/layer1/l23_api.c b/src/target/firmware/layer1/l23_api.c</span><br><span>index 62c21f6..e9ce032 100644</span><br><span>--- a/src/target/firmware/layer1/l23_api.c</span><br><span>+++ b/src/target/firmware/layer1/l23_api.c</span><br><span>@@ -79,8 +79,8 @@</span><br><span>   uint8_t lch_idx;</span><br><span>     enum mframe_task master_task = 0;</span><br><span>    enum mframe_task second_task = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-       uint32_t neigh_task = 0;</span><br><span>     enum mf_type multiframe = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+  uint32_t task_mask = 0x00;</span><br><span> </span><br><span>       if (cbits == 0x01) {</span><br><span>                 lch_idx = 0;</span><br><span>@@ -121,22 +121,27 @@</span><br><span>                 master_task = MF_TASK_BCCH_CCCH;</span><br><span> #endif</span><br><span>   }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   /* Primary and secondary tasks */</span><br><span style="color: hsl(120, 100%, 40%);">+     task_mask |= (1 << master_task) | (1 << second_task);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  switch (neigh_mode) {</span><br><span>        case NEIGH_MODE_PM:</span><br><span>          switch (multiframe) {</span><br><span>                case MF51:</span><br><span style="color: hsl(0, 100%, 40%);">-                      neigh_task = (1 << MF_TASK_NEIGH_PM51);</span><br><span style="color: hsl(120, 100%, 40%);">+                 task_mask |= (1 << MF_TASK_NEIGH_PM51);</span><br><span>                        break;</span><br><span>               case MF26EVEN:</span><br><span style="color: hsl(0, 100%, 40%);">-                  neigh_task = (1 << MF_TASK_NEIGH_PM26E);</span><br><span style="color: hsl(120, 100%, 40%);">+                        task_mask |= (1 << MF_TASK_NEIGH_PM26E);</span><br><span>                       break;</span><br><span>               case MF26ODD:</span><br><span style="color: hsl(0, 100%, 40%);">-                   neigh_task = (1 << MF_TASK_NEIGH_PM26O);</span><br><span style="color: hsl(120, 100%, 40%);">+                        task_mask |= (1 << MF_TASK_NEIGH_PM26O);</span><br><span>                       break;</span><br><span>               }</span><br><span>            break;</span><br><span>       }</span><br><span style="color: hsl(0, 100%, 40%);">-       return (1 << master_task) | (1 << second_task) | neigh_task;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    return task_mask;</span><br><span> }</span><br><span> </span><br><span> static int  chan_nr2dchan_type(uint8_t chan_nr)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/19479">change 19479</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/osmocom-bb/+/19479"/><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-Change-Id: I91780146d066c45c42b037c22cb49fd8a96e832b </div>
<div style="display:none"> Gerrit-Change-Number: 19479 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>