From 65774d447d8623257e1cbf3694542f4a421017d7 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 15 Nov 2017 10:19:07 +0100 Subject: mobile: Use bool to show started can only be true or false The state handling is complicated and maybe it gets better by moving started to bool and then the rest to an enum. Change-Id: I6aef22e7bf954a8a4ecda980c2c558eb8c9180b7 --- src/host/layer23/include/osmocom/bb/common/osmocom_data.h | 3 ++- src/host/layer23/src/mobile/app_mobile.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h index 9b544ab9..21b28805 100644 --- a/src/host/layer23/include/osmocom/bb/common/osmocom_data.h +++ b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h @@ -62,7 +62,8 @@ struct osmocom_ms { uint16_t test_arfcn; struct osmol1_entity l1_entity; - uint8_t deleting, shutdown, started; + bool started, deleting; + uint8_t shutdown; struct gsm_support support; struct gsm_settings settings; struct gsm_subscriber subscr; diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 43631f39..1905010e 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -131,7 +131,7 @@ int mobile_signal_cb(unsigned int subsys, unsigned int signal, gsm322_cs_sendmsg(ms, nmsg); } - ms->started = 1; + ms->started = true; } return 0; } @@ -231,7 +231,7 @@ int mobile_init(struct osmocom_ms *ms) gsm_random_imei(&ms->settings); ms->shutdown = 0; - ms->started = 0; + ms->started = false; if (!strcmp(ms->settings.imei, "000000000000000")) { LOGP(DMOB, LOGL_NOTICE, "***\nWarning: Mobile '%s' has default IMEI: %s\n", @@ -291,7 +291,7 @@ int mobile_delete(struct osmocom_ms *ms, int force) { int rc; - ms->deleting = 1; + ms->deleting = true; if (mncc_recv_app) { mncc_sock_exit(ms->mncc_entity.sock_state); -- cgit v1.2.3