Change in osmo-ttcn3-hacks[master]: library/RSL_Types.ttcn: t(r|)s_RSL_CHAN_RQD: make chan_nr configurable

[Vadim Yanitskiy]

Vadim Yanitskiy has uploaded this change for review. ( 
https://gerrit.osmocom.org/14290


Change subject: library/RSL_Types.ttcn: t(r|)s_RSL_CHAN_RQD: make chan_nr 
configurable
......................................................................

library/RSL_Types.ttcn: t(r|)s_RSL_CHAN_RQD: make chan_nr configurable

Change-Id: I89e9286e86b09ed54eb7749d107f5d8d57b93644
---
M bts/BTS_Tests.ttcn
M library/RSL_Types.ttcn
2 files changed, 11 insertions(+), 6 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks 
refs/changes/90/14290/1

diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 482108d..322a00f 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -1245,10 +1245,10 @@
                timer T := 5.0;
                T.start;
                alt {
-               [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(ra, fn, ?))) {
+               [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(ra, fn, 
t_RslChanNr_RACH(0)))) {
                        T.stop;
                        }
-               [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(?, ?, ?))) {
+               [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_CHAN_RQD(?, ?, ?, ?))) {
                        Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, 
"Unexpected CHAN RQD");
                        }
                [] RSL_CCHAN.receive { repeat; }
diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn
index ef3f45b..7f37720 100644
--- a/library/RSL_Types.ttcn
+++ b/library/RSL_Types.ttcn
@@ -1532,21 +1532,26 @@


        /* 8.5.3 BTS -> BSC */
-       template (value) RSL_Message ts_RSL_CHAN_RQD(OCT1 ra, GsmFrameNumber 
fn, uint8_t acc_del := 0) := {
+       template (value) RSL_Message ts_RSL_CHAN_RQD(OCT1 ra, GsmFrameNumber fn,
+                                                    template (value) 
RslChannelNr chan_nr := ts_RslChanNr_RACH(0),
+                                                    uint8_t acc_del := 0) := {
                msg_disc := ts_RSL_MsgDisc(RSL_MDISC_CCHAN, false),
                msg_type := RSL_MT_CHAN_RQD,
                ies := {
-                       t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := 
ts_RslChanNr_RACH(0)}),
+                       t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := 
chan_nr}),
+                       /* TODO: we may need to have optional RSL_IE_LINK_IDENT 
IE here */
                        t_RSL_IE(RSL_IE_REQ_REFERENCE, RSL_IE_Body:{req_ref := 
ts_RSL_IE_ReqRef(ra, fn)}),
                        t_RSL_IE(RSL_IE_ACCESS_DELAY, RSL_IE_Body:{access_delay 
:= acc_del})
                }
        }
        template RSL_Message tr_RSL_CHAN_RQD(template OCT1 ra, template 
GsmFrameNumber fn := ?,
-                                               template uint8_t acc_del := ?) 
:= {
+                                            template RslChannelNr chan_nr := 
ts_RslChanNr_RACH(0),
+                                            template uint8_t acc_del := ?) := {
                msg_disc := tr_RSL_MsgDisc(RSL_MDISC_CCHAN, false),
                msg_type := RSL_MT_CHAN_RQD,
                ies := {
-                       tr_RSL_IE(RSL_IE_Body:{chan_nr := t_RslChanNr_RACH(0)}),
+                       tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}),
+                       /* TODO: we may need to have optional RSL_IE_LINK_IDENT 
IE here */
                        tr_RSL_IE(RSL_IE_Body:{req_ref := tr_RSL_IE_ReqRef(ra, 
fn)}),
                        tr_RSL_IE(RSL_IE_Body:{access_delay := acc_del})
                }

--
To view, visit https://gerrit.osmocom.org/14290
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I89e9286e86b09ed54eb7749d107f5d8d57b93644
Gerrit-Change-Number: 14290
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy <axilira...@gmail.com>