fixeria submitted this change.

View Change

bts: f_vgcs_talker_detect(): check received req. reference

Change-Id: Ie988408a4c13af72d93e2d29137c9e1ae9a0d408
---
M bts/BTS_Tests_ASCI.ttcn
M library/GSM_RR_Types.ttcn
2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/bts/BTS_Tests_ASCI.ttcn b/bts/BTS_Tests_ASCI.ttcn
index b982236..85ef39c 100644
--- a/bts/BTS_Tests_ASCI.ttcn
+++ b/bts/BTS_Tests_ASCI.ttcn
@@ -202,7 +202,6 @@
 {
 	var octetstring uplink_free := '082B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B'O;
 	var octetstring uplink_access := 'C0'O;
-	var template octetstring uplink_grant := '0609C0*'O;
 	var RSL_Message rm;
 	var GsmFrameNumber fn;
 
@@ -227,7 +226,9 @@
 	fn := f_L1CTL_RACH(L1CTL, oct2int(uplink_access), chan_nr := g_pars.chan_nr);
 
 	/* Receive UPLINK GRANT by the MS. */
-	f_l1_exp_lapdm(tr_LAPDm_UI(0, cr_MT_CMD, uplink_grant));
+	var RequestReference req_ref := f_compute_ReqRef(oct2int(uplink_access), fn);
+	var template (present) GsmRrL3Message uplink_grant := tr_VGCS_UplinkGrant(req_ref);
+	f_l1_exp_lapdm(tr_LAPDm_UI(0, cr_MT_CMD, decmatch uplink_grant));
 	log("Received VGCS UPLINK GRANT.");
 
 	/* Wait for talker detection. */
diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn
index 3dc1cd5..2ea8d6a 100644
--- a/library/GSM_RR_Types.ttcn
+++ b/library/GSM_RR_Types.ttcn
@@ -881,6 +881,29 @@
 		}
 	};
 
+	template (value) GsmRrL3Message
+	ts_VGCS_UplinkGrant(template (value) RequestReference req_ref,
+			    template (value) TimingAdvance ta) := {
+		header := ts_RrL3Header(VGCS_UPLINK_GRANT),
+		payload := {
+			vgcs_ul_grant := {
+				req_ref := req_ref,
+				ta := ta
+			}
+		}
+	};
+	template (present) GsmRrL3Message
+	tr_VGCS_UplinkGrant(template (present) RequestReference req_ref := ?,
+			    template (present) TimingAdvance ta := ?) := {
+		header := tr_RrL3Header(VGCS_UPLINK_GRANT),
+		payload := {
+			vgcs_ul_grant := {
+				req_ref := req_ref,
+				ta := ta
+			}
+		}
+	};
+
 	template (value) MeasurementResults
 	ts_MeasurementResults(template (value) uint6_t rxl_f := 63,
 			      template (value) uint6_t rxl_s := 63,

To view, visit change 42393. To unsubscribe, or for help writing mail filters, visit settings.