<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/18700">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">common/scheduler: use boolean for channel activation state<br><br>Change-Id: I0cb1d915db8787050cdec1802894f66e885a9bf3<br>---<br>M include/osmo-bts/scheduler.h<br>M src/common/scheduler.c<br>M src/osmo-bts-trx/l1_if.c<br>M src/osmo-bts-virtual/l1_if.c<br>4 files changed, 12 insertions(+), 16 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/00/18700/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h</span><br><span>index 7a9da8f..74102f3 100644</span><br><span>--- a/include/osmo-bts/scheduler.h</span><br><span>+++ b/include/osmo-bts/scheduler.h</span><br><span>@@ -72,7 +72,7 @@</span><br><span> /* States each channel on a multiframe */</span><br><span> struct l1sched_chan_state {</span><br><span> /* scheduler */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t active; /* Channel is active */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool active; /* Channel is active */</span><br><span> ubit_t *dl_bursts; /* burst buffer for TX */</span><br><span> enum trx_burst_type dl_burst_type; /* GMSK or 8PSK burst type */</span><br><span> sbit_t *ul_bursts; /* burst buffer for RX */</span><br><span>@@ -175,8 +175,7 @@</span><br><span> enum gsm_phys_chan_config pchan);</span><br><span> </span><br><span> /*! \brief set all matching logical channels active/inactive */</span><br><span style="color: hsl(0, 100%, 40%);">-int trx_sched_set_lchan(struct l1sched_trx *l1t, uint8_t chan_nr, uint8_t link_id,</span><br><span style="color: hsl(0, 100%, 40%);">- int active);</span><br><span style="color: hsl(120, 100%, 40%);">+int trx_sched_set_lchan(struct l1sched_trx *l1t, uint8_t chan_nr, uint8_t link_id, bool active);</span><br><span> </span><br><span> /*! \brief set mode of all matching logical channels to given mode(s) */</span><br><span> int trx_sched_set_mode(struct l1sched_trx *l1t, uint8_t chan_nr, uint8_t rsl_cmode,</span><br><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index 276f3fd..5b398d1 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -586,7 +586,7 @@</span><br><span> for (i = 0; i < ARRAY_SIZE(l1ts->chan_state); i++) {</span><br><span> struct l1sched_chan_state *chan_state;</span><br><span> chan_state = &l1ts->chan_state[i];</span><br><span style="color: hsl(0, 100%, 40%);">- chan_state->active = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_state->active = false;</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -960,8 +960,7 @@</span><br><span> }</span><br><span> </span><br><span> /* setting all logical channels given attributes to active/inactive */</span><br><span style="color: hsl(0, 100%, 40%);">-int trx_sched_set_lchan(struct l1sched_trx *l1t, uint8_t chan_nr, uint8_t link_id,</span><br><span style="color: hsl(0, 100%, 40%);">- int active)</span><br><span style="color: hsl(120, 100%, 40%);">+int trx_sched_set_lchan(struct l1sched_trx *l1t, uint8_t chan_nr, uint8_t link_id, bool active)</span><br><span> {</span><br><span> uint8_t tn = L1SAP_CHAN2TS(chan_nr);</span><br><span> struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn);</span><br><span>diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c</span><br><span>index b28c894..b67d8fa 100644</span><br><span>--- a/src/osmo-bts-trx/l1_if.c</span><br><span>+++ b/src/osmo-bts-trx/l1_if.c</span><br><span>@@ -128,16 +128,14 @@</span><br><span> /* set lchan inactive */</span><br><span> lchan_set_state(lchan, LCHAN_S_NONE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return trx_sched_set_lchan(&l1h->l1s, gsm_lchan2chan_nr(lchan),</span><br><span style="color: hsl(0, 100%, 40%);">- LID_DEDIC, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ return trx_sched_set_lchan(&l1h->l1s, gsm_lchan2chan_nr(lchan), LID_DEDIC, false);</span><br><span> }</span><br><span> </span><br><span> int bts_model_lchan_deactivate_sacch(struct gsm_lchan *lchan)</span><br><span> {</span><br><span> struct phy_instance *pinst = trx_phy_instance(lchan->ts->trx);</span><br><span> struct trx_l1h *l1h = pinst->u.osmotrx.hdl;</span><br><span style="color: hsl(0, 100%, 40%);">- return trx_sched_set_lchan(&l1h->l1s, gsm_lchan2chan_nr(lchan),</span><br><span style="color: hsl(0, 100%, 40%);">- LID_SACCH, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ return trx_sched_set_lchan(&l1h->l1s, gsm_lchan2chan_nr(lchan), LID_SACCH, false);</span><br><span> }</span><br><span> </span><br><span> static void l1if_setslot_cb(struct trx_l1h *l1h, uint8_t tn, uint8_t type, int rc)</span><br><span>@@ -632,9 +630,9 @@</span><br><span> chan_nr = RSL_CHAN_OSMO_PDCH | (chan_nr & ~RSL_CHAN_NR_MASK);</span><br><span> </span><br><span> /* activate dedicated channel */</span><br><span style="color: hsl(0, 100%, 40%);">- trx_sched_set_lchan(&l1h->l1s, chan_nr, LID_DEDIC, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_sched_set_lchan(&l1h->l1s, chan_nr, LID_DEDIC, true);</span><br><span> /* activate associated channel */</span><br><span style="color: hsl(0, 100%, 40%);">- trx_sched_set_lchan(&l1h->l1s, chan_nr, LID_SACCH, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_sched_set_lchan(&l1h->l1s, chan_nr, LID_SACCH, true);</span><br><span> /* set mode */</span><br><span> trx_sched_set_mode(&l1h->l1s, chan_nr,</span><br><span> lchan->rsl_cmode, lchan->tch_mode,</span><br><span>diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c</span><br><span>index 31ed46d..5d3baf6 100644</span><br><span>--- a/src/osmo-bts-virtual/l1_if.c</span><br><span>+++ b/src/osmo-bts-virtual/l1_if.c</span><br><span>@@ -388,9 +388,9 @@</span><br><span> break;</span><br><span> }</span><br><span> /* activate dedicated channel */</span><br><span style="color: hsl(0, 100%, 40%);">- trx_sched_set_lchan(sched, chan_nr, LID_DEDIC, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_sched_set_lchan(sched, chan_nr, LID_DEDIC, true);</span><br><span> /* activate associated channel */</span><br><span style="color: hsl(0, 100%, 40%);">- trx_sched_set_lchan(sched, chan_nr, LID_SACCH, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_sched_set_lchan(sched, chan_nr, LID_SACCH, true);</span><br><span> /* set mode */</span><br><span> trx_sched_set_mode(sched, chan_nr,</span><br><span> lchan->rsl_cmode, lchan->tch_mode,</span><br><span>@@ -437,12 +437,12 @@</span><br><span> break;</span><br><span> }</span><br><span> /* deactivate associated channel */</span><br><span style="color: hsl(0, 100%, 40%);">- trx_sched_set_lchan(sched, chan_nr, LID_SACCH, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_sched_set_lchan(sched, chan_nr, LID_SACCH, false);</span><br><span> if (!l1sap->u.info.u.act_req.sacch_only) {</span><br><span> /* set lchan inactive */</span><br><span> lchan_set_state(lchan, LCHAN_S_NONE);</span><br><span> /* deactivate dedicated channel */</span><br><span style="color: hsl(0, 100%, 40%);">- trx_sched_set_lchan(sched, chan_nr, 0x00, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_sched_set_lchan(sched, chan_nr, 0x00, false);</span><br><span> /* confirm only on dedicated channel */</span><br><span> mph_info_chan_confirm(trx, chan_nr,</span><br><span> PRIM_INFO_DEACTIVATE, 0);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/18700">change 18700</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/+/18700"/><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: I0cb1d915db8787050cdec1802894f66e885a9bf3 </div>
<div style="display:none"> Gerrit-Change-Number: 18700 </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>