diff options
author | Harald Welte <laforge@gnumonks.org> | 2018-03-17 12:22:40 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2018-03-17 13:40:03 +0100 |
commit | d8cd756da48bcff9f9caf9e64fc0af047a165b60 (patch) | |
tree | 136d09901ae8420803500d92646944376ae21f59 /src/common/sysinfo.c | |
parent | 7c4a22dbc48f51eb199766bf1b29e061bf765cbd (diff) |
Get rid of 'struct gsm_bts_role_bts'
gsm_bts_role_bts was introduced at a time when we still shared
gsm_data_shared.[ch] between BSC and BTS, and where we then subsequently
needed a BTS-private structure. Since that sharing was abandoned quite
some time ago, we can merge gsm_bts_role_bts into gsm_bts and do away
with the bts/btsb dualism in a lot of the code.
Change-Id: I4fdd601ea873d9697f89a748cc77bcf7c978fa3e
Diffstat (limited to 'src/common/sysinfo.c')
-rw-r--r-- | src/common/sysinfo.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/common/sysinfo.c b/src/common/sysinfo.c index b5fd061d..f5f9c7ec 100644 --- a/src/common/sysinfo.c +++ b/src/common/sysinfo.c @@ -38,7 +38,6 @@ static inline uint8_t *get_si2q_inc_index(struct gsm_bts *bts) /* 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) { - struct gsm_bts_role_bts *btsb = bts_role_bts(bts); unsigned int tc4_cnt = 0; unsigned int tc4_sub[4]; @@ -110,12 +109,12 @@ uint8_t *bts_sysinfo_get(struct gsm_bts *bts, const struct gsm_time *g_time) return GSM_BTS_SI(bts, SYSINFO_TYPE_2); else { /* increment static counter by one, modulo count */ - btsb->si.tc4_ctr = (btsb->si.tc4_ctr + 1) % tc4_cnt; + bts->si.tc4_ctr = (bts->si.tc4_ctr + 1) % tc4_cnt; - if (tc4_sub[btsb->si.tc4_ctr] == SYSINFO_TYPE_2quater) + if (tc4_sub[bts->si.tc4_ctr] == SYSINFO_TYPE_2quater) return get_si2q_inc_index(bts); - return GSM_BTS_SI(bts, tc4_sub[btsb->si.tc4_ctr]); + return GSM_BTS_SI(bts, tc4_sub[bts->si.tc4_ctr]); } case 5: /* 2bis, 2ter, 2quater */ |