Change in osmocom-bb[master]: trxcon/sched_trx.c: use bool in sched_trx_reset()

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12580 )

Change subject: trxcon/sched_trx.c: use bool in sched_trx_reset()
......................................................................

trxcon/sched_trx.c: use bool in sched_trx_reset()

Change-Id: I4f6990520836edb5eecce38c04857a4b3bc6f2fc
---
M src/host/trxcon/l1ctl.c
M src/host/trxcon/sched_trx.c
M src/host/trxcon/sched_trx.h
M src/host/trxcon/trxcon.c
4 files changed, 8 insertions(+), 7 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Looks good to me, approved



diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c
index 02aa3fa..a2ced46 100644
--- a/src/host/trxcon/l1ctl.c
+++ b/src/host/trxcon/l1ctl.c
@@ -345,7 +345,7 @@
 		band_arfcn &~ ARFCN_FLAG_MASK);
 
 	/* Reset scheduler and clock counter */
-	sched_trx_reset(l1l->trx, 1);
+	sched_trx_reset(l1l->trx, true);
 
 	/* Configure a single timeslot */
 	sched_trx_configure_ts(l1l->trx, 0, ch_config);
@@ -431,7 +431,7 @@
 
 		/* Fall through */
 	case L1CTL_RES_T_SCHED:
-		sched_trx_reset(l1l->trx, 1);
+		sched_trx_reset(l1l->trx, true);
 		break;
 	default:
 		LOGP(DL1C, LOGL_ERROR, "Unknown L1CTL_RESET_REQ type\n");
@@ -674,7 +674,7 @@
 		"switching back to CCCH\n");
 
 	/* Reset scheduler */
-	sched_trx_reset(l1l->trx, 0);
+	sched_trx_reset(l1l->trx, false);
 
 	msgb_free(msg);
 	return 0;
diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c
index 19d1fe8..18516d3 100644
--- a/src/host/trxcon/sched_trx.c
+++ b/src/host/trxcon/sched_trx.c
@@ -2,7 +2,7 @@
  * OsmocomBB <-> SDR connection bridge
  * TDMA scheduler: GSM PHY routines
  *
- * (C) 2017 by Vadim Yanitskiy <axilirator at gmail.com>
+ * (C) 2017-2019 by Vadim Yanitskiy <axilirator at gmail.com>
  *
  * All Rights Reserved
  *
@@ -26,6 +26,7 @@
 #include <errno.h>
 #include <string.h>
 #include <talloc.h>
+#include <stdbool.h>
 
 #include <osmocom/gsm/a5.h>
 #include <osmocom/core/bits.h>
@@ -160,7 +161,7 @@
 	return 0;
 }
 
-int sched_trx_reset(struct trx_instance *trx, int reset_clock)
+int sched_trx_reset(struct trx_instance *trx, bool reset_clock)
 {
 	int i;
 
diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h
index b7236d5..f914eee 100644
--- a/src/host/trxcon/sched_trx.h
+++ b/src/host/trxcon/sched_trx.h
@@ -263,7 +263,7 @@
 
 /* Scheduler management functions */
 int sched_trx_init(struct trx_instance *trx, uint32_t fn_advance);
-int sched_trx_reset(struct trx_instance *trx, int reset_clock);
+int sched_trx_reset(struct trx_instance *trx, bool reset_clock);
 int sched_trx_shutdown(struct trx_instance *trx);
 
 /* Timeslot management functions */
diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c
index 251321d..874f893 100644
--- a/src/host/trxcon/trxcon.c
+++ b/src/host/trxcon/trxcon.c
@@ -93,7 +93,7 @@
 
 		if (app_data.trx->fsm->state != TRX_STATE_OFFLINE) {
 			/* Reset scheduler and clock counter */
-			sched_trx_reset(app_data.trx, 1);
+			sched_trx_reset(app_data.trx, true);
 
 			/* TODO: implement trx_if_reset() */
 			trx_if_cmd_poweroff(app_data.trx);

-- 
To view, visit https://gerrit.osmocom.org/12580
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f6990520836edb5eecce38c04857a4b3bc6f2fc
Gerrit-Change-Number: 12580
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190117/a1c1ce3f/attachment.htm>