September 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: Osmux_Emulation: Add DATA port

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29273 ) Change subject: Osmux_Emulation: Add DATA port ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29273 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: Id9aa3a0a02ef5a5e39b4df8a1c165f35255829ab Gerrit-Change-Number: 29273 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Sep 2022 08:58:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-gsm-tester[master]: contrib: osmo-bts now depends on libosmo-netif

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/29282 ) Change subject: contrib: osmo-bts now depends on libosmo-netif ...................................................................... contrib: osmo-bts now depends on libosmo-netif Change-Id: I8e40b2de19ecfca084780f69808c7030817e43d7 --- M contrib/jenkins-build-osmo-bts-oc2g.sh M contrib/jenkins-build-osmo-bts-sysmo.sh M contrib/jenkins-build-osmo-bts.sh 3 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/82/29282/1 diff --git a/contrib/jenkins-build-osmo-bts-oc2g.sh b/contrib/jenkins-build-osmo-bts-oc2g.sh index 41eac19..6d660ef 100755 --- a/contrib/jenkins-build-osmo-bts-oc2g.sh +++ b/contrib/jenkins-build-osmo-bts-oc2g.sh @@ -26,6 +26,7 @@ build_repo libosmocore --disable-pcsc --disable-libmnl --disable-doxygen --disable-gnutls --disable-detect-tls-gcc-arm-bug build_repo libosmo-abis --disable-dahdi +build_repo libosmo-netif --disable-doxygen build_repo osmo-bts --disable-sysmocom-bts --enable-oc2g --with-oc2g="$L1_OC2G_HEADERS" create_bin_tgz osmo-bts-oc2g diff --git a/contrib/jenkins-build-osmo-bts-sysmo.sh b/contrib/jenkins-build-osmo-bts-sysmo.sh index 731867f..67681c3 100755 --- a/contrib/jenkins-build-osmo-bts-sysmo.sh +++ b/contrib/jenkins-build-osmo-bts-sysmo.sh @@ -20,6 +20,7 @@ build_repo libosmocore --disable-pcsc --disable-libmnl --disable-doxygen --disable-gnutls --disable-detect-tls-gcc-arm-bug build_repo libosmo-abis --disable-dahdi +build_repo libosmo-netif --disable-doxygen build_repo osmo-bts --enable-sysmocom-bts --with-openbsc=$base/openbsc/openbsc/include create_bin_tgz osmo-bts-sysmo diff --git a/contrib/jenkins-build-osmo-bts.sh b/contrib/jenkins-build-osmo-bts.sh index 182dbf7..27f82cc 100755 --- a/contrib/jenkins-build-osmo-bts.sh +++ b/contrib/jenkins-build-osmo-bts.sh @@ -8,6 +8,7 @@ build_repo libosmocore ${SANITIZE_FLAGS} --disable-doxygen build_repo libosmo-abis ${SANITIZE_FLAGS} --disable-dahdi +build_repo libosmo-netif ${SANITIZE_FLAGS} --disable-doxygen build_repo osmo-bts ${SANITIZE_FLAGS} --enable-trx --with-openbsc=$base/openbsc/openbsc/include --enable-octphy --with-octsdr-2g=$base/octphy-2g-headers create_bin_tgz "osmo-bts-trx osmo-bts-octphy osmo-bts-virtual" -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/29282 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I8e40b2de19ecfca084780f69808c7030817e43d7 Gerrit-Change-Number: 29282 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bts: Test AMR in TC_speech_rtp_tch{h,f}()

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29272 ) Change subject: bts: Test AMR in TC_speech_rtp_tch{h,f}() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29272 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: I8cf7792a00b0a858f6a02bf5cb0d283484b820eb Gerrit-Change-Number: 29272 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Sep 2022 08:58:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/AMR: Add RTP AMR helper structs and functions

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29277 ) Change subject: library/AMR: Add RTP AMR helper structs and functions ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File library/AMR_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29277/comment/547f2a8b_2aad… PS1, Line 39: bit2oct > I am surprised to see this kind of code in a TTCN-3 project. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29277 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: I40cd999badeeefa38a393af9008d8ce047e3c778 Gerrit-Change-Number: 29277 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Sep 2022 08:54:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bts: Pass AMR codec info over L1CTL and RSL

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29266 ) Change subject: bts: Pass AMR codec info over L1CTL and RSL ...................................................................... bts: Pass AMR codec info over L1CTL and RSL Related: SYS#5987 Depends: osmocom-bb.git Change-Id Ia20bc96e39726a919a556c83c8be48cb31af7331 Change-Id: I3db7f6a4b7819b16ada83862f2a5409db4fa21f9 --- M bts/BTS_Tests.ttcn M library/L1CTL_PortType.ttcn M library/L1CTL_Types.ttcn 3 files changed, 33 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index f9361a0..646e5bf 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -307,6 +307,7 @@ uint8_t trx_nr, RslChannelNr chan_nr, RSL_IE_ChannelMode chan_mode, + RSL_IE_MultirateCfg mr_conf optional, float t_guard, ConnL1Pars l1_pars, TestSpecUnion spec optional, @@ -853,6 +854,10 @@ ch_act.ies := ch_act.ies & { valueof(t_RSL_IE(RSL_IE_ENCR_INFO, RSL_IE_Body:{encr_info := encr_info})) }; } + if (mode.coding_alg_rate == RSL_CMOD_SP_GSM3) { + ch_act.ies := ch_act.ies & { valueof(t_RSL_IE(RSL_IE_MR_CONFIG, + RSL_IE_Body:{multirate_cfg := g_pars.mr_conf})) }; + } ch_act.ies := ch_act.ies & more_ies; f_rsl_transceive(ch_act, tr_RSL_CHAN_ACT_ACK(g_chan_nr), "RSL CHAN ACT"); } @@ -869,6 +874,7 @@ trx_nr := trx_nr, chan_nr := valueof(chan_nr), chan_mode := valueof(chan_mode), + mr_conf := omit, t_guard := t_guard, l1_pars := { dtx_enabled := false, @@ -2510,12 +2516,16 @@ /* Send TCH Mode Request to the L1 if needed */ if (match(g_pars.chan_mode.spd_ind, (RSL_SPDI_SPEECH, RSL_SPDI_DATA))) { var L1ctlTchMode tch_mode; + var uint8_t amr_start_codec := 0; + var BIT8 amr_codecs_bitmask := '00000000'B; select (g_pars.chan_mode.coding_alg_rate) { case (RSL_CMOD_NO_RESOURCE) { tch_mode := L1CTL_CHAN_MODE_SIGN; } 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; } + case (RSL_CMOD_SP_GSM3) { tch_mode := L1CTL_CHAN_MODE_SPEECH_V3; + amr_codecs_bitmask := g_pars.mr_conf.amr_codec_modes; + } case else { log("RSL channel mode := ", g_pars.chan_mode.coding_alg_rate, " is not supported by the L1, falling back to signalling"); @@ -2523,7 +2533,10 @@ } } - f_L1CTL_TCH_MODE(L1CTL, tch_mode); + f_L1CTL_TCH_MODE(L1CTL, + ts_L1CTL_TCH_MODE_REQ(tch_mode, + amr_start_codec := amr_start_codec, + amr_codecs_bitmask := amr_codecs_bitmask)); } g_first_meas_res := true; diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn index ed235d3..80fa074 100644 --- a/library/L1CTL_PortType.ttcn +++ b/library/L1CTL_PortType.ttcn @@ -106,9 +106,10 @@ } } - function f_L1CTL_TCH_MODE(L1CTL_PT pt, L1ctlTchMode tch_mode) { + function f_L1CTL_TCH_MODE(L1CTL_PT pt, + template (value) L1ctlUlMessage tch_mode_req_tmpl := ts_L1CTL_TCH_MODE_REQ) { timer T := 2.0; - pt.send(ts_L1CTL_TCH_MODE_REQ(tch_mode)); + pt.send(tch_mode_req_tmpl); T.start; alt { [] pt.receive(tr_L1CTL_MsgType(L1CTL_TCH_MODE_CONF)) { } diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn index 6bfebb3..1b50703 100644 --- a/library/L1CTL_Types.ttcn +++ b/library/L1CTL_Types.ttcn @@ -181,7 +181,10 @@ type record L1ctlTchModeConf { L1ctlTchMode tch_mode, L1ctlAudioMode audio_mode, - OCT2 padding + record { + uint8_t start_codec, + BIT8 codecs_bitmask + } amr } with { variant "" }; type record L1ctlDataInd { @@ -284,7 +287,10 @@ L1ctlTchMode tch_mode, L1ctlAudioMode audio_mode, L1ctlLoopMode loop_mode, - OCT1 padding + record { + uint8_t start_codec, + BIT8 codecs_bitmask + } amr } with { variant "" }; type record L1ctlRachReq { @@ -532,7 +538,9 @@ template (value) L1ctlUlMessage ts_L1CTL_TCH_MODE_REQ(template (value) L1ctlTchMode tch_mode := L1CTL_CHAN_MODE_SIGN, template (value) L1ctlAudioMode audio_mode := t_L1CTL_AudioModeFwd, - template (value) L1ctlLoopMode loop_mode := L1CTL_LOOP_MODE_OPEN) := { + template (value) L1ctlLoopMode loop_mode := L1CTL_LOOP_MODE_OPEN, + template (value) uint8_t amr_start_codec := 0, + template (value) BIT8 amr_codecs_bitmask := '00000000'B) := { header := ts_L1ctlHeader(L1CTL_TCH_MODE_REQ), ul_info := omit, ul_info_tbf := omit, @@ -542,7 +550,10 @@ tch_mode := tch_mode, audio_mode := audio_mode, loop_mode := loop_mode, - padding := '00'O + amr := { + start_codec := amr_start_codec, + codecs_bitmask := amr_codecs_bitmask + } } } }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29266 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: I3db7f6a4b7819b16ada83862f2a5409db4fa21f9 Gerrit-Change-Number: 29266 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC: Implement RSL_IE_MultirateCfg and use it in BSC_Tests

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29268 ) Change subject: BSC: Implement RSL_IE_MultirateCfg and use it in BSC_Tests ...................................................................... BSC: Implement RSL_IE_MultirateCfg and use it in BSC_Tests Change-Id: I0a5ddce570c0fd70f096d897b0b609d20b552ff7 --- M bsc/BSC_Tests.ttcn M library/RSL_Types.ttcn 2 files changed, 34 insertions(+), 24 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 09cd717..46fb952 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -111,6 +111,9 @@ /* BTS3 */ { trx_num := 1, tsc := 4 } } +private const RSL_IE_Body mr_conf_amr_5_90 := + valueof(RSL_IE_Body:{multirate_cfg := ts_RSL_MultirateCfg(true, 0, '00000100'B /* 5,90k */)}); + /* per-BTS state which we keep */ type record BTS_State { /* component reference to the IPA_Client component used for RSL */ @@ -4504,17 +4507,10 @@ /* Note: This setups the codec configuration. The parameter payload in * mr_conf must be consistant with the parameter codecElements in pars * and also must match the amr-config in osmo-bsc.cfg! */ - var RSL_IE_Body mr_conf := { - other := { - len := 2, - payload := '2804'O - } - }; - pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_F})); pars.ass_codec_list.codecElements[0].s0_7 := '00000100'B; /* 5,90k */ pars.ass_codec_list.codecElements[0].s8_15 := '01010111'B; - pars.expect_mr_conf_ie := mr_conf; + pars.expect_mr_conf_ie := mr_conf_amr_5_90; f_init(1, true); f_sleep(1.0); @@ -4539,17 +4535,10 @@ var MSC_ConnHdlr vc_conn; /* See note above */ - var RSL_IE_Body mr_conf := { - other := { - len := 2, - payload := '2804'O - } - }; - pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_H})); pars.ass_codec_list.codecElements[0].s0_7 := '00000100'B; /* 5,90k */ pars.ass_codec_list.codecElements[0].s8_15 := '00000111'B; - pars.expect_mr_conf_ie := mr_conf; + pars.expect_mr_conf_ie := mr_conf_amr_5_90; f_init(1, true); f_sleep(1.0); @@ -4598,17 +4587,11 @@ var TestHdlrParams pars := f_gen_test_hdlr_pars(); var MSC_ConnHdlr vc_conn; - var RSL_IE_Body mr_conf := { - other := { - len := 2, - payload := '2004'O /* <- expect ICMI=0, smod=00 */ - } - }; - pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecAMR_F})); pars.ass_codec_list.codecElements[0].s0_7 := '00000100'B; /* 5,90k */ pars.ass_codec_list.codecElements[0].s8_15 := '01010111'B; - pars.expect_mr_conf_ie := mr_conf; + /* expect ICMI=0, smod=00: */ + pars.expect_mr_conf_ie := valueof(RSL_IE_Body:{multirate_cfg := ts_RSL_MultirateCfg(false, 0, '00000100'B /* 5,90k */)}); f_init(1, true); f_sleep(1.0); diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index 6f8846f..6c45ca9 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -814,6 +814,31 @@ slot_count := slot_count } + /* 9.3.52, 3GPP TS 44.018 10.5.2.21aa */ + type record RSL_IE_MultirateCfg { + uint8_t len, + uint3_t mr_speech_ver, + boolean nscb, + boolean icmi, + BIT1 spare, + uint2_t start_mode, + BIT8 amr_codec_modes, + octetstring parameters + } with { + variant (len) "LENGTHTO(mr_speech_ver,nscb,icmi,spare,start_mode,amr_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 */) := { + len := 2, + mr_speech_ver := 1, + nscb := false, + icmi := icmi, + spare := '0'B, + start_mode := start_mode, + amr_codec_modes := amr_codec_modes, + parameters := ''O + } + /* 9.3.53 */ type record RSL_IE_MultirateCtrl { uint3_t spare, @@ -952,6 +977,7 @@ RSL_IE_MS_Power ms_power, RSL_IE_MS_Power_Parameters ms_power_params, uint8_t timing_adv, + RSL_IE_MultirateCfg multirate_cfg, RSL_IE_MultirateCtrl multirate_ctrl, uint8_t msg_id, RSL_IE_FrameNumber frame_nr, @@ -1014,6 +1040,7 @@ ms_power, iei = RSL_IE_MS_POWER; ms_power_params, iei = RSL_IE_MS_POWER_PARAM; timing_adv, iei = RSL_IE_TIMING_ADVANCE; + multirate_cfg, iei = RSL_IE_MR_CONFIG; multirate_ctrl, iei = RSL_IE_MR_CONTROL; msg_id, iei = RSL_IE_MSG_ID; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29268 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: I0a5ddce570c0fd70f096d897b0b609d20b552ff7 Gerrit-Change-Number: 29268 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Move AMR defintions out of OSMUX_Types to its own file

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29269 ) Change subject: Move AMR defintions out of OSMUX_Types to its own file ...................................................................... Move AMR defintions out of OSMUX_Types to its own file This way they can be used without the need to import OSMUX related modules. Change-Id: I0edfbb7359516ba77180afab18c3e1ffb2d0c927 --- A library/AMR_Types.ttcn M library/OSMUX_Emulation.ttcn M library/OSMUX_Types.ttcn M mgw/MGCP_Test.ttcn M mgw/gen_links.sh 5 files changed, 41 insertions(+), 24 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/library/AMR_Types.ttcn b/library/AMR_Types.ttcn new file mode 100644 index 0000000..3ef2fbc --- /dev/null +++ b/library/AMR_Types.ttcn @@ -0,0 +1,38 @@ +/* + * (C) 2019-2022 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de> + * All rights reserved. + * + * Author: Pau Espin Pedrol <pespin(a)sysmocom.de> + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + */ + +module AMR_Types { + +import from General_Types all; + +/* AMR voice frame type identifiers + * See also 3GPP TS 26.101, Table 1a: Interpretation of Frame Type, Mode + * Indication and Mode Request fields */ +type enumerated AMRFT { + AMR_FT_0, /* 4.75 */ + AMR_FT_1, /* 5.15 */ + AMR_FT_2, /* 5.90 */ + AMR_FT_3, /* 6.70 */ + AMR_FT_4, /* 7.40 */ + AMR_FT_5, /* 7.95 */ + AMR_FT_6, /* 10.2 */ + AMR_FT_7, /* 12.2 */ + AMR_FT_SID /* SID */ +}; + +/* AMR voice frame length (in bytes, rounded), + * See also RFC 3267, chapter 3.6 */ +const integer c_AMRFT_len[9] := {12, 13, 15, 17, 19, 20, 26, 31, 5}; + +function f_amrft_payload_len(INT4b amr_ft) return integer { + return c_AMRFT_len[amr_ft]; +} + +} with { encode "RAW"} diff --git a/library/OSMUX_Emulation.ttcn b/library/OSMUX_Emulation.ttcn index 6189266..10338d2 100644 --- a/library/OSMUX_Emulation.ttcn +++ b/library/OSMUX_Emulation.ttcn @@ -55,6 +55,7 @@ import from Osmocom_Types all; import from IPL4asp_Types all; import from Misc_Helpers all; +import from AMR_Types all; import from OSMUX_Types all; import from OSMUX_CodecPort all; import from OSMUX_CodecPort_CtrlFunct all; diff --git a/library/OSMUX_Types.ttcn b/library/OSMUX_Types.ttcn index 091b4d7..8ff7451 100644 --- a/library/OSMUX_Types.ttcn +++ b/library/OSMUX_Types.ttcn @@ -83,28 +83,4 @@ )" }; - -/* AMR voice frame type identifiers - * See also 3GPP TS 26.101, Table 1a: Interpretation of Frame Type, Mode - * Indication and Mode Request fields */ -type enumerated AMRFT { - AMR_FT_0, /* 4.75 */ - AMR_FT_1, /* 5.15 */ - AMR_FT_2, /* 5.90 */ - AMR_FT_3, /* 6.70 */ - AMR_FT_4, /* 7.40 */ - AMR_FT_5, /* 7.95 */ - AMR_FT_6, /* 10.2 */ - AMR_FT_7, /* 12.2 */ - AMR_FT_SID /* SID */ -}; - -/* AMR voice frame length (in bytes, rounded), - * See also RFC 3267, chapter 3.6 */ -const integer c_AMRFT_len[9] := {12, 13, 15, 17, 19, 20, 26, 31, 5}; - -function f_amrft_payload_len(INT4b amr_ft) return integer { - return c_AMRFT_len[amr_ft]; -} - } with { encode "RAW"} diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 6d23c10..cbc22a6 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -24,6 +24,7 @@ import from OSMUX_CodecPort all; import from OSMUX_CodecPort_CtrlFunct all; import from OSMUX_Emulation all; + import from AMR_Types all; import from IPL4asp_Types all; import from General_Types all; import from Native_Functions all; diff --git a/mgw/gen_links.sh b/mgw/gen_links.sh index d591277..a7b1684 100755 --- a/mgw/gen_links.sh +++ b/mgw/gen_links.sh @@ -40,6 +40,7 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc " +FILES+="AMR_Types.ttcn " FILES+="RTP_CodecPort.ttcn RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_Emulation.ttcn IuUP_EncDec.cc " FILES+="OSMUX_CodecPort.ttcn OSMUX_Emulation.ttcn OSMUX_Types.ttcn OSMUX_CodecPort_CtrlFunct.ttcn OSMUX_CodecPort_CtrlFunctDef.cc " FILES+="Native_Functions.ttcn Native_FunctionDefs.cc IPCP_Types.ttcn " 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29269 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: I0edfbb7359516ba77180afab18c3e1ffb2d0c927 Gerrit-Change-Number: 29269 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(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

2 years, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bts: Pass AMR codec info over L1CTL and RSL

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29266 ) Change subject: bts: Pass AMR codec info over L1CTL and RSL ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29266 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: I3db7f6a4b7819b16ada83862f2a5409db4fa21f9 Gerrit-Change-Number: 29266 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Sep 2022 08:51:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC: Implement RSL_IE_MultirateCfg and use it in BSC_Tests

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29268 ) Change subject: BSC: Implement RSL_IE_MultirateCfg and use it in BSC_Tests ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29268 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: I0a5ddce570c0fd70f096d897b0b609d20b552ff7 Gerrit-Change-Number: 29268 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Sep 2022 08:51:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-sgsn[master]: llc: gprs_llc_hdr_parse(): make the input data pointer const

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/29279 ) Change subject: llc: gprs_llc_hdr_parse(): make the input data pointer const ...................................................................... Patch Set 1: (1 comment) File src/gprs/gprs_llc_parse.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/29279/comment/23a782a7_c793c9dd PS1, Line 138: ghp->data = (uint8_t *)&ctrl[3]; > ghp->data is not const because the payload it points to may be encrypted, and in gprs_llc_rcvmsg() w […] Then you are breaking the const constraints here, so you shouldn't be doing this ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/29279 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9757d2be5af589ccbe4d3d406637a33690284754 Gerrit-Change-Number: 29279 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 07 Sep 2022 08:48:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2022