dexter submitted this change.

View Change


Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified
bts: is_xyz_bts check functions should return bool

The check functions that we use to distinguish between the various types
of BTSs return an integer that can be 0 or 1. Let's change the return
type to bool

Change-Id: I3de957f228452c9d3aa4fed342f73bfb17363b40
---
M include/osmocom/bsc/bts.h
1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h
index 4faf5f2..ea396cc 100644
--- a/include/osmocom/bsc/bts.h
+++ b/include/osmocom/bsc/bts.h
@@ -678,77 +678,77 @@
#define GSM_BTS_SI(bts, i) (void *)((bts)->si_buf[i][0])

/* this actually refers to the IPA transport, not the BTS model */
-static inline int is_ipaccess_bts(const struct gsm_bts *bts)
+static inline bool is_ipaccess_bts(const struct gsm_bts *bts)
{
switch (bts->type) {
case GSM_BTS_TYPE_NANOBTS:
case GSM_BTS_TYPE_OSMOBTS:
- return 1;
+ return true;
default:
break;
}
- return 0;
+ return false;
}

-static inline int is_osmobts(const struct gsm_bts *bts)
+static inline bool is_osmobts(const struct gsm_bts *bts)
{
switch (bts->type) {
case GSM_BTS_TYPE_OSMOBTS:
- return 1;
+ return true;
default:
break;
}
- return 0;
+ return false;
}

-static inline int is_siemens_bts(const struct gsm_bts *bts)
+static inline bool is_siemens_bts(const struct gsm_bts *bts)
{
switch (bts->type) {
case GSM_BTS_TYPE_BS11:
- return 1;
+ return true;
default:
break;
}

- return 0;
+ return false;
}

-static inline int is_nokia_bts(const struct gsm_bts *bts)
+static inline bool is_nokia_bts(const struct gsm_bts *bts)
{
switch (bts->type) {
case GSM_BTS_TYPE_NOKIA_SITE:
- return 1;
+ return true;
default:
break;
}

- return 0;
+ return false;
}

-static inline int is_ericsson_bts(const struct gsm_bts *bts)
+static inline bool is_ericsson_bts(const struct gsm_bts *bts)
{
switch (bts->type) {
case GSM_BTS_TYPE_RBS2000:
- return 1;
+ return true;
default:
break;
}

- return 0;
+ return false;
}

-static inline int is_e1_bts(const struct gsm_bts *bts)
+static inline bool is_e1_bts(const struct gsm_bts *bts)
{
switch (bts->type) {
case GSM_BTS_TYPE_BS11:
case GSM_BTS_TYPE_RBS2000:
case GSM_BTS_TYPE_NOKIA_SITE:
- return 1;
+ return true;
default:
break;
}

- return 0;
+ return false;
}

static inline const struct osmo_location_area_id *bts_lai(struct gsm_bts *bts)

To view, visit change 31818. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I3de957f228452c9d3aa4fed342f73bfb17363b40
Gerrit-Change-Number: 31818
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier@sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged