GSM_SystemInformation: use GSM_RestOctets for SI3 and SI4 rest_octets
Change-Id: I3f00dd0b4863582fc5edf08149103150b8b5e97b
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 374228a..1ff0c61 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -322,7 +322,7 @@
},
cell_sel_par := ts_CellSelPar_default,
rach_control := ts_RachCtrl_default,
- rest_octets := enc_SI3RestOctets(valueof(ts_SI3RestOctets_def))
+ rest_octets := valueof(ts_SI3RestOctets_def)
}
}
}
@@ -347,7 +347,7 @@
rach_control := ts_RachCtrl_default,
cbch_chan_desc := omit,
cbch_mobile_alloc := omit,
- rest_octets := enc_SI4RestOctets(valueof(ts_SI4RestOctets_def))
+ rest_octets := valueof(ts_SI4RestOctets_def)
}
}
}
@@ -5226,13 +5226,9 @@
var SystemInformation si := f_get_si(L1CTL, si_type);
if (si_type == SYSTEM_INFORMATION_TYPE_3) {
- var RestOctets ro := si.payload.si3.rest_octets;
- var SI3RestOctets rest := dec_SI3RestOctets(ro);
- return rest.gprs_ind.presence == '1'B;
+ return si.payload.si3.rest_octets.gprs_ind.presence == '1'B;
} else if (si_type == SYSTEM_INFORMATION_TYPE_4) {
- var RestOctets ro := si.payload.si4.rest_octets;
- var SI4RestOctets rest := dec_SI4RestOctets(ro);
- return rest.gprs_ind.presence == '1'B;
+ return si.payload.si4.rest_octets.gprs_ind.presence == '1'B;
}
Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unhandled SI type");