<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24325">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[VAMOS] osmo-bts-trx: indicate MTS in Downlink TRXDv2 PDUs<br><br>Change-Id: I1a17a25883214c068f9b1a6d651128b8f760d1fb<br>Related: SYS#4895, OS#4941<br>---<br>M include/osmo-bts/scheduler.h<br>M src/common/scheduler.c<br>M src/osmo-bts-trx/trx_if.c<br>3 files changed, 19 insertions(+), 2 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 cf980bc..beb2716 100644</span><br><span>--- a/include/osmo-bts/scheduler.h</span><br><span>+++ b/include/osmo-bts/scheduler.h</span><br><span>@@ -264,10 +264,13 @@</span><br><span> uint32_t fn; /*!< TDMA frame number */</span><br><span> uint8_t tn; /*!< TDMA timeslot number */</span><br><span> uint8_t att; /*!< Tx power attenuation */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t mts; /*!< MTS (Modulation and Training Sequence) */</span><br><span> int8_t scpir; /*!< SCPIR (for AQPSK only) */</span><br><span> uint8_t trx_num; /*!< TRX (RF channel) number */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ enum trx_mod_type mod; /*!< Modulation type */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tsc_set; /*!< Training Sequence Set */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tsc; /*!< Training Sequence Code */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Internally used by the scheduler */</span><br><span> enum trx_chan_type chan;</span><br><span> uint8_t bid;</span><br><span>diff --git a/src/common/scheduler.c b/src/common/scheduler.c</span><br><span>index 4af6457..90b9479 100644</span><br><span>--- a/src/common/scheduler.c</span><br><span>+++ b/src/common/scheduler.c</span><br><span>@@ -1217,10 +1217,17 @@</span><br><span> if (!TRX_CHAN_IS_ACTIVE(l1cs, br->chan))</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Training Sequence Code and Set */</span><br><span style="color: hsl(120, 100%, 40%);">+ br->tsc = gsm_ts_tsc(l1ts->ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ br->tsc_set = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* get burst from function */</span><br><span> if (func(l1ts, br) != 0)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Modulation is indicated by func() */</span><br><span style="color: hsl(120, 100%, 40%);">+ br->mod = l1cs->dl_mod_type;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* BS Power reduction (in dB) per logical channel */</span><br><span> if (l1cs->lchan != NULL)</span><br><span> br->att = l1cs->lchan->bs_power_ctrl.current;</span><br><span>diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c</span><br><span>index eae11ee..af1deef 100644</span><br><span>--- a/src/osmo-bts-trx/trx_if.c</span><br><span>+++ b/src/osmo-bts-trx/trx_if.c</span><br><span>@@ -740,6 +740,11 @@</span><br><span> TRX_UL_V2HDR_LEN, /* TRXDv2 */</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const uint8_t trx_data_mod_val[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [TRX_MOD_T_GMSK] = 0x00, /* .00xx... */</span><br><span style="color: hsl(120, 100%, 40%);">+ [TRX_MOD_T_8PSK] = 0x20, /* .010x... */</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Header dissector for TRXDv0 (and part of TRXDv1) */</span><br><span> static inline void trx_data_handle_hdr_v0_part(struct trx_ul_burst_ind *bi,</span><br><span> const uint8_t *buf)</span><br><span>@@ -1105,7 +1110,9 @@</span><br><span> buf[0] = br->tn;</span><br><span> /* BATCH.ind will be unset in the last PDU */</span><br><span> buf[1] = (br->trx_num & 0x3f) | (1 << 7);</span><br><span style="color: hsl(0, 100%, 40%);">- buf[2] = br->mts;</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[2] = trx_data_mod_val[br->mod]</span><br><span style="color: hsl(120, 100%, 40%);">+ | (br->tsc_set << 3)</span><br><span style="color: hsl(120, 100%, 40%);">+ | (br->tsc & 0x07);</span><br><span> buf[3] = br->att;</span><br><span> buf[4] = (uint8_t) br->scpir;</span><br><span> buf[5] = buf[6] = buf[7] = 0x00; /* Spare */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24325">change 24325</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/+/24325"/><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: I1a17a25883214c068f9b1a6d651128b8f760d1fb </div>
<div style="display:none"> Gerrit-Change-Number: 24325 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </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>