From d44503337dc91926ade98fcb44246e79cb95b084 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 16 Nov 2018 21:36:52 +0100 Subject: mobile: use proper type for boolean flags This makes reading code easier and simplifies further modifications. Change-Id: I7eff2a61495ff167dc19fc9a41882a7a11fbf32d --- src/host/layer23/include/osmocom/bb/mobile/mncc.h | 6 +++--- src/host/layer23/src/mobile/mnccms.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc.h b/src/host/layer23/include/osmocom/bb/mobile/mncc.h index cad1883c..8ec9358d 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/mncc.h +++ b/src/host/layer23/include/osmocom/bb/mobile/mncc.h @@ -36,9 +36,9 @@ struct gsm_call { uint32_t callref; - uint8_t init; /* call initiated, no response yet */ - uint8_t hold; /* call on hold */ - uint8_t ring; /* call ringing/knocking */ + bool init; /* call initiated, no response yet */ + bool hold; /* call on hold */ + bool ring; /* call ringing/knocking */ struct osmo_timer_list dtmf_timer; uint8_t dtmf_state; diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index 9f581123..22432913 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -294,7 +294,7 @@ int mncc_recv_mobile(struct osmocom_ms *ms, int msg_type, void *arg) } /* not in initiated state anymore */ - call->init = 0; + call->init = false; switch (msg_type) { case MNCC_DISC_IND: @@ -478,9 +478,9 @@ int mncc_recv_mobile(struct osmocom_ms *ms, int msg_type, void *arg) LOGP(DMNCC, LOGL_INFO, "Ring!\n"); else { LOGP(DMNCC, LOGL_INFO, "Knock!\n"); - call->hold = 1; + call->hold = true; } - call->ring = 1; + call->ring = true; memset(&mncc, 0, sizeof(struct gsm_mncc)); mncc.callref = call->callref; mncc_tx_to_cc(ms, MNCC_ALERT_REQ, &mncc); @@ -498,7 +498,7 @@ int mncc_recv_mobile(struct osmocom_ms *ms, int msg_type, void *arg) vty_notify(ms, NULL); vty_notify(ms, "Call is on hold\n"); LOGP(DMNCC, LOGL_INFO, "Call is on hold\n"); - call->hold = 1; + call->hold = true; break; case MNCC_HOLD_REJ: vty_notify(ms, NULL); @@ -509,7 +509,7 @@ int mncc_recv_mobile(struct osmocom_ms *ms, int msg_type, void *arg) vty_notify(ms, NULL); vty_notify(ms, "Call is retrieved\n"); LOGP(DMNCC, LOGL_INFO, "Call is retrieved\n"); - call->hold = 0; + call->hold = false; break; case MNCC_RETRIEVE_REJ: vty_notify(ms, NULL); @@ -554,7 +554,7 @@ int mncc_call(struct osmocom_ms *ms, char *number) return -ENOMEM; call->ms = ms; call->callref = new_callref++; - call->init = 1; + call->init = true; llist_add_tail(&call->entry, &call_list); memset(&setup, 0, sizeof(struct gsm_mncc)); @@ -646,8 +646,8 @@ int mncc_answer(struct osmocom_ms *ms) vty_notify(ms, "Please put active call on hold first!\n"); return -EBUSY; } - alerting->ring = 0; - alerting->hold = 0; + alerting->ring = false; + alerting->hold = false; memset(&rsp, 0, sizeof(struct gsm_mncc)); rsp.callref = alerting->callref; -- cgit v1.2.3