diff options
| author | Harald Welte <laforge@gnumonks.org> | 2017-07-16 21:03:17 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-07-16 21:03:17 +0200 |
| commit | ad091b6b10a98beab324ef52f49ba70907cd7547 (patch) | |
| tree | daedae1e44685edc9e6830387032a0a195c485dd /sysinfo | |
| parent | 5f0d5c8753902df59c8d5d884d4264b50b3b771d (diff) | |
ChannelDescription sometimes used as V, sometimes as LV field
Diffstat (limited to 'sysinfo')
| -rw-r--r-- | sysinfo/GSM_SystemInformation.ttcn | 2 | ||||
| -rw-r--r-- | sysinfo/GSM_Types.ttcn | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/sysinfo/GSM_SystemInformation.ttcn b/sysinfo/GSM_SystemInformation.ttcn index 8001dd9b..74852d43 100644 --- a/sysinfo/GSM_SystemInformation.ttcn +++ b/sysinfo/GSM_SystemInformation.ttcn @@ -142,7 +142,7 @@ module GSM_SystemInformation { 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 ecc714b0..924788cb 100644 --- a/sysinfo/GSM_Types.ttcn +++ b/sysinfo/GSM_Types.ttcn @@ -238,19 +238,20 @@ module GSM_Types { } 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 { |