[S] Change in osmocom-bb[master]: layer23: Define (r)plmn_valid field as bool

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32797 ) Change subject: layer23: Define (r)plmn_valid field as bool ...................................................................... layer23: Define (r)plmn_valid field as bool Change-Id: Ia2316bae5e4f5035f31b4da3937e025537aaf224 --- M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/include/osmocom/bb/common/subscriber.h M src/host/layer23/src/common/subscriber.c M src/host/layer23/src/common/vty.c M src/host/layer23/src/mobile/gsm322.c 5 files changed, 17 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/97/32797/1 diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h index bae9848..add8dc3 100644 --- a/src/host/layer23/include/osmocom/bb/common/settings.h +++ b/src/host/layer23/include/osmocom/bb/common/settings.h @@ -64,7 +64,7 @@ uint8_t ki_type; uint8_t ki[16]; /* 128 bit max */ uint8_t barr; - uint8_t rplmn_valid; + bool rplmn_valid; struct osmo_plmn_id rplmn; uint16_t lac; bool imsi_attached; diff --git a/src/host/layer23/include/osmocom/bb/common/subscriber.h b/src/host/layer23/include/osmocom/bb/common/subscriber.h index b829b2e..cbcfd0e 100644 --- a/src/host/layer23/include/osmocom/bb/common/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/common/subscriber.h @@ -80,7 +80,7 @@ char sim_spn[17]; /* name of service privider */ /* PLMN last registered */ - uint8_t plmn_valid; + bool plmn_valid; struct osmo_plmn_id plmn; /* our access */ diff --git a/src/host/layer23/src/common/subscriber.c b/src/host/layer23/src/common/subscriber.c index e10f40a..9d392d1 100644 --- a/src/host/layer23/src/common/subscriber.c +++ b/src/host/layer23/src/common/subscriber.c @@ -913,7 +913,7 @@ /* if LAI is valid, set RPLMN */ if (subscr->lai.lac > 0x0000 && subscr->lai.lac < 0xfffe) { - subscr->plmn_valid = 1; + subscr->plmn_valid = true; memcpy(&subscr->plmn, &subscr->lai.plmn, sizeof(struct osmo_plmn_id)); LOGP(DMM, LOGL_INFO, "-> SIM card registered to %s (%s, %s)\n", osmo_plmn_name(&subscr->plmn), diff --git a/src/host/layer23/src/common/vty.c b/src/host/layer23/src/common/vty.c index c76f498..67105a0 100644 --- a/src/host/layer23/src/common/vty.c +++ b/src/host/layer23/src/common/vty.c @@ -513,9 +513,9 @@ return CMD_WARNING; } memcpy(&set->test_sim.rplmn, &plmn, sizeof(plmn)); - set->test_sim.rplmn_valid = 1; + set->test_sim.rplmn_valid = true; } else { - set->test_sim.rplmn_valid = 0; + set->test_sim.rplmn_valid = false; } if (argc >= 4) @@ -1041,7 +1041,7 @@ struct osmocom_ms *ms = vty->index; struct gsm_settings *set = &ms->settings; - set->test_sim.rplmn_valid = 0; + set->test_sim.rplmn_valid = false; set->test_sim.rplmn.mcc = 1; set->test_sim.rplmn.mnc = 1; set->test_sim.rplmn.mnc_3_digits = false; @@ -1067,7 +1067,7 @@ vty_out(vty, "Given MNC invalid%s", VTY_NEWLINE); return CMD_WARNING; } - set->test_sim.rplmn_valid = 1; + set->test_sim.rplmn_valid = true; memcpy(&set->test_sim.rplmn, &plmn, sizeof(plmn)); if (argc >= 3) diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index 60996b2..6ad3cd0 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -1685,7 +1685,7 @@ struct gsm_subscriber *subscr = &ms->subscr; /* set last registered PLMN */ - subscr->plmn_valid = 1; + subscr->plmn_valid = true; memcpy(&subscr->plmn, &plmn->plmn, sizeof(struct osmo_plmn_id)); new_m_state(plmn, GSM322_M2_ON_PLMN); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia2316bae5e4f5035f31b4da3937e025537aaf224 Gerrit-Change-Number: 32797 Gerrit-PatchSet: 1 Gerrit-Owner: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-MessageType: newchange