PCUIF: Allow receiving decoded RR/RLCMAC blocks in DATA REQ

This way tests can match directly on specific RLCMAC blocks, giving the
opportunity to handle different types using altsteps.
Before this, a user of the port could only receive a pcu_msg DATA_REQ
with a octetstring containing the rlcmac block, then decode it in a
second step when already in the alt step.

Related: OS#4927

Change-Id: Id8628e327d16c3a57e680e5a1ba0a2a8874f3a23
diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn
index d6e0867..31721c8 100644
--- a/library/PCUIF_Types.ttcn
+++ b/library/PCUIF_Types.ttcn
@@ -536,6 +536,28 @@
 	}
 }
 
+template PCUIF_data tr_PCUIF_DATA(template uint8_t trx_nr,
+				  template uint8_t ts_nr,
+				  template uint8_t block_nr := ?,
+				  template uint32_t fn := ?,
+				  template PCUIF_Sapi sapi := ?,
+				  template octetstring data := ?) := {
+	sapi := sapi,
+	len := ?,
+	data := data,
+	fn := fn,
+	arfcn := ?, /* unused in BTS */
+	trx_nr := trx_nr,
+	ts_nr := ts_nr,
+	block_nr := block_nr,
+	/* measurement parameters below unused on Tx */
+	rssi := 0,
+	ber10k := 0,
+	ta_offs_qbits := 0,
+	lqual_cb := 0
+
+}
+
 template (value) PCUIF_Message ts_PCUIF_DATA_REQ(uint8_t bts_nr, uint8_t trx_nr,
 						 uint8_t ts_nr, uint8_t block_nr,
 						 uint32_t fn, PCUIF_Sapi sapi,
@@ -572,21 +594,7 @@
 	bts_nr := bts_nr,
 	spare := '0000'O,
 	u := {
-		data_req := {
-			sapi := sapi,
-			len := ?,
-			data := data,
-			fn := fn,
-			arfcn := ?, /* unused in BTS */
-			trx_nr := trx_nr,
-			ts_nr := ts_nr,
-			block_nr := block_nr,
-			/* measurement parameters below unused on Tx */
-			rssi := 0,
-			ber10k := 0,
-			ta_offs_qbits := 0,
-			lqual_cb := 0
-		}
+		data_req := tr_PCUIF_DATA(trx_nr, ts_nr, block_nr, fn, sapi, data)
 	}
 }