diff options
| author | Max <msuraev@sysmocom.de> | 2017-06-02 11:40:02 +0200 |
|---|---|---|
| committer | Max <msuraev@sysmocom.de> | 2017-06-15 13:22:12 +0000 |
| commit | 61d36212b15aca972443a169c6a893590c9709d0 (patch) | |
| tree | a7dc9f911785b1de04c57bf8bcb0959f8d4c9759 /src/common | |
| parent | de9357251c53af4e5abee5724c098d1db6271bf9 (diff) | |
Cleanup SI scheduling
* use GSM_BTS_HAS_SI() from OpenBSC instead of local copy
* arrange GSM_BTS_HAS_SI() checks to improve readability
* constify SI scheduler parameters
Change-Id: If74bc536fe7d2bfbc976c07d882151873ecda4f2
Related: OS#1660
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/sysinfo.c | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/src/common/sysinfo.c b/src/common/sysinfo.c index d8671c80..7a536274 100644 --- a/src/common/sysinfo.c +++ b/src/common/sysinfo.c @@ -25,10 +25,8 @@ #include <osmo-bts/logging.h> #include <osmo-bts/gsm_data.h> -#define BTS_HAS_SI(bts, sinum) ((bts)->si_valid & (1 << sinum)) - /* Apply the rules from 05.02 6.3.1.3 Mapping of BCCH Data */ -uint8_t *bts_sysinfo_get(struct gsm_bts *bts, struct gsm_time *g_time) +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; @@ -77,22 +75,20 @@ uint8_t *bts_sysinfo_get(struct gsm_bts *bts, struct gsm_time *g_time) /* iterate over 2ter, 2quater, 9, 13 */ /* determine how many SI we need to send on TC=4, * and which of them we send when */ - if (BTS_HAS_SI(bts, SYSINFO_TYPE_2ter) && - BTS_HAS_SI(bts, SYSINFO_TYPE_2bis)) { + if (GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_2ter) && GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_2bis)) { tc4_sub[tc4_cnt] = SYSINFO_TYPE_2ter; tc4_cnt += 1; } - if (BTS_HAS_SI(bts, SYSINFO_TYPE_2quater) && - (BTS_HAS_SI(bts, SYSINFO_TYPE_2bis) || - BTS_HAS_SI(bts, SYSINFO_TYPE_2ter))) { + 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))) { tc4_sub[tc4_cnt] = SYSINFO_TYPE_2quater; tc4_cnt += 1; } - if (BTS_HAS_SI(bts, SYSINFO_TYPE_13)) { + if (GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_13)) { tc4_sub[tc4_cnt] = SYSINFO_TYPE_13; tc4_cnt += 1; } - if (BTS_HAS_SI(bts, SYSINFO_TYPE_9)) { + if (GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_9)) { /* FIXME: check SI3 scheduling info! */ tc4_sub[tc4_cnt] = SYSINFO_TYPE_9; tc4_cnt += 1; @@ -107,21 +103,17 @@ uint8_t *bts_sysinfo_get(struct gsm_bts *bts, struct gsm_time *g_time) } case 5: /* 2bis, 2ter, 2quater */ - if (BTS_HAS_SI(bts, SYSINFO_TYPE_2bis) && - !BTS_HAS_SI(bts, SYSINFO_TYPE_2ter)) + if (GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_2bis) && !GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_2ter)) return GSM_BTS_SI(bts, SYSINFO_TYPE_2bis); - else if (BTS_HAS_SI(bts, SYSINFO_TYPE_2ter) && - !BTS_HAS_SI(bts, SYSINFO_TYPE_2bis)) + else if (GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_2ter) && !GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_2bis)) return GSM_BTS_SI(bts, SYSINFO_TYPE_2ter); - else if (BTS_HAS_SI(bts, SYSINFO_TYPE_2bis) && - BTS_HAS_SI(bts, SYSINFO_TYPE_2ter)) + else if (GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_2bis) && GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_2ter)) return GSM_BTS_SI(bts, SYSINFO_TYPE_2bis); - else if (BTS_HAS_SI(bts, SYSINFO_TYPE_2quater) && - !BTS_HAS_SI(bts, SYSINFO_TYPE_2bis) && - !BTS_HAS_SI(bts, SYSINFO_TYPE_2ter)) + 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 GSM_BTS_SI(bts, SYSINFO_TYPE_2quater); break; case 6: @@ -137,7 +129,7 @@ uint8_t num_agch(struct gsm_bts_trx *trx, const char * arg) { struct gsm_bts *b = trx->bts; struct gsm48_system_information_type_3 *si3; - if (BTS_HAS_SI(b, SYSINFO_TYPE_3)) { + if (GSM_BTS_HAS_SI(b, SYSINFO_TYPE_3)) { si3 = GSM_BTS_SI(b, SYSINFO_TYPE_3); return si3->control_channel_desc.bs_ag_blks_res; } |