GSM_RestOctets: SI2quater fixup: rename "Cell List" to "Repeated Cells"
So far the naming is so that the EUTRAN_NeighborCell sounds like it reflects a
single E-ARFCN, while in fact it contains a list of E-ARFCNs. In 3GPP TS 48.018
it is more accurately named "Neighbor Cells", in plural.
There is another "list layer" that allows repeating these lists of E-ARFCNs,
which the spec names Repeated Neighbor Cells, i.e. have a list of (=repeat) the
lists of E-ARFCNs.
Repeated Neighbor Cells = {
// first cells list
Neighbor Cells = {
cell descriptions = {
{ e_arfcn = 1, meas_bw = 3 },
{ e_arfcn = 2, meas_bw = 3 },
{ e_arfcn = 3, meas_bw = 3 },
},
prio, thresh, ...
},
// second cells list
Neighbor Cells = {
cell descriptions = {
{ e_arfcn = 4, meas_bw = 3 },
{ e_arfcn = 5, meas_bw = 3 },
{ e_arfcn = 6, meas_bw = 3 },
},
prio, thresh, ...
},
...
}
Adjust the naming of the SI2quaterRestOctets members to more closely resemble
this structure, adopting the naming in 3GPP TS 48.018:
EUTRAN_NeighborCell -> EUTRAN_NeighborCells
because it is really a collection of multiple E-ARFCNs
EUTRAN_NeighborCells -> EUTRAN_RepeatedNeighborCells
because it is a list of E-ARFCN lists, and 3GPP TS 48.018 names it
"Repeated Neighbor Cells".
Also rename the EUTRAN_NotAllowedCells accordingly.
Change-Id: Ib11d72c04cdb8997ec97321257fb58b2c113e790
diff --git a/library/GSM_RestOctets.ttcn b/library/GSM_RestOctets.ttcn
index 3bc9349..39f15bb 100644
--- a/library/GSM_RestOctets.ttcn
+++ b/library/GSM_RestOctets.ttcn
@@ -350,11 +350,11 @@
EUTRAN_GPRSMeasParamsDescOpt gprs_meas_params_desc,
/* { 1 < Repeated E-UTRAN Neighbour Cells > } ** 0 */
- EUTRAN_NeighbourCells neigh_cell_list optional,
- BIT1 neigh_cell_list_term ('0'B),
+ EUTRAN_RepeatedNeighbourCells repeated_neigh_cells optional,
+ BIT1 repeated_neigh_cells_term ('0'B),
/* { 1 < Repeated E-UTRAN Not Allowed Cells > } ** 0 */
- EUTRAN_NotAllowedCells not_allowed_cell_list optional,
- BIT1 not_allowed_cell_list_term ('0'B),
+ EUTRAN_RepeatedNotAllowedCells repeated_not_allowed_cells optional,
+ BIT1 repeated_not_allowed_cells_term ('0'B),
/* { 1 < Repeated E-UTRAN PCID to TA mapping > } ** 0 */
EUTRAN_PCID2TAMaps pcid2ta_map_list optional,
BIT1 pcid2ta_map_list_term ('0'B)
@@ -376,9 +376,9 @@
variant (desc) "PRESENCE(presence = '1'B)"
};
-/* Repeated E-UTRAN Neighbour Cell List */
-private type record of EUTRAN_NeighbourCell EUTRAN_NeighbourCells;
-private type record EUTRAN_NeighbourCell {
+/* Repeated E-UTRAN Neighbour Cells */
+private type record of EUTRAN_NeighbourCells EUTRAN_RepeatedNeighbourCells;
+private type record EUTRAN_NeighbourCells {
BIT1 item_ind ('1'B),
/* { 1 < Repeated E-UTRAN Neighbour Cells > } ** 0 */
EUTRAN_CellDescs cell_desc_list optional,
@@ -409,9 +409,9 @@
variant (meas_bw) "PRESENCE(meas_bw_presence = '1'B)"
};
-/* Repeated E-UTRAN Not Allowed Cell List */
-private type record of EUTRAN_NotAllowedCell EUTRAN_NotAllowedCells;
-private type record EUTRAN_NotAllowedCell {
+/* Repeated E-UTRAN Not Allowed Cells */
+private type record of EUTRAN_NotAllowedCells EUTRAN_RepeatedNotAllowedCells;
+private type record EUTRAN_NotAllowedCells {
BIT1 item_ind ('1'B),
/* FIXME: Not Allowed Cells : < PCID Group IE > (not implemented) */
BIT1 pcid_group_presence ('0'B),