[PATCH 1/2] LC15: refactor code to simplify understanding

msuraev at sysmocom.de msuraev at sysmocom.de
Thu Apr 21 16:43:26 UTC 2016


From: Max <msuraev at sysmocom.de>

Use bool type for boolean values.
Move common code out of if.. else.
---
 src/osmo-bts-litecell15/l1_if.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c
index 6a60b3f..3e60726 100644
--- a/src/osmo-bts-litecell15/l1_if.c
+++ b/src/osmo-bts-litecell15/l1_if.c
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
-
+#include <stdbool.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -96,7 +96,7 @@ static void l1if_req_timeout(void *data)
 }
 
 static int _l1if_req_compl(struct lc15l1_hdl *fl1h, struct msgb *msg,
-		   int is_system_prim, l1if_compl_cb *cb, void *data)
+		   bool is_system_prim, l1if_compl_cb *cb, void *data)
 {
 	struct wait_l1_conf *wlc;
 	struct osmo_wqueue *wqueue;
@@ -108,7 +108,7 @@ static int _l1if_req_compl(struct lc15l1_hdl *fl1h, struct msgb *msg,
 	wlc->cb_data = data;
 
 	/* Make sure we actually have received a REQUEST type primitive */
-	if (is_system_prim == 0) {
+	if (!is_system_prim) {
 		GsmL1_Prim_t *l1p = msgb_l1prim(msg);
 
 		LOGP(DL1P, LOGL_INFO, "Tx L1 prim %s\n",
@@ -123,7 +123,6 @@ static int _l1if_req_compl(struct lc15l1_hdl *fl1h, struct msgb *msg,
 		wlc->is_sys_prim = 0;
 		wlc->conf_prim_id = lc15bts_get_l1prim_conf(l1p->id);
 		wqueue = &fl1h->write_q[MQ_L1_WRITE];
-		timeout_secs = 30;
 	} else {
 		Litecell15_Prim_t *sysp = msgb_sysprim(msg);
 
@@ -139,9 +138,10 @@ static int _l1if_req_compl(struct lc15l1_hdl *fl1h, struct msgb *msg,
 		wlc->is_sys_prim = 1;
 		wlc->conf_prim_id = lc15bts_get_sysprim_conf(sysp->id);
 		wqueue = &fl1h->write_q[MQ_SYS_WRITE];
-		timeout_secs = 30;
 	}
 
+	timeout_secs = 30;
+
 	/* enqueue the message in the queue and add wsc to list */
 	if (osmo_wqueue_enqueue(wqueue, msg) != 0) {
 		/* So we will get a timeout but the log message might help */
@@ -163,13 +163,13 @@ static int _l1if_req_compl(struct lc15l1_hdl *fl1h, struct msgb *msg,
 int l1if_req_compl(struct lc15l1_hdl *fl1h, struct msgb *msg,
 		   l1if_compl_cb *cb, void *data)
 {
-	return _l1if_req_compl(fl1h, msg, 1, cb, data);
+	return _l1if_req_compl(fl1h, msg, true, cb, data);
 }
 
 int l1if_gsm_req_compl(struct lc15l1_hdl *fl1h, struct msgb *msg,
 		   l1if_compl_cb *cb, void *data)
 {
-	return _l1if_req_compl(fl1h, msg, 0, cb, data);
+	return _l1if_req_compl(fl1h, msg, false, cb, data);
 }
 
 /* allocate a msgb containing a GsmL1_Prim_t */
-- 
2.8.1



More information about the OpenBSC mailing list