- gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: BSC: Implement RSL_IE_MultirateCfg and use it in BSC_Tests
by fixeria 02 Sep '22

02 Sep '22

Attention is currently required from: pespin. fixeria 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 1: Code-Review-1 (1 comment) File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29268/comment/dd37c986_c1f1… PS1, Line 4604: 2004 You're introducing a regression here: unlike above, it's not '2804'O. I think you need to do pars.expect_mr_conf_ie.multirate_cfg.icmi := false to match what the comment states. -- 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: 1 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: Fri, 02 Sep 2022 18:17:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: cosmetic: RSL_Types: Fix trailing whitespace
by fixeria 02 Sep '22

02 Sep '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29267 ) Change subject: cosmetic: RSL_Types: Fix trailing whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29267 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: I664cc5a00240a308df5ed36feafe0779be152ec0 Gerrit-Change-Number: 29267 Gerrit-PatchSet: 1 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: Fri, 02 Sep 2022 18:11:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: cosmetic: L1CTL: Fix trailing whitespace
by fixeria 02 Sep '22

02 Sep '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29265 ) Change subject: cosmetic: L1CTL: Fix trailing whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29265 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: I9d0446c21e1331c426bca0dad434f32de0ff0d38 Gerrit-Change-Number: 29265 Gerrit-PatchSet: 1 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: Fri, 02 Sep 2022 18:11:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmocom-bb[master]: trxcon: trx_if_open(): avoid using talloc_reparent()
by fixeria 02 Sep '22

02 Sep '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29270 ) Change subject: trxcon: trx_if_open(): avoid using talloc_reparent() ...................................................................... trxcon: trx_if_open(): avoid using talloc_reparent() For consistency with trxcon_inst_alloc(): * first allocate an instance of trx_fsm as a child of trxcon->fi, * then allocate a trx_instance as a child of the trx_fsm. Change-Id: Iafc486347c6ca7a80da88be73c772397fa2deb7d --- M src/host/trxcon/src/trx_if.c 1 file changed, 12 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/70/29270/1 diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index 5e4e696..7b1ca99 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -703,24 +703,24 @@ { const unsigned int offset = trxcon->id * 2; struct trx_instance *trx; + struct osmo_fsm_inst *fi; int rc; LOGPFSML(trxcon->fi, LOGL_NOTICE, "Init transceiver interface " "(%s:%u/%u)\n", remote_host, base_port, trxcon->id); - /* Try to allocate memory */ - trx = talloc_zero(trxcon, struct trx_instance); - if (!trx) { - LOGPFSML(trxcon->fi, LOGL_ERROR, "Failed to allocate memory\n"); + /* Allocate a new dedicated state machine */ + fi = osmo_fsm_inst_alloc_child(&trx_fsm, trxcon->fi, TRXCON_EV_PHYIF_FAILURE); + if (fi == NULL) { + LOGPFSML(trxcon->fi, LOGL_ERROR, "Failed to allocate an instance " + "of FSM '%s'\n", trx_fsm.name); return NULL; } - /* Allocate a new dedicated state machine */ - trx->fi = osmo_fsm_inst_alloc_child(&trx_fsm, trxcon->fi, TRXCON_EV_PHYIF_FAILURE); - if (trx->fi == NULL) { - LOGPFSML(trxcon->fi, LOGL_ERROR, "Failed to allocate an instance " - "of FSM '%s'\n", trx_fsm.name); - talloc_free(trx); + trx = talloc_zero(fi, struct trx_instance); + if (!trx) { + LOGPFSML(trxcon->fi, LOGL_ERROR, "Failed to allocate memory\n"); + osmo_fsm_inst_free(fi); return NULL; } @@ -742,18 +742,15 @@ if (rc < 0) goto udp_error; - /* Reparent trx_instance from trxcon to trx->fi */ - talloc_reparent(trxcon, trx->fi, trx); - trx->trxcon = trxcon; - trx->fi->priv = trx; + fi->priv = trx; + trx->fi = fi; return trx; udp_error: LOGPFSML(trx->fi, LOGL_ERROR, "Couldn't establish UDP connection\n"); osmo_fsm_inst_free(trx->fi); - talloc_free(trx); return NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iafc486347c6ca7a80da88be73c772397fa2deb7d Gerrit-Change-Number: 29270 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmocom-bb[master]: trxcon: cosmetic: alignment fix in trxcon_inst_alloc()
by fixeria 02 Sep '22

02 Sep '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/29271 ) Change subject: trxcon: cosmetic: alignment fix in trxcon_inst_alloc() ...................................................................... trxcon: cosmetic: alignment fix in trxcon_inst_alloc() Change-Id: Icaab38b2b9e2885c4b3080140888d4b331578bb3 --- M src/host/trxcon/src/trxcon.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/71/29271/1 diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 9e68ec5..7e12e3b 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -283,9 +283,9 @@ /* Init transceiver interface */ trxcon->phyif = trx_if_open(trxcon, - app_data.trx_bind_ip, - app_data.trx_remote_ip, - app_data.trx_base_port); + app_data.trx_bind_ip, + app_data.trx_remote_ip, + app_data.trx_base_port); if (trxcon->phyif == NULL) { trxcon_inst_free(trxcon); return NULL; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/29271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icaab38b2b9e2885c4b3080140888d4b331578bb3 Gerrit-Change-Number: 29271 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmocom-bb[master]: trxcon: rework trxcon_inst cleanup logic, add trxcon_fsm_pre_term_cb()
by fixeria 02 Sep '22

02 Sep '22

Attention is currently required from: osmith, laforge, pespin, daniel. Hello osmith, Jenkins Builder, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/28862 to look at the new patch set (#4). Change subject: trxcon: rework trxcon_inst cleanup logic, add trxcon_fsm_pre_term_cb() ...................................................................... trxcon: rework trxcon_inst cleanup logic, add trxcon_fsm_pre_term_cb() * trxcon_inst_alloc(): allocate trxcon_fsm as a child of the given ctx. * trxcon_inst_alloc(): allocate trxcon_inst as a child of trxcon_fsm. * trxcon_inst_free(): move the cleanup logic to .pre_term() callback of the trxcon_fsm, represented by new trxcon_fsm_pre_term_cb(). * trxcon_allstate_action() properly handle TRXCON_EV_{PHYIF,L2IF}_FAILURE. Change-Id: I5eb8ef6f62b1dc949dc60eaa558f123b3b93819c Related: OS#5599 --- M src/host/trxcon/src/trxcon.c M src/host/trxcon/src/trxcon_fsm.c 2 files changed, 44 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/62/28862/4 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5eb8ef6f62b1dc949dc60eaa558f123b3b93819c Gerrit-Change-Number: 28862 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmocom-bb[master]: trxcon: rework trxcon_inst cleanup logic, add trxcon_fsm_pre_term_cb()
by fixeria 02 Sep '22

02 Sep '22

Attention is currently required from: osmith, laforge, pespin, daniel. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28862 ) Change subject: trxcon: rework trxcon_inst cleanup logic, add trxcon_fsm_pre_term_cb() ...................................................................... Patch Set 3: (1 comment) File src/host/trxcon/src/trxcon.c: https://gerrit.osmocom.org/c/osmocom-bb/+/28862/comment/42aa1929_fcfe729a PS1, Line 270: /* Reparent trxcon_inst from ctx to trxcon->fi */ > I think it's much more clearer doing this instead of mangling with talloc contexts: [..] I don't think it's much more cleaner, and I don't like this approach. On the other hand, I don't want this patch to remain stuck in Gerrit any longer, so I will rework the patch as you suggested. > BTW FYI, I've seen usually this solved/workarounded by using talloc_steal during the cleanup callback when freeing the fi->priv. I don't see why it's better: in my current patch we re-parent trxcon_inst during the FSM allocation; Pau proposes to re-parent the FSM instance before deallocation of trxcon_inst. In both cases we're mangling with talloc contexts. The only project I found implementing this is osmo-cbc.git, so I would not say it's a usual approach. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5eb8ef6f62b1dc949dc60eaa558f123b3b93819c Gerrit-Change-Number: 28862 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 02 Sep 2022 17:33:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: BSC: Implement RSL_IE_MultirateCfg and use it in BSC_Tests
by pespin 02 Sep '22

02 Sep '22

pespin has uploaded this change for review. ( 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, 33 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/29268/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 09cd717..fae31e2 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -111,6 +111,19 @@ /* BTS3 */ { trx_num := 1, tsc := 4 } } +private const RSL_IE_Body mr_conf_amr_5_90 := { + multirate_cfg := { + len := 2, + mr_speech_ver := 1, + nscb := false, + icmi := true, + spare := '0'B, + start_mode := 0, + amr_codec_modes := '00000100'B, /* 5,90k */ + parameters := ''O + } +}; + /* per-BTS state which we keep */ type record BTS_State { /* component reference to the IPA_Client component used for RSL */ @@ -4504,17 +4517,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 +4545,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); @@ -4596,19 +4595,12 @@ /* 'amr start-mode auto' should not keep the (unused) 'smod' bits from previous configuration */ testcase TC_assignment_codec_amr_startmode_cruft() runs on test_CT { 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 */ - } - }; + var MSC_ConnHdlr vc_conn 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); diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index 6f8846f..c606dc3 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -814,6 +814,20 @@ 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,parameters)" + }; + /* 9.3.53 */ type record RSL_IE_MultirateCtrl { uint3_t spare, @@ -952,6 +966,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 +1029,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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: Move AMR defintions out of OSMUX_Types to its own file
by pespin 02 Sep '22

02 Sep '22

pespin has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/29269/1 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 " -- 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: cosmetic: RSL_Types: Fix trailing whitespace
by pespin 02 Sep '22

02 Sep '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29267 ) Change subject: cosmetic: RSL_Types: Fix trailing whitespace ...................................................................... cosmetic: RSL_Types: Fix trailing whitespace Change-Id: I664cc5a00240a308df5ed36feafe0779be152ec0 --- M library/RSL_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/29267/1 diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index 84e9375..6f8846f 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -1654,7 +1654,7 @@ }) } }; - + /* 8.4.10 BTS -> BSC */ template (value) RSL_Message ts_RSL_MODE_MODIFY_ACK(template (value) RslChannelNr chan_nr) := { msg_disc := ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/29267 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: I664cc5a00240a308df5ed36feafe0779be152ec0 Gerrit-Change-Number: 29267 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log