fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28875 ) Change subject: library/GSM_RR_Types: make ts_SacchL1Header easier to use ...................................................................... library/GSM_RR_Types: make ts_SacchL1Header easier to use Move parameter 'fpc' at the end and assign false by default, so that there is not need to pass false. We never set it to true anyway. Change-Id: I8a0ef562c2426a637fbb9fe3d50711ee7738d04f --- M bts/BTS_Tests.ttcn M library/GSM_RR_Types.ttcn M library/LAPDm_RAW_PT.ttcn 3 files changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/28875/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 47d7ce1..adb0c2f 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -795,8 +795,7 @@ /* TITAN has weird (and often unusable) padding model, so we pad here manaully */ l3 := f_pad_oct(enc_GsmRrL3Message(meas_rep), 18, '00'O); l2 := f_pad_oct(enc_LapdmFrameAB(valueof(ts_LAPDm_AB(0, meas_rep))), 21, '00'O); - l1h := ts_SacchL1Header(g_pars.l1_pars.ms_power_level, false, - g_pars.l1_pars.ms_actual_ta); + l1h := ts_SacchL1Header(g_pars.l1_pars.ms_power_level, g_pars.l1_pars.ms_actual_ta); /* Send RR Measurement Report over the Um interface */ L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, ts_RslLinkID_SACCH(0), l1h, l2)); @@ -2121,8 +2120,7 @@ log("LAPDm: ", lb); var template (value) SacchL1Header l1h := ts_SacchL1Header( - g_pars.l1_pars.ms_power_level, false, - g_pars.l1_pars.ms_actual_ta); + g_pars.l1_pars.ms_power_level, g_pars.l1_pars.ms_actual_ta); /* According to 3GPP TS 44.018, section 10.5.2.20, we should pad with zeroes */ var octetstring l2 := f_pad_oct(enc_LapdmFrameAB(valueof(lb)), 21, '00'O); @@ -6897,7 +6895,7 @@ /* TODO: we can use an extension of TTCN-3 for padding, i.e. PADDING('2B'O) */ if (valueof(link_id.c) == SACCH) { /* Compose dummy L1 header */ - l1h := ts_SacchL1Header(g_pars.l1_pars.ms_power_level, false, g_pars.l1_pars.ms_actual_ta); + l1h := ts_SacchL1Header(g_pars.l1_pars.ms_power_level, g_pars.l1_pars.ms_actual_ta); L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(g_chan_nr, link_id, l1h, f_pad_oct(l2, 21, '2B'O))); } else { /* If required, pad L2 frame with constant 0x2b filling */ diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn index 980020e..335e290 100644 --- a/library/GSM_RR_Types.ttcn +++ b/library/GSM_RR_Types.ttcn @@ -198,7 +198,10 @@ external function dec_SacchL1Header(in octetstring stream) return SacchL1Header with { extension "prototype(convert) decode(RAW)" }; - template (value) SacchL1Header ts_SacchL1Header(uint5_t ms_power_lvl, boolean fpc, uint8_t actual_ta) := { + template (value) SacchL1Header + ts_SacchL1Header(uint5_t ms_power_lvl, + uint8_t actual_ta, + boolean fpc := false) := { reserved := 0, fpc := fpc, ms_power_lvl := ms_power_lvl, diff --git a/library/LAPDm_RAW_PT.ttcn b/library/LAPDm_RAW_PT.ttcn index 3e2fba2..946da67 100644 --- a/library/LAPDm_RAW_PT.ttcn +++ b/library/LAPDm_RAW_PT.ttcn @@ -494,7 +494,7 @@ link_id := valueof(ts_RslLinkID_SACCH(lpd.sapi)); buf := f_pad_oct(enc_LapdmFrame(lpd.lapdm), 21, '2B'O); var SacchL1Header l1h := valueof(ts_SacchL1Header(ms_power_lvl, - false, timing_adv)); + timing_adv)); L1CTL.send(ts_L1CTL_DATA_REQ_SACCH(chan_desc.chan_nr, link_id, l1h, buf)); } else { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8a0ef562c2426a637fbb9fe3d50711ee7738d04f Gerrit-Change-Number: 28875 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> Gerrit-MessageType: newchange