aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2022-03-02 17:20:24 +0100
committerPau Espin Pedrol <pespin@sysmocom.de>2022-03-02 17:54:58 +0100
commit226c1d37082ac54fb7dffdb00e66fac7d792b1ae (patch)
tree2323db65665a776984b165793a71c341ec3b0fe7
parent8bddaf79ef9182a8b3da8767fb87f3942bf1c10e (diff)
ipa oml: Fix encoding of T3105
As the comment above the fix suggest, the encoding is in 10ms units. osmo-bts is also doing the proper: """ uint8_t t3105 = *TLVP_VAL(&tp, NM_ATT_BTS_AIR_TIMER); bts->t3105_ms = t3105 * 10; """ Related: SYS#5838 Change-Id: Ie190514ee35d1ca81b70e9180bf7393b973d3504 (cherry picked from commit 8f1597135dc6be84d3b368a2ae78b18383cfb578)
-rw-r--r--src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c2
-rw-r--r--tests/nanobts_omlattr/nanobts_omlattr_test.c2
-rw-r--r--tests/nanobts_omlattr/nanobts_omlattr_test.ok4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c
index aac0ddfd1..d5b42158f 100644
--- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c
+++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c
@@ -85,7 +85,7 @@ struct msgb *nanobts_attr_bts_get(struct gsm_bts *bts)
msgb_tv_fixed_put(msgb, NM_ATT_LDAVG_SLOTS, 2, buf);
/* 10 milliseconds */
- msgb_tv_put(msgb, NM_ATT_BTS_AIR_TIMER, osmo_tdef_get(bts->network->T_defs, 3105, OSMO_TDEF_MS, -1));
+ msgb_tv_put(msgb, NM_ATT_BTS_AIR_TIMER, osmo_tdef_get(bts->network->T_defs, 3105, OSMO_TDEF_MS, -1)/10);
/* 10 retransmissions of physical config */
msgb_tv_put(msgb, NM_ATT_NY1, 10);
diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c
index e15d20ef1..ecf5f824b 100644
--- a/tests/nanobts_omlattr/nanobts_omlattr_test.c
+++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c
@@ -167,7 +167,7 @@ int main(int argc, char **argv)
0x02, 0x01, 0x20, 0x33, 0x1e, 0x24, 0x24, 0xa8, 0x34, 0x21,
0xa8, 0x1f, 0x3f, 0x25,
0x00, 0x01, 0x0a, 0x0c, 0x0a, 0x0b, 0x01, 0x2a, 0x5a, 0x2b,
- 0x03, 0xe8, 0x0a, 0x0d,
+ 0x03, 0xe8, 0x0a, 0x01,
0x23, 0x0a, 0x08, 0x03, 0x62, 0x09, 0x3f, 0x99, 0x00, 0x07,
0x00, 0xf1, 0x10, 0x00,
0x01, 0x05, 0x39
diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.ok b/tests/nanobts_omlattr/nanobts_omlattr_test.ok
index e1029a4bf..faeac7b38 100644
--- a/tests/nanobts_omlattr/nanobts_omlattr_test.ok
+++ b/tests/nanobts_omlattr/nanobts_omlattr_test.ok
@@ -1,6 +1,6 @@
Testing nanobts_attr_bts_get()...
-result= 19736d67615b5518060e00020120331e2424a83421a81f3f2500010a0c0a0b012a5a2b03e80a0d230a080362093f99000700f11000010539
-expected=19736d67615b5518060e00020120331e2424a83421a81f3f2500010a0c0a0b012a5a2b03e80a0d230a080362093f99000700f11000010539
+result= 19736d67615b5518060e00020120331e2424a83421a81f3f2500010a0c0a0b012a5a2b03e80a01230a080362093f99000700f11000010539
+expected=19736d67615b5518060e00020120331e2424a83421a81f3f2500010a0c0a0b012a5a2b03e80a01230a080362093f99000700f11000010539
ok.
Testing nanobts_attr_nse_get()...