aboutsummaryrefslogtreecommitdiffstats
path: root/src/common/sysinfo.c
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-06-23 23:32:37 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-06-24 00:44:13 +0200
commit8b4700dc967bd751a46b42b5789df9bd5ff0335c (patch)
tree31521544d6f1ecf467bf775a5e72c7e70119613e /src/common/sysinfo.c
parent73b071b1d24f814979adcc772480ccd4abb878d1 (diff)
Revert "RSL: receive and send multiple SI2q messages"neels/test
This reverts commit 340cff51f49f6e798cb5fb6d1b9febdd09902906. osmo-gsm-tester detected a regression due to commit 186c6bac0758b6f94aa101e151664b0dea5d8975, which above commit apparently depends on. Revert this along to avoid conflicts. Change-Id: I15bca30ddc09a7a3044096626016f6130d07636c
Diffstat (limited to 'src/common/sysinfo.c')
-rw-r--r--src/common/sysinfo.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/src/common/sysinfo.c b/src/common/sysinfo.c
index 9276c7bb..7a536274 100644
--- a/src/common/sysinfo.c
+++ b/src/common/sysinfo.c
@@ -25,16 +25,6 @@
#include <osmo-bts/logging.h>
#include <osmo-bts/gsm_data.h>
-/* properly increment SI2q index and return SI2q data for scheduling */
-static inline uint8_t *get_si2q_inc_index(struct gsm_bts *bts)
-{
- uint8_t i = bts->si2q_index;
- /* si2q_count is the max si2q_index value, not the number of messages */
- bts->si2q_index = (bts->si2q_index + 1) % (bts->si2q_count + 1);
-
- return (uint8_t *)GSM_BTS_SI2Q(bts, i);
-}
-
/* Apply the rules from 05.02 6.3.1.3 Mapping of BCCH Data */
uint8_t *bts_sysinfo_get(struct gsm_bts *bts, const struct gsm_time *g_time)
{
@@ -109,10 +99,6 @@ uint8_t *bts_sysinfo_get(struct gsm_bts *bts, const struct gsm_time *g_time)
else {
/* increment static counter by one, modulo count */
btsb->si.tc4_ctr = (btsb->si.tc4_ctr + 1) % tc4_cnt;
-
- if (tc4_sub[btsb->si.tc4_ctr] == SYSINFO_TYPE_2quater)
- return get_si2q_inc_index(bts);
-
return GSM_BTS_SI(bts, tc4_sub[btsb->si.tc4_ctr]);
}
case 5:
@@ -128,7 +114,7 @@ uint8_t *bts_sysinfo_get(struct gsm_bts *bts, const struct gsm_time *g_time)
else if (GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_2quater) &&
!GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_2bis) && !GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_2ter))
- return get_si2q_inc_index(bts);
+ return GSM_BTS_SI(bts, SYSINFO_TYPE_2quater);
break;
case 6:
return GSM_BTS_SI(bts, SYSINFO_TYPE_3);