<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12580">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">trxcon/sched_trx.c: use bool in sched_trx_reset()<br><br>Change-Id: I4f6990520836edb5eecce38c04857a4b3bc6f2fc<br>---<br>M src/host/trxcon/l1ctl.c<br>M src/host/trxcon/sched_trx.c<br>M src/host/trxcon/sched_trx.h<br>M src/host/trxcon/trxcon.c<br>4 files changed, 8 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/80/12580/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c</span><br><span>index 02aa3fa..a2ced46 100644</span><br><span>--- a/src/host/trxcon/l1ctl.c</span><br><span>+++ b/src/host/trxcon/l1ctl.c</span><br><span>@@ -345,7 +345,7 @@</span><br><span> band_arfcn &~ ARFCN_FLAG_MASK);</span><br><span> </span><br><span> /* Reset scheduler and clock counter */</span><br><span style="color: hsl(0, 100%, 40%);">- sched_trx_reset(l1l->trx, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ sched_trx_reset(l1l->trx, true);</span><br><span> </span><br><span> /* Configure a single timeslot */</span><br><span> sched_trx_configure_ts(l1l->trx, 0, ch_config);</span><br><span>@@ -431,7 +431,7 @@</span><br><span> </span><br><span> /* Fall through */</span><br><span> case L1CTL_RES_T_SCHED:</span><br><span style="color: hsl(0, 100%, 40%);">- sched_trx_reset(l1l->trx, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ sched_trx_reset(l1l->trx, true);</span><br><span> break;</span><br><span> default:</span><br><span> LOGP(DL1C, LOGL_ERROR, "Unknown L1CTL_RESET_REQ type\n");</span><br><span>@@ -674,7 +674,7 @@</span><br><span> "switching back to CCCH\n");</span><br><span> </span><br><span> /* Reset scheduler */</span><br><span style="color: hsl(0, 100%, 40%);">- sched_trx_reset(l1l->trx, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ sched_trx_reset(l1l->trx, false);</span><br><span> </span><br><span> msgb_free(msg);</span><br><span> return 0;</span><br><span>diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c</span><br><span>index 19d1fe8..18516d3 100644</span><br><span>--- a/src/host/trxcon/sched_trx.c</span><br><span>+++ b/src/host/trxcon/sched_trx.c</span><br><span>@@ -2,7 +2,7 @@</span><br><span> * OsmocomBB <-> SDR connection bridge</span><br><span> * TDMA scheduler: GSM PHY routines</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * (C) 2017 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2017-2019 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span> *</span><br><span> * All Rights Reserved</span><br><span> *</span><br><span>@@ -26,6 +26,7 @@</span><br><span> #include <errno.h></span><br><span> #include <string.h></span><br><span> #include <talloc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdbool.h></span><br><span> </span><br><span> #include <osmocom/gsm/a5.h></span><br><span> #include <osmocom/core/bits.h></span><br><span>@@ -160,7 +161,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int sched_trx_reset(struct trx_instance *trx, int reset_clock)</span><br><span style="color: hsl(120, 100%, 40%);">+int sched_trx_reset(struct trx_instance *trx, bool reset_clock)</span><br><span> {</span><br><span> int i;</span><br><span> </span><br><span>diff --git a/src/host/trxcon/sched_trx.h b/src/host/trxcon/sched_trx.h</span><br><span>index b7236d5..f914eee 100644</span><br><span>--- a/src/host/trxcon/sched_trx.h</span><br><span>+++ b/src/host/trxcon/sched_trx.h</span><br><span>@@ -263,7 +263,7 @@</span><br><span> </span><br><span> /* Scheduler management functions */</span><br><span> int sched_trx_init(struct trx_instance *trx, uint32_t fn_advance);</span><br><span style="color: hsl(0, 100%, 40%);">-int sched_trx_reset(struct trx_instance *trx, int reset_clock);</span><br><span style="color: hsl(120, 100%, 40%);">+int sched_trx_reset(struct trx_instance *trx, bool reset_clock);</span><br><span> int sched_trx_shutdown(struct trx_instance *trx);</span><br><span> </span><br><span> /* Timeslot management functions */</span><br><span>diff --git a/src/host/trxcon/trxcon.c b/src/host/trxcon/trxcon.c</span><br><span>index 251321d..874f893 100644</span><br><span>--- a/src/host/trxcon/trxcon.c</span><br><span>+++ b/src/host/trxcon/trxcon.c</span><br><span>@@ -93,7 +93,7 @@</span><br><span> </span><br><span> if (app_data.trx->fsm->state != TRX_STATE_OFFLINE) {</span><br><span> /* Reset scheduler and clock counter */</span><br><span style="color: hsl(0, 100%, 40%);">- sched_trx_reset(app_data.trx, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ sched_trx_reset(app_data.trx, true);</span><br><span> </span><br><span> /* TODO: implement trx_if_reset() */</span><br><span> trx_if_cmd_poweroff(app_data.trx);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12580">change 12580</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12580"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I4f6990520836edb5eecce38c04857a4b3bc6f2fc </div>
<div style="display:none"> Gerrit-Change-Number: 12580 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>