pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-pcu/+/33351 )
Change subject: Store T3192 value received from SI13, do some sanity checks
......................................................................
Store T3192 value received from SI13, do some sanity checks
Timer T3192 may be used in the future to know wheter a DL TBF assignment
can be sent on PACCH after the last DL TBF has finished (final ACK).
Change-Id: Ie5f6251ee773f56771f9a9507711a20e6282aac6
---
M src/bts.cpp
M src/pcu_l1_if.cpp
2 files changed, 19 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/bts.cpp b/src/bts.cpp
index 2dbccda..177544a 100644
--- a/src/bts.cpp
+++ b/src/bts.cpp
@@ -80,6 +80,7 @@
{ .T=3168, .default_val=4000, .unit=OSMO_TDEF_MS, .desc="Time MS waits
for PACKET UPLINK ACK when establishing a UL TBF", .val=0 },
{ .T=3169, .default_val=5, .unit=OSMO_TDEF_S, .desc="Reuse of USF
and TFI(s) after the MS uplink TBF assignment is invalid", .val=0 },
{ .T=3191, .default_val=5, .unit=OSMO_TDEF_S, .desc="Reuse of TFI(s)
after sending (1) last RLC Data Block on TBF(s), or (2) PACKET TBF RELEASE for
an MBMS radio bearer", .val=0 },
+ { .T=3192, .default_val=1500, .unit=OSMO_TDEF_MS, .desc="Time MS stays
monitoring the PDCH after transmitting DL ACK/NACK for last DL block (FBI=1).
Configured at the BSC (SI13).", .val=0 },
{ .T=3193, .default_val=1600, .unit=OSMO_TDEF_MS, .desc="Reuse of
TFI(s) after reception of final PACKET DOWNLINK ACK/NACK from MS for TBF",
.val=0 },
{ .T=3195, .default_val=5, .unit=OSMO_TDEF_S, .desc="Reuse of TFI(s)
upon no response from the MS (radio failure or cell change) for TBF/MBMS radio
bearer", .val=0 },
{ .T = -16, .default_val = 1000, .unit = OSMO_TDEF_MS,
diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp
index 686853c..a256962 100644
--- a/src/pcu_l1_if.cpp
+++ b/src/pcu_l1_if.cpp
@@ -436,8 +436,13 @@
si_ro = ((struct
gsm48_system_information_type_13*)data)->rest_octets;
if
(osmo_gsm48_rest_octets_si13_decode(&bts->si13_ro_decoded, si_ro) < 0)
LOGP(DPCU, LOGL_ERROR, "Error decoding SI13\n");
- /* Update our cached T3168 from it: */
+ /* Update our cached timers from it: */
osmo_tdef_set(bts->T_defs_bts, 3168,
bts->si13_ro_decoded.cell_opts.t3168, OSMO_TDEF_MS);
+ osmo_tdef_set(bts->T_defs_bts, 3192,
bts->si13_ro_decoded.cell_opts.t3192, OSMO_TDEF_MS);
+ /* Some sanity checks: */
+ if (bts->si13_ro_decoded.cell_opts.t3192 >=
+ osmo_tdef_get(bts->T_defs_bts, 3193, OSMO_TDEF_MS,
-1))
+ LOGP(DL1IF, LOGL_ERROR, "Timers incorrectly
configured! T3192 >= T3193\n");
break;
default:
LOGP(DL1IF, LOGL_ERROR,
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33351
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: Ie5f6251ee773f56771f9a9507711a20e6282aac6
Gerrit-Change-Number: 33351
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
