[MERGED] osmo-ttcn3-hacks[master]: RSL: Add definitions for RSL MEAS REP parsing/encoding

2018-02-23 Thread Harald Welte
Harald Welte has submitted this change and it was merged.

Change subject: RSL: Add definitions for RSL MEAS REP parsing/encoding
..


RSL: Add definitions for RSL MEAS REP parsing/encoding

Change-Id: Ib04b81891def2c15a62767a29b53c0fb605d45be
---
M library/RSL_Types.ttcn
1 file changed, 32 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn
index b1716fd..c9fcfab 100644
--- a/library/RSL_Types.ttcn
+++ b/library/RSL_Types.ttcn
@@ -423,6 +423,19 @@
frame_nr := tr_RSL_IE_FrameNumber(frame_nr)
}
 
+   /* 9.3.25 */
+   type record RSL_IE_UplinkMeas {
+   uint8_t len,
+   BIT1 rfu,
+   boolean dtx_d,
+   uint6_t rxlev_f_u,
+   BIT2 reserved1,
+   uint6_t rxlev_s_u,
+   BIT2 reserved2,
+   uint3_t rxq_f_u,
+   uint3_t rxq_s_u,
+   octetstring supp_meas_info optional
+   } with { variant (len) 
"LENGTHTO(rfu,dtx_d,rxlev_f_u,reserved1,rxlev_s_u,reserved2,rxq_f_u,rxq_s_u,supp_meas_info)"
 };
 
/* 9.3.26 */
type enumerated RSL_Cause {
@@ -589,6 +602,8 @@
uint8_t access_delay,
RSL_IE_RachLoad rach_load,
uint8_t meas_res_nr,
+   uint8_t ms_timing_offset,
+   RSL_IE_UplinkMeas   uplink_meas,
RSL_IE_L1Info   l1_info,
RSL_IE_SysinfoType  sysinfo_type,
uint16_tpaging_load,
@@ -635,6 +650,8 @@
access_delay, iei = RSL_IE_ACCESS_DELAY;
rach_load, iei = RSL_IE_RACH_LOAD;
meas_res_nr, iei = RSL_IE_MEAS_RES_NR;
+   ms_timing_offset, iei = 
RSL_IE_MS_TIMING_OFFSET;
+   uplink_meas, iei = RSL_IE_UPLINK_MEAS;
l1_info, iei = RSL_IE_L1_INFO;
sysinfo_type, iei = RSL_IE_SYSINFO_TYPE;
paging_load, iei = RSL_IE_PAGING_LOAD;
@@ -1007,6 +1024,21 @@
}
}
 
+   template RSL_Message tr_RSL_MEAS_RES(template RslChannelNr chan_nr,
+template uint8_t meas_res_nr := ?,
+template RSL_IE_UplinkMeas ul_meas 
:= ?,
+template RSL_IE_BS_Power bs_power 
:= ?) := {
+   msg_disc := ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false),
+   msg_type := RSL_MT_MEAS_RES,
+   ies := {
+   tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}),
+   tr_RSL_IE(RSL_IE_Body:{meas_res_nr := meas_res_nr}),
+   tr_RSL_IE(RSL_IE_Body:{uplink_meas := ul_meas}),
+   tr_RSL_IE(RSL_IE_Body:{bs_power := bs_power}),
+   *
+   }
+   }
+
/* 8.4.10 BTS -> BSC */
template RSL_Message ts_RSL_MODE_MODIFY_ACK(RslChannelNr chan_nr) := {
msg_disc := ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false),

-- 
To view, visit https://gerrit.osmocom.org/6863
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib04b81891def2c15a62767a29b53c0fb605d45be
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder


osmo-ttcn3-hacks[master]: RSL: Add definitions for RSL MEAS REP parsing/encoding

2018-02-23 Thread Harald Welte

Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.osmocom.org/6863
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib04b81891def2c15a62767a29b53c0fb605d45be
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte 
Gerrit-Reviewer: Harald Welte 
Gerrit-HasComments: No


[PATCH] osmo-ttcn3-hacks[master]: RSL: Add definitions for RSL MEAS REP parsing/encoding

2018-02-23 Thread Harald Welte

Review at  https://gerrit.osmocom.org/6863

RSL: Add definitions for RSL MEAS REP parsing/encoding

Change-Id: Ib04b81891def2c15a62767a29b53c0fb605d45be
---
M library/RSL_Types.ttcn
1 file changed, 32 insertions(+), 0 deletions(-)


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

diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn
index b1716fd..c9fcfab 100644
--- a/library/RSL_Types.ttcn
+++ b/library/RSL_Types.ttcn
@@ -423,6 +423,19 @@
frame_nr := tr_RSL_IE_FrameNumber(frame_nr)
}
 
+   /* 9.3.25 */
+   type record RSL_IE_UplinkMeas {
+   uint8_t len,
+   BIT1 rfu,
+   boolean dtx_d,
+   uint6_t rxlev_f_u,
+   BIT2 reserved1,
+   uint6_t rxlev_s_u,
+   BIT2 reserved2,
+   uint3_t rxq_f_u,
+   uint3_t rxq_s_u,
+   octetstring supp_meas_info optional
+   } with { variant (len) 
"LENGTHTO(rfu,dtx_d,rxlev_f_u,reserved1,rxlev_s_u,reserved2,rxq_f_u,rxq_s_u,supp_meas_info)"
 };
 
/* 9.3.26 */
type enumerated RSL_Cause {
@@ -589,6 +602,8 @@
uint8_t access_delay,
RSL_IE_RachLoad rach_load,
uint8_t meas_res_nr,
+   uint8_t ms_timing_offset,
+   RSL_IE_UplinkMeas   uplink_meas,
RSL_IE_L1Info   l1_info,
RSL_IE_SysinfoType  sysinfo_type,
uint16_tpaging_load,
@@ -635,6 +650,8 @@
access_delay, iei = RSL_IE_ACCESS_DELAY;
rach_load, iei = RSL_IE_RACH_LOAD;
meas_res_nr, iei = RSL_IE_MEAS_RES_NR;
+   ms_timing_offset, iei = 
RSL_IE_MS_TIMING_OFFSET;
+   uplink_meas, iei = RSL_IE_UPLINK_MEAS;
l1_info, iei = RSL_IE_L1_INFO;
sysinfo_type, iei = RSL_IE_SYSINFO_TYPE;
paging_load, iei = RSL_IE_PAGING_LOAD;
@@ -1007,6 +1024,21 @@
}
}
 
+   template RSL_Message tr_RSL_MEAS_RES(template RslChannelNr chan_nr,
+template uint8_t meas_res_nr := ?,
+template RSL_IE_UplinkMeas ul_meas 
:= ?,
+template RSL_IE_BS_Power bs_power 
:= ?) := {
+   msg_disc := ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false),
+   msg_type := RSL_MT_MEAS_RES,
+   ies := {
+   tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}),
+   tr_RSL_IE(RSL_IE_Body:{meas_res_nr := meas_res_nr}),
+   tr_RSL_IE(RSL_IE_Body:{uplink_meas := ul_meas}),
+   tr_RSL_IE(RSL_IE_Body:{bs_power := bs_power}),
+   *
+   }
+   }
+
/* 8.4.10 BTS -> BSC */
template RSL_Message ts_RSL_MODE_MODIFY_ACK(RslChannelNr chan_nr) := {
msg_disc := ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false),

-- 
To view, visit https://gerrit.osmocom.org/6863
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib04b81891def2c15a62767a29b53c0fb605d45be
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte