fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34808?usp=email ) Change subject: mobile: cosmetic: improve mncc_{get,set}_bearer() ...................................................................... mobile: cosmetic: improve mncc_{get,set}_bearer() Change-Id: I5647bdf58cbf58065dbe8eebe16f330d98fd0d22 Related: OS#4396 --- M src/host/layer23/src/mobile/mnccms.c 1 file changed, 18 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index c20dd7a..b173946 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -82,7 +82,7 @@ return NULL; } -static int8_t mncc_get_bearer(struct gsm_settings *set, uint8_t speech_ver) +static int8_t mncc_get_bearer(const struct gsm_settings *set, uint8_t speech_ver) { switch (speech_ver) { case GSM48_BCAP_SV_AMR_F: @@ -134,10 +134,10 @@ return speech_ver; } -static void mncc_set_bearer(struct osmocom_ms *ms, int8_t speech_ver, - struct gsm_mncc *mncc) +static void mncc_set_bearer(struct gsm_mncc *mncc, + const struct gsm_settings *set, + int8_t speech_ver) { - struct gsm_settings *set = &ms->settings; int i = 0; mncc->fields |= MNCC_F_BEARER_CAP; @@ -259,7 +259,7 @@ int mncc_recv_internal(struct osmocom_ms *ms, int msg_type, void *arg) { - struct gsm_settings *set = &ms->settings; + const struct gsm_settings *set = &ms->settings; const struct gsm_mncc *data = arg; struct gsm_call *call = get_call_ref(data->callref); struct gsm_mncc mncc; @@ -466,10 +466,10 @@ * or if given codec is unimplemented */ if (!(data->fields & MNCC_F_BEARER_CAP) || speech_ver < 0) - mncc_set_bearer(ms, -1, &mncc); + mncc_set_bearer(&mncc, set, -1); else if (data->bearer_cap.speech_ver[1] >= 0 || speech_ver != 0) - mncc_set_bearer(ms, speech_ver, &mncc); + mncc_set_bearer(&mncc, set, speech_ver); /* CC capabilities (optional) */ if (ms->settings.cc_dtmf) { mncc.fields |= MNCC_F_CCCAP; @@ -580,7 +580,7 @@ OSMO_STRLCPY_ARRAY(setup.called.number, number); /* bearer capability (mandatory) */ - mncc_set_bearer(ms, -1, &setup); + mncc_set_bearer(&setup, &ms->settings, -1); /* CLIR */ if (ms->settings.clir) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34808?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5647bdf58cbf58065dbe8eebe16f330d98fd0d22 Gerrit-Change-Number: 34808 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria &lt;vyanitskiy(a)sysmocom.de&gt; Gerrit-Reviewer: laforge &lt;laforge(a)osmocom.org&gt; Gerrit-Reviewer: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-MessageType: merged