library: enrich tr_RLCMAC_DATA_RRBP, rename to tr_RLCMAC_DATA_GPRS

Let's make this template more flexible, so it can be used to match
any GPRS DL data blocks, not only those with rrbp_valid == true.

Note that behavior of f_rx_rlcmac_dl_block_exp_data() is
intentionally left unchanged, and will be fixed later.

Change-Id: I3940216368cdbb58fe89420675d1d8d5f5e49b05
Signed-off-by: Vadim Yanitskiy <axilirator@gmail.com>
This commit is contained in:
Vadim Yanitskiy 2020-05-10 13:13:46 +07:00
parent 0a9b148d2c
commit d4f22aaf31
2 changed files with 8 additions and 5 deletions

View File

@ -497,14 +497,16 @@ module RLCMAC_Templates {
}
}
template RlcmacDlBlock tr_RLCMAC_DATA_RRBP := {
template RlcmacDlBlock tr_RLCMAC_DATA_GPRS(template (present) boolean rrbp_valid := ?,
template (present) MacRrbp rrbp := ?,
template (present) uint3_t usf := ?) := {
data := {
mac_hdr := {
mac_hdr := {
payload_type := MAC_PT_RLC_DATA,
rrbp := ?,
rrbp_valid := true,
usf := ?
rrbp := rrbp,
rrbp_valid := rrbp_valid,
usf := usf
},
hdr_ext := ?
},

View File

@ -686,7 +686,8 @@ runs on RAW_PCU_Test_CT {
var PCUIF_Message pcu_msg;
var uint32_t dl_fn;
var boolean is_egprs := false;
var template RlcmacDlBlock dl_template := tr_RLCMAC_DATA_RRBP;
/* FIXME: for some reason, this template expects blocks with 'rrbp_valid' flag set */
var template RlcmacDlBlock dl_template := tr_RLCMAC_DATA_GPRS(rrbp_valid := true);
dl_template.data.blocks := ?;
f_rx_rlcmac_dl_block(dl_block, dl_fn);