<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/19365">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts-trx: Use bool type for on/off state variables<br><br>Change-Id: Icb1b7bd8852417ab7b9a7dbc205aa6f6db97d64d<br>---<br>M src/osmo-bts-trx/l1_if.h<br>M src/osmo-bts-trx/trx_provision_fsm.c<br>M src/osmo-bts-trx/trx_vty.c<br>3 files changed, 39 insertions(+), 39 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-trx/l1_if.h b/src/osmo-bts-trx/l1_if.h</span><br><span>index 07751f2..f35936e 100644</span><br><span>--- a/src/osmo-bts-trx/l1_if.h</span><br><span>+++ b/src/osmo-bts-trx/l1_if.h</span><br><span>@@ -60,44 +60,44 @@</span><br><span> struct trx_config {</span><br><span> uint8_t trxd_hdr_ver_req; /* requested TRXD header version */</span><br><span> uint8_t trxd_hdr_ver_use; /* actual TRXD header version in use */</span><br><span style="color: hsl(0, 100%, 40%);">- int setformat_sent;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool setformat_sent;</span><br><span> </span><br><span> bool enabled;</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int arfcn_valid;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool arfcn_valid;</span><br><span> uint16_t arfcn;</span><br><span style="color: hsl(0, 100%, 40%);">- int arfcn_sent;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool arfcn_sent;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int tsc_valid;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool tsc_valid;</span><br><span> uint8_t tsc;</span><br><span style="color: hsl(0, 100%, 40%);">- int tsc_sent;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool tsc_sent;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int bsic_valid;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool bsic_valid;</span><br><span> uint8_t bsic;</span><br><span style="color: hsl(0, 100%, 40%);">- int bsic_sent;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool bsic_sent;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int rxgain_valid;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool rxgain_valid;</span><br><span> uint8_t rxgain;</span><br><span style="color: hsl(0, 100%, 40%);">- int rxgain_sent;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool rxgain_sent;</span><br><span> </span><br><span> int forced_max_power_red; /* -1 if not forced by VTY config (default) */</span><br><span> </span><br><span> bool nominal_power_set_by_vty; /* whether nominal trx power was enforced/retreived from VTY config "nominal-tx-power" */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int maxdly_valid;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool maxdly_valid;</span><br><span> int maxdly;</span><br><span style="color: hsl(0, 100%, 40%);">- int maxdly_sent;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool maxdly_sent;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int maxdlynb_valid;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool maxdlynb_valid;</span><br><span> int maxdlynb;</span><br><span style="color: hsl(0, 100%, 40%);">- int maxdlynb_sent;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool maxdlynb_sent;</span><br><span> </span><br><span> uint8_t slotmask;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int slottype_valid[TRX_NR_TS];</span><br><span style="color: hsl(120, 100%, 40%);">+ bool slottype_valid[TRX_NR_TS];</span><br><span> uint8_t slottype[TRX_NR_TS];</span><br><span style="color: hsl(0, 100%, 40%);">- int slottype_sent[TRX_NR_TS];</span><br><span style="color: hsl(120, 100%, 40%);">+ bool slottype_sent[TRX_NR_TS];</span><br><span> };</span><br><span> </span><br><span> struct trx_l1h {</span><br><span>diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c</span><br><span>index c3b266d..fbeee37 100644</span><br><span>--- a/src/osmo-bts-trx/trx_provision_fsm.c</span><br><span>+++ b/src/osmo-bts-trx/trx_provision_fsm.c</span><br><span>@@ -102,15 +102,15 @@</span><br><span> * provide broken values) */</span><br><span> if (!l1h->config.nominal_power_set_by_vty)</span><br><span> trx_if_cmd_getnompower(l1h, l1if_getnompower_cb);</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.arfcn_sent = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.arfcn_sent = true;</span><br><span> }</span><br><span> if (!l1h->config.tsc_sent) {</span><br><span> trx_if_cmd_settsc(l1h, l1h->config.tsc);</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.tsc_sent = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.tsc_sent = true;</span><br><span> }</span><br><span> if (!l1h->config.bsic_sent) {</span><br><span> trx_if_cmd_setbsic(l1h, l1h->config.bsic);</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.bsic_sent = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.bsic_sent = true;</span><br><span> }</span><br><span> </span><br><span> /* Ask transceiver to use the newest TRXD header version if not using it yet */</span><br><span>@@ -124,7 +124,7 @@</span><br><span> "already using maximum configured one: %" PRIu8 "\n",</span><br><span> l1h->config.trxd_hdr_ver_use);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.setformat_sent = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.setformat_sent = true;</span><br><span> }</span><br><span> </span><br><span> if (pinst->num == 0 && !plink->u.osmotrx.powered && !plink->u.osmotrx.poweronoff_sent) {</span><br><span>@@ -175,8 +175,8 @@</span><br><span> if (l1h->config.slottype[ts_data->tn] != ts_data->slottype ||</span><br><span> !l1h->config.slottype_valid[ts_data->tn]) {</span><br><span> l1h->config.slottype[ts_data->tn] = ts_data->slottype;</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.slottype_valid[ts_data->tn] = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.slottype_sent[ts_data->tn] = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.slottype_valid[ts_data->tn] = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.slottype_sent[ts_data->tn] = false;</span><br><span> return true;</span><br><span> }</span><br><span> return false;</span><br><span>@@ -217,24 +217,24 @@</span><br><span> bsic = (uint8_t)(intptr_t)data;</span><br><span> if (l1h->config.bsic != bsic || !l1h->config.bsic_valid) {</span><br><span> l1h->config.bsic = bsic;</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.bsic_valid = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.bsic_sent = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.bsic_valid = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.bsic_sent = false;</span><br><span> }</span><br><span> break;</span><br><span> case TRX_PROV_EV_CFG_ARFCN:</span><br><span> arfcn = (uint16_t)(intptr_t)data;</span><br><span> if (l1h->config.arfcn != arfcn || !l1h->config.arfcn_valid) {</span><br><span> l1h->config.arfcn = arfcn;</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.arfcn_valid = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.arfcn_sent = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.arfcn_valid = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.arfcn_sent = false;</span><br><span> }</span><br><span> break;</span><br><span> case TRX_PROV_EV_CFG_TSC:</span><br><span> tsc = (uint16_t)(intptr_t)data;</span><br><span> if (l1h->config.tsc != tsc || !l1h->config.tsc_valid) {</span><br><span> l1h->config.tsc = tsc;</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.tsc_valid = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.tsc_sent = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.tsc_valid = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.tsc_sent = false;</span><br><span> }</span><br><span> break;</span><br><span> case TRX_PROV_EV_CFG_TS:</span><br><span>@@ -291,15 +291,15 @@</span><br><span> /* after power on */</span><br><span> if (l1h->config.rxgain_valid && !l1h->config.rxgain_sent) {</span><br><span> trx_if_cmd_setrxgain(l1h, l1h->config.rxgain);</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.rxgain_sent = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.rxgain_sent = true;</span><br><span> }</span><br><span> if (l1h->config.maxdly_valid && !l1h->config.maxdly_sent) {</span><br><span> trx_if_cmd_setmaxdly(l1h, l1h->config.maxdly);</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.maxdly_sent = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.maxdly_sent = true;</span><br><span> }</span><br><span> if (l1h->config.maxdlynb_valid && !l1h->config.maxdlynb_sent) {</span><br><span> trx_if_cmd_setmaxdlynb(l1h, l1h->config.maxdlynb);</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.maxdlynb_sent = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.maxdlynb_sent = true;</span><br><span> }</span><br><span> </span><br><span> for (tn = 0; tn < TRX_NR_TS; tn++) {</span><br><span>@@ -307,7 +307,7 @@</span><br><span> && !l1h->config.slottype_sent[tn]) {</span><br><span> trx_if_cmd_setslot(l1h, tn,</span><br><span> l1h->config.slottype[tn], l1if_setslot_cb);</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.slottype_sent[tn] = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.slottype_sent[tn] = true;</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>@@ -328,11 +328,11 @@</span><br><span> trx_if_cmd_poweroff(l1h, l1if_poweronoff_cb);</span><br><span> plink->u.osmotrx.poweronoff_sent = true;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.rxgain_sent = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.maxdly_sent = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.maxdlynb_sent = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.rxgain_sent = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.maxdly_sent = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.maxdlynb_sent = false;</span><br><span> for (tn = 0; tn < TRX_NR_TS; tn++)</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.slottype_sent[tn] = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.slottype_sent[tn] = false;</span><br><span> } else if (!pinst->phy_link->u.osmotrx.poweronoff_sent) {</span><br><span> bts_model_trx_close_cb(pinst->trx, 0);</span><br><span> } /* else: poweroff in progress, cb will be called upon TRXC RSP */</span><br><span>@@ -347,7 +347,7 @@</span><br><span> if (update_ts_data(l1h, ts_data)) {</span><br><span> trx_if_cmd_setslot(l1h, ts_data->tn,</span><br><span> l1h->config.slottype[ ts_data->tn], l1if_setslot_cb);</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.slottype_sent[ ts_data->tn] = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.slottype_sent[ts_data->tn] = true;</span><br><span> }</span><br><span> </span><br><span> break;</span><br><span>diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c</span><br><span>index fb75a4e..6b8ca77 100644</span><br><span>--- a/src/osmo-bts-trx/trx_vty.c</span><br><span>+++ b/src/osmo-bts-trx/trx_vty.c</span><br><span>@@ -245,7 +245,7 @@</span><br><span> </span><br><span> l1h->config.maxdly = atoi(argv[0]);</span><br><span> l1h->config.maxdly_valid = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.maxdly_sent = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.maxdly_sent = false;</span><br><span> l1if_provision_transceiver_trx(l1h);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span>@@ -271,7 +271,7 @@</span><br><span> </span><br><span> l1h->config.maxdlynb = atoi(argv[0]);</span><br><span> l1h->config.maxdlynb_valid = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.maxdlynb_sent = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.maxdlynb_sent = false;</span><br><span> l1if_provision_transceiver_trx(l1h);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span>@@ -358,7 +358,7 @@</span><br><span> </span><br><span> l1h->config.rxgain = atoi(argv[0]);</span><br><span> l1h->config.rxgain_valid = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- l1h->config.rxgain_sent = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ l1h->config.rxgain_sent = false;</span><br><span> l1if_provision_transceiver_trx(l1h);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/19365">change 19365</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/c/osmo-bts/+/19365"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Icb1b7bd8852417ab7b9a7dbc205aa6f6db97d64d </div>
<div style="display:none"> Gerrit-Change-Number: 19365 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>