<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15451">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use osmo_tdef to implement T3190<br><br>Change-Id: I0c767c526398d98ca47ef98fdaccfc23af11fb0d<br>---<br>M src/bts.cpp<br>M src/bts.h<br>M src/gprs_rlcmac_sched.cpp<br>3 files changed, 4 insertions(+), 6 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/51/15451/1</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 5dfba38..73db8b3 100644</span><br><span>--- a/src/bts.cpp</span><br><span>+++ b/src/bts.cpp</span><br><span>@@ -79,6 +79,7 @@</span><br><span> static struct osmo_tdef T_defs_pcu[] = {</span><br><span>  { .T=1,     .default_val=30,  .unit=OSMO_TDEF_S,  .desc="BSSGP (un)blocking procedures timer (s)",  .val=0 },</span><br><span>      { .T=2,     .default_val=30,  .unit=OSMO_TDEF_S,  .desc="BSSGP reset procedure timer (s)",          .val=0 },</span><br><span style="color: hsl(120, 100%, 40%);">+       { .T=3190,  .default_val=5,   .unit=OSMO_TDEF_S,  .desc="Return to packet idle mode after Packet DL Assignment on CCCH (s)", .val=0},</span><br><span>      { .T=-2000, .default_val=2,   .unit=OSMO_TDEF_MS, .desc="Tbf reject for PRR timer (ms)",            .val=0 },</span><br><span>      { .T=-2001, .default_val=2,   .unit=OSMO_TDEF_S,  .desc="PACCH assignment timer (s)",               .val=0 },</span><br><span>      { .T=-2002, .default_val=200, .unit=OSMO_TDEF_MS, .desc="Waiting after IMM.ASS confirm timer (ms)", .val=0 },</span><br><span>diff --git a/src/bts.h b/src/bts.h</span><br><span>index bcb05e4..ac909a7 100644</span><br><span>--- a/src/bts.h</span><br><span>+++ b/src/bts.h</span><br><span>@@ -265,10 +265,6 @@</span><br><span>              STAT_MS_PRESENT,</span><br><span>     };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  enum {</span><br><span style="color: hsl(0, 100%, 40%);">-          TIMER_T3190_MSEC = 5000,</span><br><span style="color: hsl(0, 100%, 40%);">-        };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>   BTS();</span><br><span>       ~BTS();</span><br><span>      void cleanup();</span><br><span>diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp</span><br><span>index 57756e3..72fa75d 100644</span><br><span>--- a/src/gprs_rlcmac_sched.cpp</span><br><span>+++ b/src/gprs_rlcmac_sched.cpp</span><br><span>@@ -214,8 +214,9 @@</span><br><span>                                                   uint8_t ts, uint32_t fn, int age)</span><br><span> {</span><br><span>   const gprs_rlc_dl_window *w = tbf->window();</span><br><span style="color: hsl(0, 100%, 40%);">- int age_thresh1 = msecs_to_frames(200),</span><br><span style="color: hsl(0, 100%, 40%);">-         age_thresh2 = msecs_to_frames(OSMO_MIN(BTS::TIMER_T3190_MSEC/2, bts->dl_tbf_idle_msec));</span><br><span style="color: hsl(120, 100%, 40%);">+   unsigned long msecs = osmo_tdef_get(bts->T_defs_pcu, 3190, OSMO_TDEF_MS, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+      int age_thresh1 = msecs_to_frames(200);</span><br><span style="color: hsl(120, 100%, 40%);">+       int age_thresh2 = msecs_to_frames(OSMO_MIN(msecs/2, bts->dl_tbf_idle_msec));</span><br><span> </span><br><span>  if (tbf->is_control_ts(ts) && tbf->need_control_ts())</span><br><span>          return DL_PRIO_CONTROL;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15451">change 15451</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/+/15451"/><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: I0c767c526398d98ca47ef98fdaccfc23af11fb0d </div>
<div style="display:none"> Gerrit-Change-Number: 15451 </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-MessageType: newchange </div>