<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24431">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">GSM_Types, bsc: add VAMOS cbits<br><br>Change-Id: I2d98495b8c4c9a8466f2154af9bb29124c2cb0b5<br>---<br>M bsc/MSC_ConnectionHandler.ttcn<br>M library/GSM_Types.ttcn<br>2 files changed, 33 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/24431/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>index 8c44bf7..37adc18 100644</span><br><span>--- a/bsc/MSC_ConnectionHandler.ttcn</span><br><span>+++ b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>@@ -754,9 +754,15 @@</span><br><span>      if (match(inp, '00001'B)) { /* TCH/F */</span><br><span>              chan_nr := valueof(t_RslChanNr_Bm(tn));</span><br><span>      }</span><br><span style="color: hsl(120, 100%, 40%);">+     else if (match(inp, '11101'B)) { /* VAMOS TCH/F */</span><br><span style="color: hsl(120, 100%, 40%);">+            chan_nr := valueof(t_RslChanNr_Osmo_VAMOS_Bm(tn));</span><br><span style="color: hsl(120, 100%, 40%);">+    }</span><br><span>    else if (match(inp, '0001?'B)) { /* TCH/H */</span><br><span>                 chan_nr := valueof(t_RslChanNr_Lm(tn, bit2int(substr(inp, 4, 1))));</span><br><span>  }</span><br><span style="color: hsl(120, 100%, 40%);">+     else if (match(inp, '1111?'B)) { /* VAMOS TCH/H */</span><br><span style="color: hsl(120, 100%, 40%);">+            chan_nr := valueof(t_RslChanNr_Osmo_VAMOS_Lm(tn, bit2int(substr(inp, 4, 1))));</span><br><span style="color: hsl(120, 100%, 40%);">+        }</span><br><span>    else if (match(inp, '001??'B)) { /* SDCCH/4 */</span><br><span>               chan_nr := valueof(t_RslChanNr_SDCCH4(tn, bit2int(substr(inp, 3, 2))));</span><br><span>      }</span><br><span>diff --git a/library/GSM_Types.ttcn b/library/GSM_Types.ttcn</span><br><span>index bcd0afb..4889a1e 100644</span><br><span>--- a/library/GSM_Types.ttcn</span><br><span>+++ b/library/GSM_Types.ttcn</span><br><span>@@ -124,7 +124,8 @@</span><br><span>         RSL_CHAN_NR_PCH_AGCH    ('10010'B),</span><br><span>  RSL_CHAN_NR_OSMO_PDCH   ('11000'B),</span><br><span>  RSL_CHAN_NR_OSMO_CBCH4  ('11001'B),</span><br><span style="color: hsl(0, 100%, 40%);">-     RSL_CHAN_NR_OSMO_CBCH8  ('11010'B)</span><br><span style="color: hsl(120, 100%, 40%);">+    RSL_CHAN_NR_OSMO_CBCH8  ('11010'B),</span><br><span style="color: hsl(120, 100%, 40%);">+   RSL_CHAN_NR_OSMO_VAMOS_Bm_ACCH  ('11101'B)</span><br><span> } with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" };</span><br><span> </span><br><span> type record RslChanNr2 {</span><br><span>@@ -132,6 +133,11 @@</span><br><span>      uint1_t         sub_chan</span><br><span> } with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+type record RslChanNr2VAMOS {</span><br><span style="color: hsl(120, 100%, 40%);">+     BIT4            tag ('1111'B),</span><br><span style="color: hsl(120, 100%, 40%);">+        uint1_t         sub_chan</span><br><span style="color: hsl(120, 100%, 40%);">+} with { variant "FIELDLENGTH(5)" variant "FIELDORDER(msb)" };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> type record RslChanNr4 {</span><br><span>   BIT3            tag ('001'B),</span><br><span>        uint2_t         sub_chan</span><br><span>@@ -145,10 +151,12 @@</span><br><span> type union RslChanNrU {</span><br><span>  RslChanNr0      ch0,</span><br><span>         RslChanNr2      lm,</span><br><span style="color: hsl(120, 100%, 40%);">+   RslChanNr2VAMOS lm_vamos,</span><br><span>    RslChanNr4      sdcch4,</span><br><span>      RslChanNr8      sdcch8</span><br><span> } with {</span><br><span>   variant "TAG(lm, tag = '0001'B;</span><br><span style="color: hsl(120, 100%, 40%);">+                  lm_vamos, tag = '1111'B;</span><br><span>                     sdcch4, tag = '001'B;</span><br><span>                        sdcch8, tag = '01'B;</span><br><span>                         ch0, OTHERWISE)"</span><br><span>@@ -185,6 +193,15 @@</span><br><span>         u := { sdcch8 := { tag := '01'B, sub_chan := sub_slot } },</span><br><span>   tn := tn</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+template RslChannelNr t_RslChanNr_Osmo_VAMOS_Bm(template uint3_t tn) := {</span><br><span style="color: hsl(120, 100%, 40%);">+      u := { ch0 := RSL_CHAN_NR_OSMO_VAMOS_Bm_ACCH },</span><br><span style="color: hsl(120, 100%, 40%);">+       tn := tn</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+template RslChannelNr t_RslChanNr_Osmo_VAMOS_Lm(template uint3_t tn, template uint1_t sub_slot) := {</span><br><span style="color: hsl(120, 100%, 40%);">+   u := { lm_vamos := { tag := '1111'B, sub_chan := sub_slot } },</span><br><span style="color: hsl(120, 100%, 40%);">+        tn := tn</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> template (value) RslChannelNr ts_RslChanNr0(uint3_t tn, RslChanNr0 cht) := {</span><br><span>      u := { ch0 := cht },</span><br><span>@@ -209,6 +226,15 @@</span><br><span>  u := { sdcch8 := { tag := '01'B, sub_chan := sub_slot } },</span><br><span>   tn := tn</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) RslChannelNr ts_RslChanNr_Osmo_VAMOS_Bm(uint3_t tn) := {</span><br><span style="color: hsl(120, 100%, 40%);">+      u := { ch0 := RSL_CHAN_NR_OSMO_VAMOS_Bm_ACCH },</span><br><span style="color: hsl(120, 100%, 40%);">+       tn := tn</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) RslChannelNr ts_RslChanNr_Osmo_VAMOS_Lm(uint3_t tn, uint1_t sub_slot) := {</span><br><span style="color: hsl(120, 100%, 40%);">+      u := { lm_vamos := { tag := '1111'B, sub_chan := sub_slot } },</span><br><span style="color: hsl(120, 100%, 40%);">+        tn := tn</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> /* TS 48.058 9.3.2 Link ID */</span><br><span> type enumerated RslLinkIdC {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24431">change 24431</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24431"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I2d98495b8c4c9a8466f2154af9bb29124c2cb0b5 </div>
<div style="display:none"> Gerrit-Change-Number: 24431 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>