diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2017-11-24 12:44:07 +0100 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2017-11-24 12:55:15 +0100 |
| commit | 91c76fd6565283d1043efecd06b88e86288be6fb (patch) | |
| tree | 1e836ec0e1bb45c6358d74d6fd7ce345f3d82905 | |
| parent | 7e78681f0f740bd68ed5255b506a1efa08a231b1 (diff) | |
Use type bool for boolean fields in gsm48_si_ro_info
Change-Id: Ic0981fca96f4927717ca335be1dab00a5d17fd6c
| -rw-r--r-- | include/osmocom/bsc/rest_octets.h | 6 | ||||
| -rw-r--r-- | src/libbsc/system_information.c | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/osmocom/bsc/rest_octets.h b/include/osmocom/bsc/rest_octets.h index e6e5303b2..568505abc 100644 --- a/include/osmocom/bsc/rest_octets.h +++ b/include/osmocom/bsc/rest_octets.h @@ -41,15 +41,15 @@ struct gsm48_lsa_params { struct gsm48_si_ro_info { struct gsm48_si_selection_params selection_params; struct gsm48_si_power_offset power_offset; - uint8_t si2ter_indicator; - uint8_t early_cm_ctrl; + bool si2ter_indicator; + bool early_cm_ctrl; struct { uint8_t where:3, present:1; } scheduling; struct gsm48_si3_gprs_ind gprs_ind; /* SI 3 specific */ - uint8_t si2quater_indicator; + bool si2quater_indicator; /* SI 4 specific */ struct gsm48_lsa_params lsa_params; uint16_t cell_id; diff --git a/src/libbsc/system_information.c b/src/libbsc/system_information.c index 91e993de7..d54dad861 100644 --- a/src/libbsc/system_information.c +++ b/src/libbsc/system_information.c @@ -815,8 +815,8 @@ static struct gsm48_si_ro_info si_info = { .power_offset = { .present = 0, }, - .si2ter_indicator = 0, - .early_cm_ctrl = 1, + .si2ter_indicator = false, + .early_cm_ctrl = true, .scheduling = { .present = 0, }, @@ -825,7 +825,7 @@ static struct gsm48_si_ro_info si_info = { .ra_colour = 0, .present = 1, }, - .si2quater_indicator = 0, + .si2quater_indicator = false, .lsa_params = { .present = 0, }, @@ -859,16 +859,16 @@ static int generate_si3(enum osmo_sysinfo_type t, struct gsm_bts *bts) if (GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_2ter)) { LOGP(DRR, LOGL_INFO, "SI 2ter is included.\n"); - si_info.si2ter_indicator = 1; + si_info.si2ter_indicator = true; } else { - si_info.si2ter_indicator = 0; + si_info.si2ter_indicator = false; } if (GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_2quater)) { LOGP(DRR, LOGL_INFO, "SI 2quater is included, based on %zu EARFCNs and %zu UARFCNs.\n", si2q_earfcn_count(&bts->si_common.si2quater_neigh_list), bts->si_common.uarfcn_length); - si_info.si2quater_indicator = 1; + si_info.si2quater_indicator = true; } else { - si_info.si2quater_indicator = 0; + si_info.si2quater_indicator = false; } si_info.early_cm_ctrl = bts->early_classmark_allowed; |