diff options
| author | Andreas Eversberg <jolly@eversberg.eu> | 2013-06-12 08:30:53 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-01-19 16:03:16 +0100 |
| commit | 30b6df607e899a3e6d6ac742d8501cab2e69264a (patch) | |
| tree | e787a88c9781e80911d89be039fe4e831018b907 | |
| parent | 5d45c0732a3debf967833458628d3889300f50b5 (diff) | |
Correctly set T3105 for ipaccess BTS type
The given value is 10 * ms, so 13 is used instead of 128.
If T3105 is set at config to something greater 0, it is used instead of
the default value.
Adjusst nanobts_omlattr_test.c accordingly.
Change-Id: I3d9687619ba4de35f5d2eff3026d903534b2bbd4
| -rw-r--r-- | src/libbsc/bts_ipaccess_nanobts_omlattr.c | 4 | ||||
| -rw-r--r-- | tests/nanobts_omlattr/nanobts_omlattr_test.c | 2 | ||||
| -rw-r--r-- | tests/nanobts_omlattr/nanobts_omlattr_test.ok | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/libbsc/bts_ipaccess_nanobts_omlattr.c b/src/libbsc/bts_ipaccess_nanobts_omlattr.c index 22ae48453..926322c84 100644 --- a/src/libbsc/bts_ipaccess_nanobts_omlattr.c +++ b/src/libbsc/bts_ipaccess_nanobts_omlattr.c @@ -89,8 +89,8 @@ struct msgb *nanobts_attr_bts_get(struct gsm_bts *bts) } msgb_tv_fixed_put(msgb, NM_ATT_LDAVG_SLOTS, 2, buf); - /* miliseconds */ - msgb_tv_put(msgb, NM_ATT_BTS_AIR_TIMER, 128); + /* 10 milliseconds */ + msgb_tv_put(msgb, NM_ATT_BTS_AIR_TIMER, bts->network->T3105 > 0? bts->network->T3105 : 13); /* 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 cdb37a365..674148a25 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.c +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c @@ -219,7 +219,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, 0x0a, 0x2b, - 0x03, 0xe8, 0x0a, 0x80, + 0x03, 0xe8, 0x0a, 0x0d, 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 91b655f8f..9504c090d 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= 19555b61676d7318060e00020120331e2424a83421a81f3f2500010a0c0a0b012a0a2b03e80a80230a080362093f99000700f11000010539 -expected=19555b61676d7318060e00020120331e2424a83421a81f3f2500010a0c0a0b012a0a2b03e80a80230a080362093f99000700f11000010539 +result= 19555b61676d7318060e00020120331e2424a83421a81f3f2500010a0c0a0b012a0a2b03e80a0d230a080362093f99000700f11000010539 +expected=19555b61676d7318060e00020120331e2424a83421a81f3f2500010a0c0a0b012a0a2b03e80a0d230a080362093f99000700f11000010539 ok. Testing nanobts_attr_nse_get()... |