<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/16475">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon: Use current MS Power on dummy meas reports<br><br>backpointers are added in order to access the TRX, as advised in the<br>existing comment.<br><br>Change-Id: I975cfc5f5d63eb32a7f8932a7f6a544c9a12233c<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, 13 insertions(+), 9 deletions(-)<br><br></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 50dfd6e..fc0f05d 100644</span><br><span>--- a/src/host/trxcon/sched_prim.c</span><br><span>+++ b/src/host/trxcon/sched_prim.c</span><br><span>@@ -171,25 +171,18 @@</span><br><span> /* Compose a new Measurement Report primitive */</span><br><span> memcpy(prim->payload, mr_src_ptr, GSM_MACBLOCK_LEN);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if 0</span><br><span> /**</span><br><span> * Update the L1 SACCH pseudo-header (only for cached MRs)</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * FIXME: this would require having access to the trx_instance,</span><br><span style="color: hsl(0, 100%, 40%);">- * what can be achieved either by chain-passing the pointer</span><br><span style="color: hsl(0, 100%, 40%);">- * through sched_prim_dequeue(), or by adding some</span><br><span style="color: hsl(0, 100%, 40%);">- * back-pointers to the logical channel state.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span> * TODO: filling of the actual values into cached Measurement</span><br><span> * Reports would break the distance spoofing feature. If it</span><br><span> * were known whether the spoofing is enabled or not, we could</span><br><span> * decide whether to update the cached L1 SACCH header here.</span><br><span> */</span><br><span> if (!cached) {</span><br><span style="color: hsl(0, 100%, 40%);">- prim->payload[0] = trx->tx_power;</span><br><span style="color: hsl(0, 100%, 40%);">- prim->payload[1] = trx->ta;</span><br><span style="color: hsl(120, 100%, 40%);">+ prim->payload[0] = lchan->ts->trx->tx_power;</span><br><span style="color: hsl(120, 100%, 40%);">+ prim->payload[1] = lchan->ts->trx->ta;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> </span><br><span> /* Inform about the cache usage count */</span><br><span> if (cached && lchan->sacch.mr_cache_usage > 5) {</span><br><span>diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c</span><br><span>index eb6f3dc..6bb662d 100644</span><br><span>--- a/src/host/trxcon/sched_trx.c</span><br><span>+++ b/src/host/trxcon/sched_trx.c</span><br><span>@@ -202,6 +202,9 @@</span><br><span> /* Allocate a new one */</span><br><span> trx->ts_list[tn] = talloc_zero(trx, struct trx_ts);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Add backpointer */</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->ts_list[tn]->trx = trx;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Assign TS index */</span><br><span> trx->ts_list[tn]->index = tn;</span><br><span> </span><br><span>@@ -287,6 +290,9 @@</span><br><span> if (!lchan)</span><br><span> return -ENOMEM;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* set backpointer */</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->ts = ts;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Set channel type */</span><br><span> lchan->type = type;</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 f2089e8..8718ed6 100644</span><br><span>--- a/src/host/trxcon/sched_trx.h</span><br><span>+++ b/src/host/trxcon/sched_trx.h</span><br><span>@@ -237,6 +237,9 @@</span><br><span> uint8_t key_len;</span><br><span> uint8_t algo;</span><br><span> } a5;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TS that this lchan belongs to */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct trx_ts *ts;</span><br><span> };</span><br><span> </span><br><span> struct trx_ts {</span><br><span>@@ -251,6 +254,8 @@</span><br><span> struct llist_head lchans;</span><br><span> /*! \brief Queue primitives for TX */</span><br><span> struct llist_head tx_prims;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* backpointer to its TRX */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct trx_instance *trx;</span><br><span> };</span><br><span> </span><br><span> /* Represents one TX primitive in the queue of trx_ts */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/16475">change 16475</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/+/16475"/><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: I975cfc5f5d63eb32a7f8932a7f6a544c9a12233c </div>
<div style="display:none"> Gerrit-Change-Number: 16475 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </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>