Review at  https://gerrit.osmocom.org/5036

Use type bool for boolean fields in gsm48_si_ro_info

Change-Id: Ic0981fca96f4927717ca335be1dab00a5d17fd6c
---
M openbsc/include/openbsc/rest_octets.h
M openbsc/src/libbsc/system_information.c
2 files changed, 10 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/36/5036/1

diff --git a/openbsc/include/openbsc/rest_octets.h 
b/openbsc/include/openbsc/rest_octets.h
index ca7b57c..a2750c1 100644
--- a/openbsc/include/openbsc/rest_octets.h
+++ b/openbsc/include/openbsc/rest_octets.h
@@ -40,15 +40,15 @@
 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 abb1a6d..b27465e 100644
--- a/openbsc/src/libbsc/system_information.c
+++ b/openbsc/src/libbsc/system_information.c
@@ -802,8 +802,8 @@
        .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 @@
                .ra_colour = 0,
                .present = 1,
        },
-       .si2quater_indicator = 0,
+       .si2quater_indicator = false,
        .lsa_params = {
                .present = 0,
        },
@@ -846,16 +846,16 @@
 
        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;
 

-- 
To view, visit https://gerrit.osmocom.org/5036
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0981fca96f4927717ca335be1dab00a5d17fd6c
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <[email protected]>

Reply via email to