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-27 12:33:13 +0100 |
| commit | 75042ff46a7e89ffb9a8897214c63e0bda378147 (patch) | |
| tree | cd294a67ffc0306c3e124223d64a95c6fe947779 | |
| parent | 0195c30df582811dd0252fb6b455c156f4a7ee95 (diff) | |
Use type bool for boolean fields in gsm48_si_ro_info
Change-Id: Ic0981fca96f4927717ca335be1dab00a5d17fd6c
| -rw-r--r-- | openbsc/include/openbsc/rest_octets.h | 6 | ||||
| -rw-r--r-- | openbsc/src/libbsc/system_information.c | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/openbsc/include/openbsc/rest_octets.h b/openbsc/include/openbsc/rest_octets.h index ca7b57c95..a2750c154 100644 --- a/openbsc/include/openbsc/rest_octets.h +++ b/openbsc/include/openbsc/rest_octets.h @@ -40,15 +40,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/openbsc/src/libbsc/system_information.c b/openbsc/src/libbsc/system_information.c index abb1a6dc9..b27465e77 100644 --- a/openbsc/src/libbsc/system_information.c +++ b/openbsc/src/libbsc/system_information.c @@ -802,8 +802,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, }, @@ -812,7 +812,7 @@ static struct gsm48_si_ro_info si_info = { .ra_colour = 0, .present = 1, }, - .si2quater_indicator = 0, + .si2quater_indicator = false, .lsa_params = { .present = 0, }, @@ -846,16 +846,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; |