pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-pcu/+/15451 )
Change subject: Use osmo_tdef to implement T3190 ...................................................................... Use osmo_tdef to implement T3190 Change-Id: I0c767c526398d98ca47ef98fdaccfc23af11fb0d --- M src/bts.cpp M src/bts.h M src/gprs_rlcmac_sched.cpp 3 files changed, 4 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/bts.cpp b/src/bts.cpp index 2600d72..ae6117e 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -79,6 +79,7 @@ static struct osmo_tdef T_defs_pcu[] = { { .T=1, .default_val=30, .unit=OSMO_TDEF_S, .desc="BSSGP (un)blocking procedures timer (s)", .val=0 }, { .T=2, .default_val=30, .unit=OSMO_TDEF_S, .desc="BSSGP reset procedure timer (s)", .val=0 }, + { .T=3190, .default_val=5, .unit=OSMO_TDEF_S, .desc="Return to packet idle mode after Packet DL Assignment on CCCH (s)", .val=0}, { .T=-2000, .default_val=2, .unit=OSMO_TDEF_MS, .desc="Tbf reject for PRR timer (ms)", .val=0 }, { .T=-2001, .default_val=2, .unit=OSMO_TDEF_S, .desc="PACCH assignment timer (s)", .val=0 }, { .T=-2002, .default_val=200, .unit=OSMO_TDEF_MS, .desc="Waiting after IMM.ASS confirm timer (ms)", .val=0 }, diff --git a/src/bts.h b/src/bts.h index 6af6d52..5e7eeae 100644 --- a/src/bts.h +++ b/src/bts.h @@ -271,10 +271,6 @@ STAT_MS_PRESENT, }; - enum { - TIMER_T3190_MSEC = 5000, - }; - BTS(); ~BTS(); void cleanup(); diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index 7356523..da54d9f 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -247,8 +247,9 @@ uint8_t ts, uint32_t fn, int age) { const gprs_rlc_dl_window *w = tbf->window(); - int age_thresh1 = msecs_to_frames(200), - age_thresh2 = msecs_to_frames(OSMO_MIN(BTS::TIMER_T3190_MSEC/2, bts->dl_tbf_idle_msec)); + unsigned long msecs = osmo_tdef_get(bts->T_defs_pcu, 3190, OSMO_TDEF_MS, -1); + int age_thresh1 = msecs_to_frames(200); + int age_thresh2 = msecs_to_frames(OSMO_MIN(msecs/2, bts->dl_tbf_idle_msec)); if (tbf->is_control_ts(ts) && tbf->need_control_ts()) return DL_PRIO_CONTROL; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/15451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0c767c526398d98ca47ef98fdaccfc23af11fb0d Gerrit-Change-Number: 15451 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pes...@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <lafo...@gnumonks.org> Gerrit-Reviewer: lynxis lazus <lyn...@fe80.eu> Gerrit-Reviewer: pespin <pes...@sysmocom.de> Gerrit-MessageType: merged