<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/23388">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: 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;">sysmo: fix wrong FN jumps in rx RA.ind<br><br>There's no need for setting the FN in RA.ind since we anyway already<br>receive a DATA.ind beforehand.<br>Furthermore, the applied delay of 5 in the call is not really used at<br>all.<br><br>Change-Id: I437f4f95d054aea96bec3b9343e495451020ff3c<br>---<br>M src/bts.cpp<br>M src/bts.h<br>M src/osmo-bts-sysmo/sysmo_l1_if.c<br>M src/pcu_l1_if.cpp<br>M src/pcu_l1_if.h<br>M tests/tbf/TbfTest.cpp<br>6 files changed, 4 insertions(+), 13 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 c1cee17..dc4159c 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -305,7 +305,7 @@</span><br><span> return (fn + GSM_MAX_FN * 3 / 2 - to) % GSM_MAX_FN - GSM_MAX_FN/2;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void bts_set_current_block_frame_number(struct gprs_rlcmac_bts *bts, int fn, unsigned max_delay)</span><br><span style="color: hsl(120, 100%, 40%);">+void bts_set_current_block_frame_number(struct gprs_rlcmac_bts *bts, int fn)</span><br><span> {</span><br><span> int delay = 0;</span><br><span> const int late_block_delay_thresh = 13;</span><br><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index 9336c89..ab8a973 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -276,7 +276,7 @@</span><br><span> void bts_snd_dl_ass(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf, bool poll, uint16_t pgroup);</span><br><span> </span><br><span> void bts_set_current_frame_number(struct gprs_rlcmac_bts *bts, uint32_t frame_number);</span><br><span style="color: hsl(0, 100%, 40%);">-void bts_set_current_block_frame_number(struct gprs_rlcmac_bts *bts, int frame_number, unsigned max_delay);</span><br><span style="color: hsl(120, 100%, 40%);">+void bts_set_current_block_frame_number(struct gprs_rlcmac_bts *bts, int frame_number);</span><br><span> static inline uint32_t bts_current_frame_number(const struct gprs_rlcmac_bts *bts)</span><br><span> {</span><br><span> return bts->cur_fn;</span><br><span>diff --git a/src/osmo-bts-sysmo/sysmo_l1_if.c b/src/osmo-bts-sysmo/sysmo_l1_if.c</span><br><span>index eb869e1..29656d7 100644</span><br><span>--- a/src/osmo-bts-sysmo/sysmo_l1_if.c</span><br><span>+++ b/src/osmo-bts-sysmo/sysmo_l1_if.c</span><br><span>@@ -240,8 +240,6 @@</span><br><span> struct gprs_rlcmac_bts *bts;</span><br><span> bts = llist_first_entry_or_null(&the_pcu->bts_list, struct gprs_rlcmac_bts, list);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- pcu_rx_ra_time(bts, ra_ind->u16Arfcn, ra_ind->u32Fn, ra_ind->u8Tn);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (ra_ind->measParam.fLinkQuality < MIN_QUAL_RACH)</span><br><span> return 0;</span><br><span> </span><br><span>diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp</span><br><span>index f28c46f..0ccf642 100644</span><br><span>--- a/src/pcu_l1_if.cpp</span><br><span>+++ b/src/pcu_l1_if.cpp</span><br><span>@@ -273,13 +273,7 @@</span><br><span> </span><br><span> void pcu_rx_block_time(struct gprs_rlcmac_bts *bts, uint16_t arfcn, uint32_t fn, uint8_t ts_no)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- bts_set_current_block_frame_number(bts, fn, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void pcu_rx_ra_time(struct gprs_rlcmac_bts *bts, uint16_t arfcn, uint32_t fn, uint8_t ts_no)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- /* access bursts may arrive some bursts earlier */</span><br><span style="color: hsl(0, 100%, 40%);">- bts_set_current_block_frame_number(bts, fn, 5);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_set_current_block_frame_number(bts, fn);</span><br><span> }</span><br><span> </span><br><span> int pcu_rx_data_ind_pdtch(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_pdch *pdch, uint8_t *data,</span><br><span>diff --git a/src/pcu_l1_if.h b/src/pcu_l1_if.h</span><br><span>index aff23f5..246444c 100644</span><br><span>--- a/src/pcu_l1_if.h</span><br><span>+++ b/src/pcu_l1_if.h</span><br><span>@@ -177,7 +177,6 @@</span><br><span> uint8_t len, uint32_t fn, struct pcu_l1_meas *meas);</span><br><span> </span><br><span> void pcu_rx_block_time(struct gprs_rlcmac_bts *bts, uint16_t arfcn, uint32_t fn, uint8_t ts_no);</span><br><span style="color: hsl(0, 100%, 40%);">-void pcu_rx_ra_time(struct gprs_rlcmac_bts *bts, uint16_t arfcn, uint32_t fn, uint8_t ts_no);</span><br><span> uint16_t imsi2paging_group(const char* imsi);</span><br><span> #ifdef __cplusplus</span><br><span> }</span><br><span>diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp</span><br><span>index 2986132..46667b4 100644</span><br><span>--- a/tests/tbf/TbfTest.cpp</span><br><span>+++ b/tests/tbf/TbfTest.cpp</span><br><span>@@ -627,7 +627,7 @@</span><br><span> static void send_ul_mac_block_buf(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_pdch *pdch,</span><br><span> unsigned fn, uint8_t *buf, int num_bytes)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- bts_set_current_block_frame_number(bts, fn, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_set_current_block_frame_number(bts, fn);</span><br><span> pdch->rcv_block(buf, num_bytes, fn, &meas);</span><br><span> pdch_ulc_expire_fn(pdch->ulc, fn);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/23388">change 23388</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/+/23388"/><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: I437f4f95d054aea96bec3b9343e495451020ff3c </div>
<div style="display:none"> Gerrit-Change-Number: 23388 </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 <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>