diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2022-09-02 16:35:49 +0200 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2022-09-07 10:46:17 +0200 |
| commit | 440e1dcb3470619fe93b971d3b26b4b730d01a15 (patch) | |
| tree | bf7ab88678e38485ccbd13c92b68ff2f51df5269 /library | |
| parent | 71ed46395794f7c3bab3a9985f3d0cbac481e08a (diff) | |
bts: Pass AMR codec info over L1CTL and RSL
Related: SYS#5987
Depends: osmocom-bb.git Change-Id Ia20bc96e39726a919a556c83c8be48cb31af7331
Change-Id: I3db7f6a4b7819b16ada83862f2a5409db4fa21f9
Diffstat (limited to 'library')
| -rw-r--r-- | library/L1CTL_PortType.ttcn | 5 | ||||
| -rw-r--r-- | library/L1CTL_Types.ttcn | 19 |
2 files changed, 18 insertions, 6 deletions
diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn index ed235d3e..80fa0743 100644 --- a/library/L1CTL_PortType.ttcn +++ b/library/L1CTL_PortType.ttcn @@ -106,9 +106,10 @@ module L1CTL_PortType { } } - 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 6bfebb3d..1b50703a 100644 --- a/library/L1CTL_Types.ttcn +++ b/library/L1CTL_Types.ttcn @@ -181,7 +181,10 @@ module L1CTL_Types { 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 @@ module L1CTL_Types { 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 @@ module L1CTL_Types { 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 @@ module L1CTL_Types { 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 + } } } }; |