bts: Extend Osmocom-specific RSL "supplementary meas info IE"

In osmo-bts Change-Id Iea4a4781481f77c6163d82dcd71a844a5be87bf2
we introduce an Osmocom specific "supplementary measurement info IE"
into the RSL MEAS REP message.  This commit adds the related type
definitions and extends the related matching in BTS_Tests.ttcn.

Change-Id: I5d1114c73508c67ad7cd9864d7370367612b1241
This commit is contained in:
Harald Welte 2018-06-29 08:51:42 +02:00
parent 4de3e377d1
commit 15de8ba162
2 changed files with 16 additions and 3 deletions

View File

@ -1240,8 +1240,13 @@ private function f_build_meas_res_tmpl() runs on ConnHdlr return template RSL_Me
supp_meas_info := omit
};
if (l1p.toa256_enabled) {
ul_meas.len := 5;
ul_meas.supp_meas_info := int2oct(l1p.timing_offset_256syms, 2);
ul_meas.len := (3+8);
ul_meas.supp_meas_info := {
toa256_mean := l1p.timing_offset_256syms,
toa256_min := ?,
toa256_max := ?,
toa256_std_dev := ?
}
}
/* HACK HACK HACK FIXME HACK HACK HACK see https://osmocom.org/issues/2988 */
ul_meas.rxlev_f_u := ?;

View File

@ -473,6 +473,14 @@ module RSL_Types {
frame_nr := tr_RSL_IE_FrameNumber(frame_nr)
}
/* Osmocom Extension */
type record RSL_IE_UplinkMeasSuppMeasInfo {
int16_t toa256_mean,
int16_t toa256_min,
int16_t toa256_max,
uint16_t toa256_std_dev
};
/* 9.3.25 */
type record RSL_IE_UplinkMeas {
uint8_t len,
@ -484,7 +492,7 @@ module RSL_Types {
BIT2 reserved2,
uint3_t rxq_f_u,
uint3_t rxq_s_u,
octetstring supp_meas_info optional
RSL_IE_UplinkMeasSuppMeasInfo 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 */