Change in osmo-ttcn3-hacks[master]: library/RSL_Types: s/amr_codec_modes/codec_modes/ in RSL_IE_MultirateCfg

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29342 ) Change subject: library/RSL_Types: s/amr_codec_modes/codec_modes/ in RSL_IE_MultirateCfg ...................................................................... library/RSL_Types: s/amr_codec_modes/codec_modes/ in RSL_IE_MultirateCfg The RSL MultiRate configuration IE is all about AMR (Adaptive Multi Rate) codec, so there is no need for 'amr_' prefix in field names. Change-Id: If63ee50e8681ad4e0a202f142f2fca2268d55079 --- M bts/BTS_Tests.ttcn M library/RSL_Types.ttcn 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index fed45a9..c6ce115 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2540,7 +2540,7 @@ case (RSL_CMOD_SP_GSM1) { tch_mode := L1CTL_CHAN_MODE_SPEECH_V1; } case (RSL_CMOD_SP_GSM2) { tch_mode := L1CTL_CHAN_MODE_SPEECH_V2; } case (RSL_CMOD_SP_GSM3) { tch_mode := L1CTL_CHAN_MODE_SPEECH_V3; - amr_codecs_bitmask := g_pars.mr_conf.amr_codec_modes; + amr_codecs_bitmask := g_pars.mr_conf.codec_modes; } case else { log("RSL channel mode := ", g_pars.chan_mode.coding_alg_rate, @@ -2568,7 +2568,7 @@ var integer n := 0; for (var integer i:= 7; i >= 0; i := i - 1) { - if (g_pars.mr_conf.amr_codec_modes[i] == '1'B) { + if (g_pars.mr_conf.codec_modes[i] == '1'B) { if (n == start_nth) { return 7 - i; } diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index a86be86..6681024 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -824,20 +824,20 @@ boolean icmi, BIT1 spare, uint2_t start_mode, - BIT8 amr_codec_modes, + BIT8 codec_modes, octetstring parameters } with { - variant (len) "LENGTHTO(mr_speech_ver,nscb,icmi,spare,start_mode,amr_codec_modes,parameters)" + variant (len) "LENGTHTO(mr_speech_ver,nscb,icmi,spare,start_mode,codec_modes,parameters)" }; template (value) RSL_IE_MultirateCfg ts_RSL_MultirateCfg(boolean icmi := true, uint2_t start_mode := 0, - BIT8 amr_codec_modes := '00000100'B /* 5,90k */) := { + BIT8 codec_modes := '00000100'B /* 5,90k */) := { len := 2, mr_speech_ver := 1, nscb := false, icmi := icmi, spare := '0'B, start_mode := start_mode, - amr_codec_modes := amr_codec_modes, + codec_modes := codec_modes, parameters := ''O } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29342 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If63ee50e8681ad4e0a202f142f2fca2268d55079 Gerrit-Change-Number: 29342 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged