<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/18833">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bts-trx: store pointer to gsm_lchan in l1sched_chan_state<br><br>This change simplifies access to generic logical channel state<br>(struct gsm_lchan) from osmo-bts-trx specific state (struct<br>l1sched_chan_state), so there is no need to look it up using<br>get_lchan_by_chan_nr() on receipt of each Uplink burst.<br><br>Change-Id: Ic4378020f980845b962f71b9e4b7faea738bc174<br>---<br>M include/osmo-bts/scheduler.h<br>M src/common/scheduler.c<br>M src/osmo-bts-trx/sched_lchan_tchf.c<br>M src/osmo-bts-trx/sched_lchan_tchh.c<br>4 files changed, 12 insertions(+), 4 deletions(-)<br><br></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 a7bc6c7..f5f346e 100644</span><br><span>--- a/include/osmo-bts/scheduler.h</span><br><span>+++ b/include/osmo-bts/scheduler.h</span><br><span>@@ -71,6 +71,11 @@</span><br><span> </span><br><span> /* States each channel on a multiframe */</span><br><span> struct l1sched_chan_state {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Pointer to the associated logical channel state from gsm_data_shared.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Initialized during channel activation, thus may be NULL for inactive</span><br><span style="color: hsl(120, 100%, 40%);">+ * or auto-active channels. Always check before dereferencing! */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *lchan;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* scheduler */</span><br><span> bool active; /* Channel is active */</span><br><span> ubit_t *dl_bursts; /* burst buffer for TX */</span><br><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index ed6c623..b79c83d 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -1000,6 +1000,11 @@</span><br><span> else</span><br><span> chan_state->ho_rach_detect = 0;</span><br><span> chan_state->active = active;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (active) {</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_state->lchan = get_lchan_by_chan_nr(l1t->trx, chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(chan_state->lchan != NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>index 80115a9..d289620 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_tchf.c</span><br><span>@@ -50,6 +50,7 @@</span><br><span> {</span><br><span> struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, bi->tn);</span><br><span> struct l1sched_chan_state *chan_state = &l1ts->chan_state[chan];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *lchan = chan_state->lchan;</span><br><span> sbit_t *burst, **bursts_p = &chan_state->ul_bursts;</span><br><span> uint8_t *mask = &chan_state->ul_mask;</span><br><span> uint8_t rsl_cmode = chan_state->rsl_cmode;</span><br><span>@@ -59,8 +60,6 @@</span><br><span> int n_errors = 0;</span><br><span> int n_bits_total = 0;</span><br><span> bool bfi_flag = false;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_lchan *lchan =</span><br><span style="color: hsl(0, 100%, 40%);">- get_lchan_by_chan_nr(l1t->trx, trx_chan_desc[chan].chan_nr | bi->tn);</span><br><span> unsigned int fn_begin;</span><br><span> uint16_t ber10k;</span><br><span> uint8_t is_sub = 0;</span><br><span>diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>index 8adaec3..0281342 100644</span><br><span>--- a/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>+++ b/src/osmo-bts-trx/sched_lchan_tchh.c</span><br><span>@@ -50,6 +50,7 @@</span><br><span> {</span><br><span> struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, bi->tn);</span><br><span> struct l1sched_chan_state *chan_state = &l1ts->chan_state[chan];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *lchan = chan_state->lchan;</span><br><span> sbit_t *burst, **bursts_p = &chan_state->ul_bursts;</span><br><span> uint8_t *mask = &chan_state->ul_mask;</span><br><span> uint8_t rsl_cmode = chan_state->rsl_cmode;</span><br><span>@@ -59,8 +60,6 @@</span><br><span> int n_errors = 0;</span><br><span> int n_bits_total = 0;</span><br><span> bool bfi_flag = false;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_lchan *lchan =</span><br><span style="color: hsl(0, 100%, 40%);">- get_lchan_by_chan_nr(l1t->trx, trx_chan_desc[chan].chan_nr | bi->tn);</span><br><span> /* Note on FN-10: If we are at FN 10, we decoded an even aligned</span><br><span> * TCH/FACCH frame, because our burst buffer carries 6 bursts.</span><br><span> * Even FN ending at: 10,11,19,20,2,3</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/18833">change 18833</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/+/18833"/><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: Ic4378020f980845b962f71b9e4b7faea738bc174 </div>
<div style="display:none"> Gerrit-Change-Number: 18833 </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-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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>