cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

Use type bool for boolean fields in gsm48_si_ro_info 

Change-Id: Ic0981fca96f4927717ca335be1dab00a5d17fd6c
This commit is contained in:
Pau Espin 2017-11-24 12:44:07 +01:00
parent 7e78681f0f
commit 91c76fd656
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/osmocom/bsc/rest_octets.h
View File

@ -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;

14
src/libbsc/system_information.c
View File

@ -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;