Vadim Yanitskiy has uploaded this change for review. (
https://gerrit.osmocom.org/14289
Change subject: L1CTL_RACH_REQ: make both chan_nr and link_id configurable
......................................................................
L1CTL_RACH_REQ: make both chan_nr and link_id configurable
Change-Id: Ica6b9551b11c20fa0b8f4a8dcdc91ca07601642c
---
M library/L1CTL_PortType.ttcn
M library/L1CTL_Types.ttcn
2 files changed, 10 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/89/14289/1
diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn
index bdcf024..7af680c 100644
--- a/library/L1CTL_PortType.ttcn
+++ b/library/L1CTL_PortType.ttcn
@@ -80,12 +80,15 @@
}
}
- function f_L1CTL_RACH(L1CTL_PT pt, uint8_t ra, uint8_t combined := 1,
uint16_t offset := 0) return GsmFrameNumber {
+ function f_L1CTL_RACH(L1CTL_PT pt, uint8_t ra, uint8_t combined := 1,
uint16_t offset := 0,
+ template (value) RslChannelNr chan_nr :=
ts_RslChanNr_RACH(0),
+ template (value) RslLinkId link_id :=
ts_RslLinkID_DCCH(0))
+ return GsmFrameNumber {
var L1ctlDlMessage rc;
var GsmFrameNumber fn;
timer T := 2.0;
T.start
- pt.send(ts_L1CTL_RACH_REQ(ra, combined, offset))
+ pt.send(ts_L1CTL_RACH_REQ(ra, combined, offset, chan_nr,
link_id))
alt {
[] pt.receive(tr_L1CTL_RACH_CONF) -> value rc { fn :=
rc.dl_info.frame_nr };
[] pt.receive { repeat; };
diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn
index 2a97099..01214b2 100644
--- a/library/L1CTL_Types.ttcn
+++ b/library/L1CTL_Types.ttcn
@@ -487,12 +487,13 @@
template L1ctlDlMessage tr_L1CTL_CCCH_MODE_CONF :=
tr_L1CTL_MsgType(L1CTL_CCCH_MODE_CONF);
- template L1ctlUlMessage ts_L1CTL_RACH_REQ(uint8_t ra, uint8_t combined,
uint16_t offset) := {
+ template L1ctlUlMessage ts_L1CTL_RACH_REQ(uint8_t ra, uint8_t combined,
uint16_t offset,
+ template (value) RslChannelNr
chan_nr := ts_RslChanNr_RACH(0),
+ template (value) RslLinkId
link_id := ts_RslLinkID_DCCH(0)) := {
header := ts_L1ctlHeader(L1CTL_RACH_REQ),
ul_info := {
- /* FIXME: both RSL chan_nr and link_id should be
configurable */
- chan_nr := t_RslChanNr_RACH(0),
- link_id := ts_RslLinkID_DCCH(0),
+ chan_nr := chan_nr,
+ link_id := link_id,
padding := '0000'O
},
ul_info_tbf := omit,
--
To view, visit https://gerrit.osmocom.org/14289
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: Ica6b9551b11c20fa0b8f4a8dcdc91ca07601642c
Gerrit-Change-Number: 14289
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy <[email protected]>
