ChannelDescription sometimes used as V, sometimes as LV field
diff --git a/sysinfo/GSM_SystemInformation.ttcn b/sysinfo/GSM_SystemInformation.ttcn
index 8001dd9..74852d4 100644
--- a/sysinfo/GSM_SystemInformation.ttcn
+++ b/sysinfo/GSM_SystemInformation.ttcn
@@ -142,7 +142,7 @@
LocationAreaIdentification lai,
CellSelectionParameters cell_sel_par,
RachControlParameters rach_control,
- ChannelDescription cbch_chan_desc optional,
+ ChannelDescriptionTV cbch_chan_desc optional,
MobileAllocationT cbch_mobile_alloc optional,
RestOctets rest_octets
} with { variant "TAG(cbch_chan_desc, iei = '64'O; cbch_mobile_alloc, iei = '72'O)" };
diff --git a/sysinfo/GSM_Types.ttcn b/sysinfo/GSM_Types.ttcn
index ecc714b..924788c 100644
--- a/sysinfo/GSM_Types.ttcn
+++ b/sysinfo/GSM_Types.ttcn
@@ -238,19 +238,20 @@
} with { variant (len) "LENGTHTO(cm2)" };
-
-
/* 44.018 10.5.2.5 */
type record ChannelDescription {
- OCT1 iei,
- BIT5 chan_type_tdma_offset,
- uint3_t tn,
+ RslChannelNr chan_nr,
uint3_t tsc,
boolean h,
uint12_t arfcn optional,
MaioHsn maio_hsn optional
- } with { variant (arfcn) "PRESENCE(h = true)"
- variant (maio_hsn) "PRESENCE(h = false)" };
+ } with { variant (arfcn) "PRESENCE(h = false)"
+ variant (maio_hsn) "PRESENCE(h = true)" };
+
+ type record ChannelDescriptionTV {
+ OCT1 iei,
+ ChannelDescription v
+ } with { variant "" };
/* 10.5.2.8 */
type enumerated ChannelNeeded {