<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/18129">View Change</a></p><div style="white-space:pre-wrap">Approvals:
keith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts: Rename mslot_class_from_ra<br><br>This function is actually returning an EGPRS multislot class, so let's<br>update naming. The variable using the return value was already being<br>passed as egprs_ms_class to tbf_alloc_ul_tbf().<br><br>Change-Id: Idb51836c8c9dd4e865bf2cb0b0c24155662f2ae8<br>---<br>M src/bts.cpp<br>1 file changed, 13 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bts.cpp b/src/bts.cpp</span><br><span>index 5e1725c..8edde23 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -664,12 +664,21 @@</span><br><span> return fn;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static inline uint16_t mslot_class_from_ra(uint16_t ra, bool is_11bit)</span><br><span style="color: hsl(120, 100%, 40%);">+/* 3GPP TS 44.060:</span><br><span style="color: hsl(120, 100%, 40%);">+ * Table 11.2.5.3: PACKET CHANNEL REQUEST</span><br><span style="color: hsl(120, 100%, 40%);">+ * Table 11.2.5a.3: EGPRS PACKET CHANNEL REQUEST</span><br><span style="color: hsl(120, 100%, 40%);">+ * Both GPRS and EGPRS use same MultislotClass coding, but since use of PCCCH is</span><br><span style="color: hsl(120, 100%, 40%);">+ * deprecated, no PACKET CHANNEL REQUEST exists, which means for GPRS we will</span><br><span style="color: hsl(120, 100%, 40%);">+ * receive CCCH RACH which doesn't contain any mslot class. Hence in the end we</span><br><span style="color: hsl(120, 100%, 40%);">+ * can only receive EGPRS mslot class through 11-bit EGPRS PACKET CHANNEL</span><br><span style="color: hsl(120, 100%, 40%);">+ * REQUEST.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+static inline uint16_t egprs_mslot_class_from_ra(uint16_t ra, bool is_11bit)</span><br><span> {</span><br><span> if (is_11bit)</span><br><span> return (ra & 0x3e0) >> 5;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* set multislot class to 0 for 8-bit RACH, since we don't know it yet */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* set EGPRS multislot class to 0 for 8-bit RACH, since we don't know it yet */</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -741,7 +750,7 @@</span><br><span> int plen;</span><br><span> uint8_t usf = 7;</span><br><span> uint8_t tsc = 0, ta = qta2ta(qta);</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t ms_class = mslot_class_from_ra(ra, is_11bit);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t egprs_ms_class = egprs_mslot_class_from_ra(ra, is_11bit);</span><br><span> bool failure = false;</span><br><span> </span><br><span> rach_frame();</span><br><span>@@ -784,8 +793,7 @@</span><br><span> } else {</span><br><span> // Create new TBF</span><br><span> /* FIXME: Copy and paste with other routines.. */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- tbf = tbf_alloc_ul_tbf(&m_bts, NULL, -1, 0, ms_class, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf = tbf_alloc_ul_tbf(&m_bts, NULL, -1, 0, egprs_ms_class, true);</span><br><span> </span><br><span> if (!tbf) {</span><br><span> LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource sending "</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/18129">change 18129</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-pcu/+/18129"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Idb51836c8c9dd4e865bf2cb0b0c24155662f2ae8 </div>
<div style="display:none"> Gerrit-Change-Number: 18129 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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: keith <keith@rhizomatica.org> </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>