<p>Max <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11817">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Vadim Yanitskiy: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mobile: use proper type for boolean flags<br><br>This makes reading code easier and simplifies further modifications.<br><br>Change-Id: I7eff2a61495ff167dc19fc9a41882a7a11fbf32d<br>---<br>M src/host/layer23/include/osmocom/bb/mobile/mncc.h<br>M src/host/layer23/src/mobile/mnccms.c<br>2 files changed, 11 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc.h b/src/host/layer23/include/osmocom/bb/mobile/mncc.h</span><br><span>index cad1883..8ec9358 100644</span><br><span>--- a/src/host/layer23/include/osmocom/bb/mobile/mncc.h</span><br><span>+++ b/src/host/layer23/include/osmocom/bb/mobile/mncc.h</span><br><span>@@ -36,9 +36,9 @@</span><br><span> </span><br><span> uint32_t callref;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t init; /* call initiated, no response yet */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t hold; /* call on hold */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t ring; /* call ringing/knocking */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool init; /* call initiated, no response yet */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool hold; /* call on hold */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool ring; /* call ringing/knocking */</span><br><span> </span><br><span> struct osmo_timer_list dtmf_timer;</span><br><span> uint8_t dtmf_state;</span><br><span>diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c</span><br><span>index 9f58112..2243291 100644</span><br><span>--- a/src/host/layer23/src/mobile/mnccms.c</span><br><span>+++ b/src/host/layer23/src/mobile/mnccms.c</span><br><span>@@ -294,7 +294,7 @@</span><br><span> }</span><br><span> </span><br><span> /* not in initiated state anymore */</span><br><span style="color: hsl(0, 100%, 40%);">- call->init = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ call->init = false;</span><br><span> </span><br><span> switch (msg_type) {</span><br><span> case MNCC_DISC_IND:</span><br><span>@@ -478,9 +478,9 @@</span><br><span> LOGP(DMNCC, LOGL_INFO, "Ring!\n");</span><br><span> else {</span><br><span> LOGP(DMNCC, LOGL_INFO, "Knock!\n");</span><br><span style="color: hsl(0, 100%, 40%);">- call->hold = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ call->hold = true;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- call->ring = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ call->ring = true;</span><br><span> memset(&mncc, 0, sizeof(struct gsm_mncc));</span><br><span> mncc.callref = call->callref;</span><br><span> mncc_tx_to_cc(ms, MNCC_ALERT_REQ, &mncc);</span><br><span>@@ -498,7 +498,7 @@</span><br><span> vty_notify(ms, NULL);</span><br><span> vty_notify(ms, "Call is on hold\n");</span><br><span> LOGP(DMNCC, LOGL_INFO, "Call is on hold\n");</span><br><span style="color: hsl(0, 100%, 40%);">- call->hold = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ call->hold = true;</span><br><span> break;</span><br><span> case MNCC_HOLD_REJ:</span><br><span> vty_notify(ms, NULL);</span><br><span>@@ -509,7 +509,7 @@</span><br><span> vty_notify(ms, NULL);</span><br><span> vty_notify(ms, "Call is retrieved\n");</span><br><span> LOGP(DMNCC, LOGL_INFO, "Call is retrieved\n");</span><br><span style="color: hsl(0, 100%, 40%);">- call->hold = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ call->hold = false;</span><br><span> break;</span><br><span> case MNCC_RETRIEVE_REJ:</span><br><span> vty_notify(ms, NULL);</span><br><span>@@ -554,7 +554,7 @@</span><br><span> return -ENOMEM;</span><br><span> call->ms = ms;</span><br><span> call->callref = new_callref++;</span><br><span style="color: hsl(0, 100%, 40%);">- call->init = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ call->init = true;</span><br><span> llist_add_tail(&call->entry, &call_list);</span><br><span> </span><br><span> memset(&setup, 0, sizeof(struct gsm_mncc));</span><br><span>@@ -646,8 +646,8 @@</span><br><span> vty_notify(ms, "Please put active call on hold first!\n");</span><br><span> return -EBUSY;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- alerting->ring = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- alerting->hold = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ alerting->ring = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ alerting->hold = false;</span><br><span> </span><br><span> memset(&rsp, 0, sizeof(struct gsm_mncc));</span><br><span> rsp.callref = alerting->callref;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11817">change 11817</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/11817"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I7eff2a61495ff167dc19fc9a41882a7a11fbf32d </div>
<div style="display:none"> Gerrit-Change-Number: 11817 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>