Use osmo_tdef to implement T3190

Change-Id: I0c767c526398d98ca47ef98fdaccfc23af11fb0d
This commit is contained in:
Pau Espin 2019-09-09 12:55:01 +02:00 committed by pespin
parent 5211d9deca
commit 38cfa734f4
3 changed files with 4 additions and 6 deletions

View File

@ -79,6 +79,7 @@ static struct osmo_tdef T_defs_bts[] = {
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 },

View File

@ -271,10 +271,6 @@ public:
STAT_MS_PRESENT,
};
enum {
TIMER_T3190_MSEC = 5000,
};
BTS();
~BTS();
void cleanup();

View File

@ -247,8 +247,9 @@ static inline enum tbf_dl_prio tbf_compute_priority(const struct gprs_rlcmac_bts
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;