<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/19788">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">encoding: implement handing of hopping parameters<br><br>The following test cases verify coding of the hopping parameters:<br><br> + (RR) Immediate Assignment<br> - TC_pcuif_fh_imm_ass_ul_egprs,<br> - TC_pcuif_fh_imm_ass_ul,<br> - TC_pcuif_fh_imm_ass_dl,<br><br> + (RLC/MAC) Packet Uplink/Downlink Assignment:<br> - TC_pcuif_fh_pkt_ass_ul,<br> - TC_pcuif_fh_pkt_ass_dl,<br><br>all of them pass with this (and the upcoming) change applied.<br><br>Change-Id: I8adc0cdb1b05a87b4df5d4bc196f6d381283a06f<br>Related: SYS#4868, OS#4547<br>---<br>M src/encoding.cpp<br>M src/pdch.h<br>2 files changed, 83 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/88/19788/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/encoding.cpp b/src/encoding.cpp</span><br><span>index 33fe196..ef2524b 100644</span><br><span>--- a/src/encoding.cpp</span><br><span>+++ b/src/encoding.cpp</span><br><span>@@ -466,8 +466,15 @@</span><br><span> bitvec_write_field(dest, &wp, pdch->ts_no, 3); // TN</span><br><span> bitvec_write_field(dest, &wp, pdch->tsc, 3); // TSC</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_write_field(dest, &wp, 0x00, 3); // spare (non-hopping RF channel configuraion)</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_write_field(dest, &wp, pdch->trx->arfcn, 10); // ARFCN</span><br><span style="color: hsl(120, 100%, 40%);">+ /* RF channel configuraion: hopping or non-hopping */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdch->fh.enabled) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, 0x01, 1); /* direct encoding */</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, pdch->fh.maio, 6);</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, pdch->fh.hsn, 6);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, 0x00, 3);</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, pdch->trx->arfcn, 10);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> //10.5.2.30 Request Reference</span><br><span> if (((burst_type == GSM_L1_BURST_TYPE_ACCESS_1) ||</span><br><span>@@ -485,9 +492,18 @@</span><br><span> bitvec_write_field(dest, &wp,0x0,2); // spare</span><br><span> bitvec_write_field(dest, &wp,ta,6); // Timing Advance value</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- // No mobile allocation in non-hopping systems.</span><br><span style="color: hsl(0, 100%, 40%);">- // A zero-length LV. Just write L=0.</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_write_field(dest, &wp,0,8);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 10.5.2.21 Mobile Allocation */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdch->fh.enabled) {</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(pdch->fh.ma_len <= ARRAY_SIZE(pdch->fh.ma));</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, pdch->fh.ma_len, 8);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (int i = 0; i < pdch->fh.ma_len; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, pdch->fh.ma[i], 8);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ // No mobile allocation in non-hopping systems.</span><br><span style="color: hsl(120, 100%, 40%);">+ // A zero-length LV. Just write L=0.</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, 0x00, 8);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> OSMO_ASSERT(wp % 8 == 0);</span><br><span> </span><br><span>@@ -535,6 +551,55 @@</span><br><span> return plen;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Prepare to be encoded Frequency Parameters IE (see Table 12.8.1) */</span><br><span style="color: hsl(120, 100%, 40%);">+static void gen_freq_params(Frequency_Parameters_t *freq_params,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gprs_rlcmac_tbf *tbf)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gprs_rlcmac_pdch *pdch = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ Direct_encoding_1_t fh_params;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Training Sequence Code */</span><br><span style="color: hsl(120, 100%, 40%);">+ freq_params->TSC = tbf->tsc();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Find at least one PDCH, if it's hopping then all other should too */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (unsigned int tn = 0; tn < 8; tn++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (tbf->pdch[tn] != NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ pdch = tbf->pdch[tn];</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If frequency hopping is not in use, encode a single ARFCN */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdch == NULL || !pdch->fh.enabled) {</span><br><span style="color: hsl(120, 100%, 40%);">+ freq_params->UnionType = 0x00;</span><br><span style="color: hsl(120, 100%, 40%);">+ freq_params->u.ARFCN = tbf->trx->arfcn;</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Direct encoding 1 (see Table 12.8.1) */</span><br><span style="color: hsl(120, 100%, 40%);">+ freq_params->UnionType = 0x2;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* HSN / MAIO */</span><br><span style="color: hsl(120, 100%, 40%);">+ fh_params.MAIO = pdch->fh.maio;</span><br><span style="color: hsl(120, 100%, 40%);">+ fh_params.GPRS_Mobile_Allocation.HSN = pdch->fh.hsn;</span><br><span style="color: hsl(120, 100%, 40%);">+ fh_params.GPRS_Mobile_Allocation.ElementsOf_RFL_NUMBER = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Mobile Allocation bitmap */</span><br><span style="color: hsl(120, 100%, 40%);">+ fh_params.GPRS_Mobile_Allocation.UnionType = 0; /* MA bitmap */</span><br><span style="color: hsl(120, 100%, 40%);">+ fh_params.GPRS_Mobile_Allocation.u.MA.MA_LENGTH = pdch->fh.ma_len; /* in bytes */</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(fh_params.GPRS_Mobile_Allocation.u.MA.MA_BITMAP, pdch->fh.ma, pdch->fh.ma_len);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Mobile Allocation bitmap length (in bits) */</span><br><span style="color: hsl(120, 100%, 40%);">+ fh_params.GPRS_Mobile_Allocation.u.MA.MA_BitLength = pdch->fh.ma_len * 8;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (unsigned int i = 0; i < 8; i++) { /* skip redundant bits */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdch->fh.ma[0] & (0x80 >> i))</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ fh_params.GPRS_Mobile_Allocation.u.MA.MA_BitLength--;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ freq_params->u.Direct_encoding_1 = fh_params;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* generate uplink assignment */</span><br><span> void Encoding::write_packet_uplink_assignment(</span><br><span> RlcMacDownlink_t * block, uint8_t old_tfi,</span><br><span>@@ -621,9 +686,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Frequency Parameters IE */</span><br><span style="color: hsl(0, 100%, 40%);">- fp->TSC = tbf->tsc(); // Training Sequence Code (TSC)</span><br><span style="color: hsl(0, 100%, 40%);">- fp->UnionType = 0x00; // Single ARFCN</span><br><span style="color: hsl(0, 100%, 40%);">- fp->u.ARFCN = tbf->trx->arfcn;</span><br><span style="color: hsl(120, 100%, 40%);">+ gen_freq_params(fp, tbf);</span><br><span> </span><br><span> /* Dynamic allocation parameters */</span><br><span> da->USF_GRANULARITY = 0x00;</span><br><span>@@ -715,9 +778,7 @@</span><br><span> block->u.Packet_Downlink_Assignment.Exist_P0_and_BTS_PWR_CTRL_MODE = 0x0; // POWER CONTROL = off</span><br><span> </span><br><span> block->u.Packet_Downlink_Assignment.Exist_Frequency_Parameters = 0x1; // Frequency Parameters = on</span><br><span style="color: hsl(0, 100%, 40%);">- block->u.Packet_Downlink_Assignment.Frequency_Parameters.TSC = tbf->tsc(); // Training Sequence Code (TSC)</span><br><span style="color: hsl(0, 100%, 40%);">- block->u.Packet_Downlink_Assignment.Frequency_Parameters.UnionType = 0x0; // ARFCN = on</span><br><span style="color: hsl(0, 100%, 40%);">- block->u.Packet_Downlink_Assignment.Frequency_Parameters.u.ARFCN = tbf->trx->arfcn; // ARFCN</span><br><span style="color: hsl(120, 100%, 40%);">+ gen_freq_params(&block->u.Packet_Downlink_Assignment.Frequency_Parameters, tbf);</span><br><span> </span><br><span> block->u.Packet_Downlink_Assignment.Exist_DOWNLINK_TFI_ASSIGNMENT = 0x1; // DOWNLINK TFI ASSIGNMENT = on</span><br><span> block->u.Packet_Downlink_Assignment.DOWNLINK_TFI_ASSIGNMENT = tbf->tfi(); // TFI</span><br><span>diff --git a/src/pdch.h b/src/pdch.h</span><br><span>index ec35174..6ed4931 100644</span><br><span>--- a/src/pdch.h</span><br><span>+++ b/src/pdch.h</span><br><span>@@ -106,6 +106,17 @@</span><br><span> void update_ta(uint8_t tai, uint8_t ta);</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Frequency hopping parameters */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ bool enabled;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 3GPP TS 45.002 HSN / MAIO (6 bit each) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t hsn;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t maio;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 3GPP TS 44.018, 10.5.2.21 "Mobile Allocation" */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ma_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ma[8];</span><br><span style="color: hsl(120, 100%, 40%);">+ } fh;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* back pointers */</span><br><span> struct gprs_rlcmac_trx *trx;</span><br><span> uint8_t ts_no;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/19788">change 19788</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/+/19788"/><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: I8adc0cdb1b05a87b4df5d4bc196f6d381283a06f </div>
<div style="display:none"> Gerrit-Change-Number: 19788 </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>