<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11136">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/scheduler: pass lchan state to sched_prim_dequeue()<br><br>Having access to a logical channel state is required by the<br>follow-up change, which will introduce a separate function<br>for dequeuing SACCH primitives.<br><br>Change-Id: Ibde0acf8e6be224b1007be707a636eaad68c8d36<br>---<br>M src/host/trxcon/sched_prim.c<br>M src/host/trxcon/sched_trx.c<br>M src/host/trxcon/sched_trx.h<br>3 files changed, 7 insertions(+), 7 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/36/11136/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/sched_prim.c b/src/host/trxcon/sched_prim.c</span><br><span>index 6b160d1..e71109b 100644</span><br><span>--- a/src/host/trxcon/sched_prim.c</span><br><span>+++ b/src/host/trxcon/sched_prim.c</span><br><span>@@ -284,17 +284,17 @@</span><br><span>  *</span><br><span>  * @param  queue      a transmit queue to take a prim from</span><br><span>  * @param  fn         the current frame number (used for FACCH/H)</span><br><span style="color: hsl(0, 100%, 40%);">- * @param  lchan_type required primitive type</span><br><span style="color: hsl(120, 100%, 40%);">+ * @param  lchan      logical channel state</span><br><span>  * @return            a primitive or NULL if not found</span><br><span>  */</span><br><span> struct trx_ts_prim *sched_prim_dequeue(struct llist_head *queue,</span><br><span style="color: hsl(0, 100%, 40%);">-        uint32_t fn, enum trx_lchan_type lchan_type)</span><br><span style="color: hsl(120, 100%, 40%);">+  uint32_t fn, struct trx_lchan_state *lchan)</span><br><span> {</span><br><span>     /* There is nothing to dequeue */</span><br><span>    if (llist_empty(queue))</span><br><span>              return NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        switch (lchan_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (lchan->type) {</span><br><span>    /* TCH/F requires FACCH/F prioritization */</span><br><span>  case TRXC_TCHF:</span><br><span>              return prim_dequeue_tch_f(queue);</span><br><span>@@ -302,11 +302,11 @@</span><br><span>    /* FACCH/H prioritization is a bit more complex */</span><br><span>   case TRXC_TCHH_0:</span><br><span>    case TRXC_TCHH_1:</span><br><span style="color: hsl(0, 100%, 40%);">-               return prim_dequeue_tch_h(queue, fn, lchan_type);</span><br><span style="color: hsl(120, 100%, 40%);">+             return prim_dequeue_tch_h(queue, fn, lchan->type);</span><br><span> </span><br><span>    /* Other kinds of logical channels */</span><br><span>        default:</span><br><span style="color: hsl(0, 100%, 40%);">-                return prim_dequeue_one(queue, lchan_type);</span><br><span style="color: hsl(120, 100%, 40%);">+           return prim_dequeue_one(queue, lchan->type);</span><br><span>      }</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c</span><br><span>index 023764d..fc29998 100644</span><br><span>--- a/src/host/trxcon/sched_trx.c</span><br><span>+++ b/src/host/trxcon/sched_trx.c</span><br><span>@@ -95,7 +95,7 @@</span><br><span>               * attempt to obtain a new one from queue</span><br><span>             */</span><br><span>          if (lchan->prim == NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-                     lchan->prim = sched_prim_dequeue(&ts->tx_prims, fn, chan);</span><br><span style="color: hsl(120, 100%, 40%);">+                  lchan->prim = sched_prim_dequeue(&ts->tx_prims, fn, lchan);</span><br><span> </span><br><span>            /* TODO: report TX buffers health to the higher layers */</span><br><span> </span><br><span>diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h</span><br><span>index 08e2489..ff288f2 100644</span><br><span>--- a/src/host/trxcon/sched_trx.h</span><br><span>+++ b/src/host/trxcon/sched_trx.h</span><br><span>@@ -302,7 +302,7 @@</span><br><span>         (CHAN_IS_TCH(prim->chan) && prim->payload_len == GSM_MACBLOCK_LEN)</span><br><span> </span><br><span> struct trx_ts_prim *sched_prim_dequeue(struct llist_head *queue,</span><br><span style="color: hsl(0, 100%, 40%);">-        uint32_t fn, enum trx_lchan_type lchan_type);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t fn, struct trx_lchan_state *lchan);</span><br><span> int sched_prim_dummy(struct trx_lchan_state *lchan);</span><br><span> void sched_prim_drop(struct trx_lchan_state *lchan);</span><br><span> void sched_prim_flush_queue(struct llist_head *list);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11136">change 11136</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/11136"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ibde0acf8e6be224b1007be707a636eaad68c8d36 </div>
<div style="display:none"> Gerrit-Change-Number: 11136 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>