fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42395?usp=email )
Change subject: bsc: f_TC_fh_params_gen_tr_ma(): simplify ma_mask calculation ......................................................................
bsc: f_TC_fh_params_gen_tr_ma(): simplify ma_mask calculation
Commented out code did not work back in 2020, but recent TITAN versions (we use 11.1.0) have no problems compiling/running it.
Change-Id: I1892366af13b80844bcda3f84d18578284c35e08 --- M bsc/BSC_Tests.ttcn 1 file changed, 2 insertions(+), 12 deletions(-)
Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 17f2326..e97ecb0 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -9907,22 +9907,12 @@ if (full_mask[i] != '1'B) { continue; }
- /* FIXME: ma_mask := ma_mask & slot_mask[i]; // triggers a bug in TITAN */ - if (slot_mask[i] == '1'B) { - ma_mask := ma_mask & '1'B; - } else { - ma_mask := ma_mask & '0'B; - } + ma_mask := ma_mask & slot_mask[i]; }
/* ARFCN 0 (if present) goes to the last position of the bit-mask */ if (full_mask[0] == '1'B) { - /* FIXME: ma_mask := ma_mask & slot_mask[0]; // triggers a bug in TITAN */ - if (slot_mask[0] == '1'B) { - ma_mask := ma_mask & '1'B; - } else { - ma_mask := ma_mask & '0'B; - } + ma_mask := ma_mask & slot_mask[0]; }
/* Ensure that ma_mask is octet-aligned */