osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

LTE RRC: upgrade dissector to v14.4.0 

Change-Id: If835450380263a012c3716cf2f2b6ee36a3201a0
Reviewed-on: https://code.wireshark.org/review/23765
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2017-09-27 16:16:48 +02:00
parent f835875499
commit 6ab87ad77d
11 changed files with 3822 additions and 2009 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V14.3.0 (2017-06)
-- 3GPP TS 36.331 V14.4.0 (2017-09)
--
EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=

314
epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V14.3.0 (2017-06)
-- 3GPP TS 36.331 V14.4.0 (2017-09)
--
EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -902,26 +902,47 @@ RRCConnectionReconfiguration-v890-IEs ::= SEQUENCE {
-- Late non-critical extensions:
RRCConnectionReconfiguration-v8m0-IEs ::= SEQUENCE {
-- Following field is only for pre REL-10 late non-critical extensions
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension RRCConnectionReconfiguration-v10i0-IEs OPTIONAL
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension RRCConnectionReconfiguration-v10i0-IEs OPTIONAL
}
RRCConnectionReconfiguration-v10i0-IEs ::= SEQUENCE {
antennaInfoDedicatedPCell-v10i0 AntennaInfoDedicated-v10i0 OPTIONAL, -- Need ON
-- Following field is only for late non-critical extensions from REL-10
nonCriticalExtension SEQUENCE {} OPTIONAL
antennaInfoDedicatedPCell-v10i0 AntennaInfoDedicated-v10i0 OPTIONAL, -- Need ON
nonCriticalExtension RRCConnectionReconfiguration-v10l0-IEs OPTIONAL
}
RRCConnectionReconfiguration-v10l0-IEs ::= SEQUENCE {
mobilityControlInfo-v10l0 MobilityControlInfo-v10l0 OPTIONAL,
sCellToAddModList-v10l0 SCellToAddModList-v10l0 OPTIONAL, -- Need ON
-- Following field is only for late non-critical extensions from REL-10 to REL-11
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension RRCConnectionReconfiguration-v12f0-IEs OPTIONAL
}
RRCConnectionReconfiguration-v12f0-IEs ::= SEQUENCE {
scg-Configuration-v12f0 SCG-Configuration-v12f0 OPTIONAL, -- Cond nonFullConfig
-- Following field is only for late non-critical extensions from REL-12
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension RRCConnectionReconfiguration-v1370-IEs OPTIONAL
}
RRCConnectionReconfiguration-v1370-IEs ::= SEQUENCE {
radioResourceConfigDedicated-v1370 RadioResourceConfigDedicated-v1370 OPTIONAL, -- Need ON
sCellToAddModListExt-v1370 SCellToAddModListExt-v1370 OPTIONAL, -- Need ON
-- Following field is only for late non-critical extensions from REL-13 onwards
nonCriticalExtension SEQUENCE {} OPTIONAL
}
-- Regular non-critical extensions:
RRCConnectionReconfiguration-v920-IEs ::= SEQUENCE {
otherConfig-r9 OtherConfig-r9 OPTIONAL, -- Need ON
fullConfig-r9 ENUMERATED {true} OPTIONAL, -- Cond HO-Reestab
otherConfig-r9 OtherConfig-r9 OPTIONAL, -- Need ON
fullConfig-r9 ENUMERATED {true} OPTIONAL, -- Cond HO-Reestab
nonCriticalExtension RRCConnectionReconfiguration-v1020-IEs OPTIONAL
}
RRCConnectionReconfiguration-v1020-IEs ::= SEQUENCE {
sCellToReleaseList-r10 SCellToReleaseList-r10 OPTIONAL, -- Need ON
sCellToAddModList-r10 SCellToAddModList-r10 OPTIONAL, -- Need ON
sCellToReleaseList-r10 SCellToReleaseList-r10 OPTIONAL, -- Need ON
sCellToAddModList-r10 SCellToAddModList-r10 OPTIONAL, -- Need ON
nonCriticalExtension RRCConnectionReconfiguration-v1130-IEs OPTIONAL
}
@ -956,15 +977,15 @@ RRCConnectionReconfiguration-v1310-IEs ::= SEQUENCE {
}
RRCConnectionReconfiguration-v1430-IEs ::= SEQUENCE {
sl-V2X-ConfigDedicated-r14 SL-V2X-ConfigDedicated-r14 OPTIONAL, -- Need ON
sCellToAddModListExt-v1430 SCellToAddModListExt-v1430 OPTIONAL, -- Need ON
sl-V2X-ConfigDedicated-r14 SL-V2X-ConfigDedicated-r14 OPTIONAL, -- Need ON
sCellToAddModListExt-v1430 SCellToAddModListExt-v1430 OPTIONAL, -- Need ON
perCC-GapIndicationRequest-r14 ENUMERATED{true} OPTIONAL, -- Need ON
systemInformationBlockType2Dedicated-r14 OCTET STRING (CONTAINING SystemInformationBlockType2) OPTIONAL, -- Need ON
systemInformationBlockType2Dedicated-r14 OCTET STRING (CONTAINING SystemInformationBlockType2) OPTIONAL, -- Cond nonHO
nonCriticalExtension SEQUENCE {} OPTIONAL
}
SL-SyncTxControl-r12 ::= SEQUENCE {
networkControlledSyncTx-r12 ENUMERATED {on, off} OPTIONAL -- Need OP
networkControlledSyncTx-r12 ENUMERATED {on, off} OPTIONAL -- Need OP
}
PSCellToAddMod-r12 ::= SEQUENCE {
@ -979,9 +1000,19 @@ PSCellToAddMod-r12 ::= SEQUENCE {
[[ antennaInfoDedicatedPSCell-v1280 AntennaInfoDedicated-v10i0 OPTIONAL -- Need ON
]],
[[ sCellIndex-r13 SCellIndex-r13 OPTIONAL -- Need ON
]],
[[ radioResourceConfigDedicatedPSCell-v1370 RadioResourceConfigDedicatedPSCell-v1370 OPTIONAL -- Need ON
]]
}
PSCellToAddMod-v12f0 ::= SEQUENCE {
radioResourceConfigCommonPSCell-r12 RadioResourceConfigCommonPSCell-v12f0 OPTIONAL
}
PSCellToAddMod-v1440 ::= SEQUENCE {
radioResourceConfigCommonPSCell-r14 RadioResourceConfigCommonPSCell-v1440 OPTIONAL
}
PowerCoordinationInfo-r12 ::= SEQUENCE {
p-MeNB-r12 INTEGER (1..16),
p-SeNB-r12 INTEGER (1..16),
@ -990,8 +1021,12 @@ PowerCoordinationInfo-r12 ::= SEQUENCE {
SCellToAddModList-r10 ::= SEQUENCE (SIZE (1..maxSCell-r10)) OF SCellToAddMod-r10
SCellToAddModList-v10l0 ::= SEQUENCE (SIZE (1..maxSCell-r10)) OF SCellToAddMod-v10l0
SCellToAddModListExt-r13 ::= SEQUENCE (SIZE (1..maxSCell-r13)) OF SCellToAddModExt-r13
SCellToAddModListExt-v1370 ::= SEQUENCE (SIZE (1..maxSCell-r13)) OF SCellToAddModExt-v1370
SCellToAddModListExt-v1430 ::= SEQUENCE (SIZE (1..maxSCell-r13)) OF SCellToAddModExt-v1430
SCellToAddMod-r10 ::= SEQUENCE {
@ -1011,6 +1046,10 @@ SCellToAddMod-r10 ::= SEQUENCE {
]]
}
SCellToAddMod-v10l0 ::= SEQUENCE {
radioResourceConfigCommonSCell-v10l0 RadioResourceConfigCommonSCell-v10l0 OPTIONAL
}
SCellToAddModExt-r13 ::= SEQUENCE {
sCellIndex-r13 SCellIndex-r13,
cellIdentification-r13 SEQUENCE {
@ -1022,6 +1061,10 @@ SCellToAddModExt-r13 ::= SEQUENCE {
antennaInfoDedicatedSCell-r13 AntennaInfoDedicated-v10i0 OPTIONAL -- Need ON
}
SCellToAddModExt-v1370 ::= SEQUENCE {
radioResourceConfigCommonSCell-v1370 RadioResourceConfigCommonSCell-v10l0 OPTIONAL
}
SCellToAddModExt-v1430 ::= SEQUENCE {
srs-SwitchFromServCellIndex-r14 INTEGER (0.. 31) OPTIONAL, -- Need ON
...
@ -1043,6 +1086,13 @@ SCG-Configuration-r12 ::= CHOICE {
}
}
SCG-Configuration-v12f0 ::= CHOICE {
release NULL,
setup SEQUENCE {
scg-ConfigPartSCG-v12f0 SCG-ConfigPartSCG-v12f0 OPTIONAL -- Need ON
}
}
SCG-ConfigPartSCG-r12 ::= SEQUENCE {
radioResourceConfigDedicatedSCG-r12 RadioResourceConfigDedicatedSCG-r12 OPTIONAL, -- Need ON
sCellToReleaseListSCG-r12 SCellToReleaseList-r10 OPTIONAL, -- Need ON
@ -1053,18 +1103,29 @@ SCG-ConfigPartSCG-r12 ::= SEQUENCE {
[[
sCellToReleaseListSCG-Ext-r13 SCellToReleaseListExt-r13 OPTIONAL, -- Need ON
sCellToAddModListSCG-Ext-r13 SCellToAddModListExt-r13 OPTIONAL -- Need ON
]],
[[
sCellToAddModListSCG-Ext-v1370 SCellToAddModListExt-v1370 OPTIONAL -- Need ON
]],
[[
pSCellToAddMod-v1440 PSCellToAddMod-v1440 OPTIONAL -- Need ON
]]
}
SCG-ConfigPartSCG-v12f0 ::= SEQUENCE {
pSCellToAddMod-v12f0 PSCellToAddMod-v12f0 OPTIONAL, -- Need ON
sCellToAddModListSCG-v12f0 SCellToAddModList-v10l0 OPTIONAL -- Need ON
}
SecurityConfigHO ::= SEQUENCE {
handoverType CHOICE {
intraLTE SEQUENCE {
securityAlgorithmConfig SecurityAlgorithmConfig OPTIONAL, -- Cond fullConfig
securityAlgorithmConfig SecurityAlgorithmConfig OPTIONAL, -- Cond fullConfig
keyChangeIndicator BOOLEAN,
nextHopChainingCount NextHopChainingCount
},
interRAT SEQUENCE {
securityAlgorithmConfig SecurityAlgorithmConfig,
securityAlgorithmConfig SecurityAlgorithmConfig,
nas-SecurityParamToEUTRA OCTET STRING (SIZE(6))
}
},
@ -1837,8 +1898,6 @@ SL-V2X-CommTxResourceReq-r14 ::= SEQUENCE {
v2x-DestinationInfoList-r14 SL-DestinationInfoList-r12 OPTIONAL
}
SL-TypeTxSyncList-r14 ::= SEQUENCE (SIZE (1..maxFreqV2X-r14)) OF SL-TypeTxSync-r14
SystemInformation-BR-r13 ::= SystemInformation
@ -1930,6 +1989,12 @@ SystemInformationBlockType1-v9e0-IEs ::= SEQUENCE {
SystemInformationBlockType1-v10j0-IEs ::= SEQUENCE {
freqBandInfo-r10 NS-PmaxList-r10 OPTIONAL, -- Need OR
multiBandInfoList-v10j0 MultiBandInfoList-v10j0 OPTIONAL, -- Need OR
nonCriticalExtension SystemInformationBlockType1-v10l0-IEs OPTIONAL
}
SystemInformationBlockType1-v10l0-IEs ::= SEQUENCE {
freqBandInfo-v10l0 NS-PmaxList-v10l0 OPTIONAL, -- Need OR
multiBandInfoList-v10l0 MultiBandInfoList-v10l0 OPTIONAL, -- Need OR
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -1965,7 +2030,7 @@ SystemInformationBlockType1-v1310-IEs ::= SEQUENCE {
ms160, ms200, spare},
si-RepetitionPattern-r13 ENUMERATED {everyRF, every2ndRF, every4thRF,
every8thRF},
schedulingInfoList-BR-r13 SchedulingInfoList-BR-r13 OPTIONAL, -- Need OR
schedulingInfoList-BR-r13 SchedulingInfoList-BR-r13 OPTIONAL, -- Cond SI-BR
fdd-DownlinkOrTddSubframeBitmapBR-r13 CHOICE {
subframePattern10-r13 BIT STRING (SIZE (10)),
subframePattern40-r13 BIT STRING (SIZE (40))
@ -2664,6 +2729,21 @@ SystemInformationBlockType2-v8h0-IEs ::= SEQUENCE {
SystemInformationBlockType2-v9e0-IEs ::= SEQUENCE {
ul-CarrierFreq-v9e0 ARFCN-ValueEUTRA-v9e0 OPTIONAL, -- Cond ul-FreqMax
nonCriticalExtension SystemInformationBlockType2-v9i0-IEs OPTIONAL
}
SystemInformationBlockType2-v9i0-IEs ::= SEQUENCE {
-- Following field is only for late non-critical extensions for REL-9
lateNonCriticalExtension OCTET STRING OPTIONAL,
-- Following field is only for late non-critical extensions from REL-10
nonCriticalExtension SystemInformationBlockType2-v10l0-IEs OPTIONAL
}
SystemInformationBlockType2-v10l0-IEs ::= SEQUENCE {
freqInfo-v10l0 SEQUENCE {
additionalSpectrumEmission-v10l0 AdditionalSpectrumEmission-v10l0
},
multiBandInfoList-v10l0 SEQUENCE (SIZE (1..maxMultiBands)) OF AdditionalSpectrumEmission-v10l0,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -2816,6 +2896,12 @@ CellReselectionServingFreqInfo-v1310 ::= SEQUENCE {
SystemInformationBlockType3-v10j0-IEs ::= SEQUENCE {
freqBandInfo-r10 NS-PmaxList-r10 OPTIONAL, -- Need OR
multiBandInfoList-v10j0 MultiBandInfoList-v10j0 OPTIONAL, -- Need OR
nonCriticalExtension SystemInformationBlockType3-v10l0-IEs OPTIONAL
}
SystemInformationBlockType3-v10l0-IEs ::= SEQUENCE {
freqBandInfo-v10l0 NS-PmaxList-v10l0 OPTIONAL, -- Need OR
multiBandInfoList-v10l0 MultiBandInfoList-v10l0 OPTIONAL, -- Need OR
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -2872,6 +2958,11 @@ SystemInformationBlockType5-v9e0-IEs ::= SEQUENCE {
SystemInformationBlockType5-v10j0-IEs ::= SEQUENCE {
interFreqCarrierFreqList-v10j0 SEQUENCE (SIZE (1..maxFreq)) OF InterFreqCarrierFreqInfo-v10j0 OPTIONAL, -- Need OR
nonCriticalExtension SystemInformationBlockType5-v10l0-IEs OPTIONAL
}
SystemInformationBlockType5-v10l0-IEs ::= SEQUENCE {
interFreqCarrierFreqList-v10l0 SEQUENCE (SIZE (1..maxFreq)) OF InterFreqCarrierFreqInfo-v10l0 OPTIONAL, -- Need OR
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -2933,6 +3024,11 @@ InterFreqCarrierFreqInfo-v10j0 ::= SEQUENCE {
multiBandInfoList-v10j0 MultiBandInfoList-v10j0 OPTIONAL -- Need OR
}
InterFreqCarrierFreqInfo-v10l0 ::= SEQUENCE {
freqBandInfo-v10l0 NS-PmaxList-v10l0 OPTIONAL, -- Need OR
multiBandInfoList-v10l0 MultiBandInfoList-v10l0 OPTIONAL -- Need OR
}
InterFreqCarrierFreqInfo-v1250 ::= SEQUENCE {
reducedMeasPerformance-r12 ENUMERATED {true} OPTIONAL, -- Need OP
q-QualMinRSRQ-OnAllSymbols-r12 Q-QualMin-r9 OPTIONAL -- Cond RSRQ2
@ -4513,6 +4609,8 @@ MAC-MainConfig ::= SEQUENCE {
dataInactivityTimer-r14 DataInactivityTimer-r14
}
} OPTIONAL -- Need ON
]],
[[ rai-Activation-r14 ENUMERATED {true} OPTIONAL -- Need OR
]]
}
@ -4983,7 +5081,7 @@ PhysicalConfigDedicated ::= SEQUENCE {
dB0, dB1, dB2, dB3} OPTIONAL -- Need ON
}
} OPTIONAL, -- Need ON
pusch-EnhancementsConfig-r14 PUSCH-EnhancementsConfig-r14 OPTIONAL, -- Need
pusch-EnhancementsConfig-r14 PUSCH-EnhancementsConfig-r14 OPTIONAL, -- Need ON
ce-pdsch-pusch-EnhancementConfig-r14 ENUMERATED {on} OPTIONAL, -- Need OR
antennaInfo-v1430 AntennaInfoDedicated-v1430 OPTIONAL, -- Need ON
pucch-ConfigDedicated-v1430 PUCCH-ConfigDedicated-v1430 OPTIONAL, -- Need ON
@ -5000,6 +5098,10 @@ PhysicalConfigDedicated ::= SEQUENCE {
]]
}
PhysicalConfigDedicated-v1370 ::= SEQUENCE {
pucch-ConfigDedicated-v1370 PUCCH-ConfigDedicated-v1370 OPTIONAL -- Need ON
}
PhysicalConfigDedicatedSCell-r10 ::= SEQUENCE {
-- DL configuration as well as configuration applicable for DL and UL
nonUL-Configuration-r10 SEQUENCE {
@ -5117,6 +5219,15 @@ PhysicalConfigDedicatedSCell-r10 ::= SEQUENCE {
]]
}
PhysicalConfigDedicatedSCell-v1370 ::= SEQUENCE {
pucch-SCell-v1370 CHOICE{
release NULL,
setup SEQUENCE {
pucch-ConfigDedicated-v1370 PUCCH-ConfigDedicated-v1370 OPTIONAL -- Need ON
}
}
}
LAA-SCellConfiguration-r13 ::= SEQUENCE {
subframeStartPosition-r13 ENUMERATED {s0, s07},
laa-SCellSubframeConfig-r13 BIT STRING (SIZE(8))
@ -5195,7 +5306,7 @@ PRACH-Config ::= SEQUENCE {
}
PRACH-Config-v1310 ::= SEQUENCE {
rsrp-ThresholdsPrachInfoList-r13 RSRP-ThresholdsPrachInfoList-r13 OPTIONAL, -- Cond HO
rsrp-ThresholdsPrachInfoList-r13 RSRP-ThresholdsPrachInfoList-r13 OPTIONAL, -- Cond MP
mpdcch-startSF-CSS-RA-r13 CHOICE {
fdd-r13 ENUMERATED {v1, v1dot5, v2, v2dot5, v4, v5, v8,
v10},
@ -5279,15 +5390,7 @@ PUCCH-ConfigDedicated ::= SEQUENCE {
PUCCH-ConfigDedicated-v1020 ::= SEQUENCE {
pucch-Format-r10 CHOICE {
format3-r10 SEQUENCE {
n3PUCCH-AN-List-r10 SEQUENCE (SIZE (1..4)) OF INTEGER (0..549) OPTIONAL, -- Need ON
twoAntennaPortActivatedPUCCH-Format3-r10 CHOICE {
release NULL,
setup SEQUENCE {
n3PUCCH-AN-ListP1-r10 SEQUENCE (SIZE (1..4)) OF INTEGER (0..549)
}
} OPTIONAL -- Need ON
},
format3-r10 PUCCH-Format3-Conf-r13,
channelSelection-r10 SEQUENCE {
n1PUCCH-AN-CS-r10 CHOICE {
release NULL,
@ -5405,6 +5508,23 @@ PUCCH-ConfigDedicated-r13 ::= SEQUENCE {
} OPTIONAL --Need ON
}
PUCCH-ConfigDedicated-v1370 ::= SEQUENCE {
pucch-Format-v1370 CHOICE {
release NULL,
setup PUCCH-Format3-Conf-r13
}
}
PUCCH-Format3-Conf-r13 ::= SEQUENCE {
n3PUCCH-AN-List-r13 SEQUENCE (SIZE (1..4)) OF INTEGER (0..549) OPTIONAL, -- Need ON
twoAntennaPortActivatedPUCCH-Format3-r13 CHOICE {
release NULL,
setup SEQUENCE {
n3PUCCH-AN-ListP1-r13 SEQUENCE (SIZE (1..4)) OF INTEGER (0..549)
}
} OPTIONAL -- Need ON
}
PUCCH-ConfigDedicated-v1430 ::= SEQUENCE {
pucch-NumRepetitionCE-format1-r14 ENUMERATED {r64,r128} OPTIONAL -- Need OR
}
@ -5531,7 +5651,7 @@ PUSCH-ConfigDedicated-r13 ::= SEQUENCE {
PUSCH-ConfigDedicated-v1430 ::= SEQUENCE {
ce-PUSCH-NB-MaxTBS-r14 ENUMERATED {on} OPTIONAL, -- Need OR
ce-PUSCH-MaxBandwidth-r14 ENUMERATED {bw5} OPTIONAL, -- Need OP
ce-PUSCH-MaxBandwidth-r14 ENUMERATED {bw5} OPTIONAL, -- Need OR
tdd-PUSCH-UpPTS-r14 TDD-PUSCH-UpPTS-r14 OPTIONAL, -- Need ON
ul-DMRS-IFDMA-r14 BOOLEAN,
enable256QAM-r14 Enable256QAM-r14 OPTIONAL -- Need ON
@ -5755,6 +5875,14 @@ RadioResourceConfigCommonPSCell-r12 ::= SEQUENCE {
]]
}
RadioResourceConfigCommonPSCell-v12f0 ::= SEQUENCE {
basicFields-v12f0 RadioResourceConfigCommonSCell-v10l0
}
RadioResourceConfigCommonPSCell-v1440 ::= SEQUENCE {
basicFields-v1440 RadioResourceConfigCommonSCell-v1440
}
RadioResourceConfigCommonSCell-r10 ::= SEQUENCE {
-- DL configuration as well as configuration applicable for DL and UL
nonUL-Configuration-r10 SEQUENCE {
@ -5824,6 +5952,21 @@ RadioResourceConfigCommonSCell-r10 ::= SEQUENCE {
]]
}
RadioResourceConfigCommonSCell-v10l0 ::= SEQUENCE {
-- UL configuration
ul-Configuration-v10l0 SEQUENCE {
additionalSpectrumEmissionSCell-v10l0 AdditionalSpectrumEmission-v10l0
}
}
RadioResourceConfigCommonSCell-v1440 ::= SEQUENCE {
ul-Configuration-v1440 SEQUENCE {
ul-FreqInfo-v1440 SEQUENCE {
additionalSpectrumEmissionSCell-v1440 AdditionalSpectrumEmission-v10l0
}
}
}
BCCH-Config ::= SEQUENCE {
modificationPeriodCoeff ENUMERATED {n2, n4, n8, n16}
}
@ -5833,15 +5976,15 @@ BCCH-Config-v1310 ::= SEQUENCE {
}
FreqHoppingParameters-r13 ::= SEQUENCE {
mpdcch-pdsch-HoppingNB-r13 ENUMERATED {nb2, nb4} OPTIONAL, -- Cond HO
interval-DLHoppingConfigCommonModeA-r13 CHOICE {
dummy ENUMERATED {nb2, nb4} OPTIONAL,
dummy2 CHOICE {
interval-FDD-r13 ENUMERATED {int1, int2, int4, int8},
interval-TDD-r13 ENUMERATED {int1, int5, int10, int20}
} OPTIONAL, -- Cond HO
interval-DLHoppingConfigCommonModeB-r13 CHOICE {
} OPTIONAL,
dummy3 CHOICE {
interval-FDD-r13 ENUMERATED {int2, int4, int8, int16},
interval-TDD-r13 ENUMERATED { int5, int10, int20, int40}
} OPTIONAL, -- Cond HO
} OPTIONAL,
interval-ULHoppingConfigCommonModeA-r13 CHOICE {
interval-FDD-r13 ENUMERATED {int1, int2, int4, int8},
interval-TDD-r13 ENUMERATED {int1, int5, int10, int20}
@ -5850,8 +5993,7 @@ FreqHoppingParameters-r13 ::= SEQUENCE {
interval-FDD-r13 ENUMERATED {int2, int4, int8, int16},
interval-TDD-r13 ENUMERATED { int5, int10, int20, int40}
} OPTIONAL, -- Cond MP-B
mpdcch-pdsch-HoppingOffset-r13 INTEGER (1..maxAvailNarrowBands-r13)
OPTIONAL -- Cond HO
dummy4 INTEGER (1..maxAvailNarrowBands-r13) OPTIONAL
}
PCCH-Config ::= SEQUENCE {
@ -5907,6 +6049,10 @@ RadioResourceConfigDedicated ::= SEQUENCE {
]]
}
RadioResourceConfigDedicated-v1370 ::= SEQUENCE {
physicalConfigDedicated-v1370 PhysicalConfigDedicated-v1370 OPTIONAL -- Need ON
}
RadioResourceConfigDedicatedPSCell-r12 ::= SEQUENCE {
-- UE specific configuration extensions applicable for an PSCell
physicalConfigDedicatedPSCell-r12 PhysicalConfigDedicated OPTIONAL, -- Need ON
@ -5919,6 +6065,10 @@ RadioResourceConfigDedicatedPSCell-r12 ::= SEQUENCE {
]]
}
RadioResourceConfigDedicatedPSCell-v1370 ::= SEQUENCE {
physicalConfigDedicatedPSCell-v1370 PhysicalConfigDedicated-v1370 OPTIONAL -- Need ON
}
RadioResourceConfigDedicatedSCG-r12 ::= SEQUENCE {
drb-ToAddModListSCG-r12 DRB-ToAddModListSCG-r12 OPTIONAL, -- Need ON
mac-MainConfigSCG-r12 MAC-MainConfig OPTIONAL, -- Need ON
@ -5935,6 +6085,8 @@ RadioResourceConfigDedicatedSCell-r10 ::= SEQUENCE {
[[ naics-Info-r12 NAICS-AssistanceInfo-r12 OPTIONAL -- Need ON
]],
[[ neighCellsCRS-InfoSCell-r13 NeighCellsCRS-Info-r13 OPTIONAL -- Need ON
]],
[[ physicalConfigDedicatedSCell-v1370 PhysicalConfigDedicatedSCell-v1370 OPTIONAL -- Need ON
]]
}
@ -6805,6 +6957,8 @@ ShortMAC-I ::= BIT STRING (SIZE (16))
AdditionalSpectrumEmission ::= INTEGER (1..32)
AdditionalSpectrumEmission-v10l0 ::= INTEGER (33..288)
ARFCN-ValueCDMA2000 ::= INTEGER (0..2047)
@ -6989,6 +7143,10 @@ MobilityControlInfo ::= SEQUENCE {
]]
}
MobilityControlInfo-v10l0 ::= SEQUENCE {
additionalSpectrumEmission-v10l0 AdditionalSpectrumEmission-v10l0 OPTIONAL -- Need ON
}
MobilityControlInfoSCG-r12 ::= SEQUENCE {
t307-r12 ENUMERATED {
ms50, ms100, ms150, ms200, ms500, ms1000,
@ -7033,8 +7191,8 @@ CarrierFreqEUTRA-v9e0 ::= SEQUENCE {
RACH-Skip-r14 ::= SEQUENCE {
targetTA-r14 CHOICE {
ta0-r14 NULL,
ptag-r14 NULL,
pstag-r14 NULL,
mcg-PTAG-r14 NULL,
scg-PTAG-r14 NULL,
mcg-STAG-r14 STAG-Id-r11,
scg-STAG-r14 STAG-Id-r11
},
@ -7066,6 +7224,8 @@ MultiBandInfoList-v9e0 ::= SEQUENCE (SIZE (1..maxMultiBands)) OF MultiBandInfo-v
MultiBandInfoList-v10j0 ::= SEQUENCE (SIZE (1..maxMultiBands)) OF NS-PmaxList-r10
MultiBandInfoList-v10l0 ::= SEQUENCE (SIZE (1..maxMultiBands)) OF NS-PmaxList-v10l0
MultiBandInfoList-r11 ::= SEQUENCE (SIZE (1..maxMultiBands)) OF FreqBandIndicator-r11
MultiBandInfo-v9e0 ::= SEQUENCE {
@ -7075,11 +7235,17 @@ MultiBandInfo-v9e0 ::= SEQUENCE {
NS-PmaxList-r10 ::= SEQUENCE (SIZE (1..maxNS-Pmax-r10)) OF NS-PmaxValue-r10
NS-PmaxList-v10l0 ::= SEQUENCE (SIZE (1..maxNS-Pmax-r10)) OF NS-PmaxValue-v10l0
NS-PmaxValue-r10 ::= SEQUENCE {
additionalPmax-r10 P-Max OPTIONAL, -- Need OP
additionalSpectrumEmission AdditionalSpectrumEmission
}
NS-PmaxValue-v10l0 ::= SEQUENCE {
additionalSpectrumEmission-v10l0 AdditionalSpectrumEmission-v10l0 OPTIONAL -- Need OP
}
PhysCellId ::= INTEGER (0..503)
@ -7334,10 +7500,10 @@ MeasGapConfig ::= CHOICE {
...,
gp2-r14 INTEGER (0..39),
gp3-r14 INTEGER (0..79),
gp-ncsg1-r14 INTEGER (0..39),
gp-ncsg2-r14 INTEGER (0..79),
gp-ncsg3-r14 INTEGER (0..39),
gp-ncsg4-r14 INTEGER (0..79),
gp-ncsg0-r14 INTEGER (0..39),
gp-ncsg1-r14 INTEGER (0..79),
gp-ncsg2-r14 INTEGER (0..39),
gp-ncsg3-r14 INTEGER (0..79),
gp-nonUniform1-r14 INTEGER (0..1279),
gp-nonUniform2-r14 INTEGER (0..2559),
gp-nonUniform3-r14 INTEGER (0..5119),
@ -8295,7 +8461,7 @@ OtherConfig-r9 ::= SEQUENCE {
powerPrefIndicationConfig-r11 PowerPrefIndicationConfig-r11 OPTIONAL, -- Need ON
obtainLocationConfig-r11 ObtainLocationConfig-r11 OPTIONAL -- Need ON
]],
[[ powerPrefIndicationTimer-r11 ENUMERATED {s0, s0dot5, s1, s2, s5, s10, s20,
[[ bw-PreferenceIndicationTimer-r14 ENUMERATED {s0, s0dot5, s1, s2, s5, s10, s20,
s30, s60, s90, s120, s300, s600, spare3,
spare2, spare1} OPTIONAL, -- Need OR
sps-AssistanceInfoReport-r14 BOOLEAN OPTIONAL, -- Need ON
@ -8473,7 +8639,19 @@ UE-EUTRA-Capability-v11x0-IEs ::= SEQUENCE {
UE-EUTRA-Capability-v12b0-IEs ::= SEQUENCE {
rf-Parameters-v12b0 RF-Parameters-v12b0 OPTIONAL,
nonCriticalExtension UE-EUTRA-Capability-v12x0-IEs OPTIONAL
}
UE-EUTRA-Capability-v12x0-IEs ::= SEQUENCE {
-- Following field is only to be used for late REL-12 extensions
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension UE-EUTRA-Capability-v1370-IEs OPTIONAL
}
UE-EUTRA-Capability-v1370-IEs ::= SEQUENCE {
ce-Parameters-v1370 CE-Parameters-v1370 OPTIONAL,
fdd-Add-UE-EUTRA-Capabilities-v1370 UE-EUTRA-CapabilityAddXDD-Mode-v1370 OPTIONAL,
tdd-Add-UE-EUTRA-Capabilities-v1370 UE-EUTRA-CapabilityAddXDD-Mode-v1370 OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -8664,6 +8842,12 @@ UE-EUTRA-Capability-v1430-IEs ::= SEQUENCE {
sl-Parameters-v1430 SL-Parameters-v1430 OPTIONAL,
ue-BasedNetwPerfMeasParameters-v1430 UE-BasedNetwPerfMeasParameters-v1430 OPTIONAL,
highSpeedEnhParameters-r14 HighSpeedEnhParameters-r14 OPTIONAL,
nonCriticalExtension UE-EUTRA-Capability-v1440-IEs OPTIONAL
}
UE-EUTRA-Capability-v1440-IEs ::= SEQUENCE {
lwa-Parameters-v1440 LWA-Parameters-v1440,
mac-Parameters-v1440 MAC-Parameters-v1440,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -8713,6 +8897,10 @@ UE-EUTRA-CapabilityAddXDD-Mode-v1320 ::= SEQUENCE {
scptm-Parameters-r13 SCPTM-Parameters-r13 OPTIONAL
}
UE-EUTRA-CapabilityAddXDD-Mode-v1370 ::= SEQUENCE {
ce-Parameters-v1370 CE-Parameters-v1370 OPTIONAL
}
UE-EUTRA-CapabilityAddXDD-Mode-v1430 ::= SEQUENCE {
phyLayerParameters-v1430 PhyLayerParameters-v1430 OPTIONAL,
mmtel-Parameters-r14 MMTEL-Parameters-r14 OPTIONAL
@ -8756,6 +8944,10 @@ MAC-Parameters-v1430 ::= SEQUENCE {
dataInactMon-r14 ENUMERATED {supported} OPTIONAL
}
MAC-Parameters-v1440 ::= SEQUENCE {
rai-Support-r14 ENUMERATED {supported} OPTIONAL
}
RLC-Parameters-r12 ::= SEQUENCE {
extended-RLC-LI-Field-r12 ENUMERATED {supported}
}
@ -9641,6 +9833,11 @@ CE-Parameters-v1350 ::= SEQUENCE {
unicastFrequencyHopping-r13 ENUMERATED {supported} OPTIONAL
}
CE-Parameters-v1370 ::= SEQUENCE {
tm9-CE-ModeA-r13 ENUMERATED {supported} OPTIONAL,
tm9-CE-ModeB-r13 ENUMERATED {supported} OPTIONAL
}
CE-Parameters-v1430 ::= SEQUENCE {
ce-SwitchWithoutHO-r14 ENUMERATED {supported} OPTIONAL
}
@ -9684,6 +9881,10 @@ LWA-Parameters-v1430 ::= SEQUENCE {
wlan-SupportedDataRate-r14 INTEGER (1..2048) OPTIONAL
}
LWA-Parameters-v1440 ::= SEQUENCE {
lwa-RLC-UM-r14 ENUMERATED {supported} OPTIONAL
}
WLAN-IW-Parameters-v1310 ::= SEQUENCE {
rclwi-r13 ENUMERATED {supported} OPTIONAL
}
@ -10473,6 +10674,15 @@ SL-DiscResourcePool-r12 ::= SEQUENCE {
syncConfigIndex-r13 INTEGER (0..15) OPTIONAL -- Need OR
}
} OPTIONAL -- Need ON
]],
[[ txParamsAddNeighFreq-v1370 CHOICE {
release NULL,
setup SEQUENCE {
freqInfo-v1370 SEQUENCE {
additionalSpectrumEmission-v1370 AdditionalSpectrumEmission-v10l0
}
}
} OPTIONAL -- Need ON
]]
}
@ -10512,7 +10722,12 @@ SL-DiscSysInfoReport-r13 ::= SEQUENCE {
} OPTIONAL,
p-Max-r13 P-Max OPTIONAL,
referenceSignalPower-r13 INTEGER (-60..50) OPTIONAL,
...
...,
[[
freqInfo-v1370 SEQUENCE {
additionalSpectrumEmission-v1370 AdditionalSpectrumEmission-v10l0
} OPTIONAL
]]
}
@ -10570,7 +10785,12 @@ SL-InterFreqInfoV2X-r14 ::= SEQUENCE {
sl-Bandwidth-r14 ENUMERATED {n6, n15, n25, n50, n75, n100} OPTIONAL, -- Need OR
v2x-SchedulingPool-r14 SL-CommResourcePoolV2X-r14 OPTIONAL, -- Need OR
v2x-UE-ConfigList-r14 SL-V2X-UE-ConfigList-r14 OPTIONAL, -- Need OR
...
...,
[[ additionalSpectrumEmissionV2X-r14 CHOICE {
additionalSpectrumEmission-r14 AdditionalSpectrumEmission,
additionalSpectrumEmission-v1440 AdditionalSpectrumEmission-v10l0
} OPTIONAL -- Need ON
]]
}

7
epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V14.3.0 (2017-06)
-- 3GPP TS 36.331 V14.4.0 (2017-09)
--
EUTRA-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::=
@ -6,6 +6,7 @@ BEGIN
IMPORTS
AdditionalSpectrumEmission,
AdditionalSpectrumEmission-v10l0,
ARFCN-ValueEUTRA-r9,
FilterCoefficient,
maxCBR-Level-r14,
@ -88,7 +89,9 @@ SL-PreconfigGeneral-r12 ::= SEQUENCE {
sl-bandwidth-r12 ENUMERATED {n6, n15, n25, n50, n75, n100},
tdd-ConfigSL-r12 TDD-ConfigSL-r12,
reserved-r12 BIT STRING (SIZE (19)),
...
...,
[[ additionalSpectrumEmission-v1440 AdditionalSpectrumEmission-v10l0 OPTIONAL
]]
}
SL-PreconfigSync-r12 ::= SEQUENCE {

2
epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V14.3.0 (2017-06)
-- 3GPP TS 36.331 V14.4.0 (2017-09)
--
EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=

2
epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V14.3.0 (2017-06)
-- 3GPP TS 36.331 V14.4.0 (2017-09)
--
NBIOT-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=

170
epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V14.3.0 (2017-06)
-- 3GPP TS 36.331 V14.4.0 (2017-09)
--
NBIOT-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -216,7 +216,7 @@ ChannelRasterOffset-NB-r13 ::= ENUMERATED {khz-7dot5, khz-2dot5, khz2dot5, khz7d
Guardband-NB-r13 ::= SEQUENCE {
rasterOffset-r13 ChannelRasterOffset-NB-r13,
spare BIT STRING (SIZE (3))
spare BIT STRING (SIZE (3))
}
Inband-SamePCI-NB-r13 ::= SEQUENCE {
@ -271,7 +271,7 @@ RRCConnectionReconfiguration-NB-r13-IEs ::= SEQUENCE {
RRCConnectionReconfigurationComplete-NB ::= SEQUENCE {
rrc-TransactionIdentifier RRC-TransactionIdentifier,
rrc-TransactionIdentifier RRC-TransactionIdentifier,
criticalExtensions CHOICE {
rrcConnectionReconfigurationComplete-r13 RRCConnectionReconfigurationComplete-NB-r13-IEs,
criticalExtensionsFuture SEQUENCE {}
@ -310,7 +310,7 @@ RRCConnectionReestablishment-NB-v1430-IEs ::= SEQUENCE {
RRCConnectionReestablishmentComplete-NB ::= SEQUENCE {
rrc-TransactionIdentifier RRC-TransactionIdentifier,
rrc-TransactionIdentifier RRC-TransactionIdentifier,
criticalExtensions CHOICE {
rrcConnectionReestablishmentComplete-r13 RRCConnectionReestablishmentComplete-NB-r13-IEs,
criticalExtensionsFuture SEQUENCE {}
@ -327,23 +327,23 @@ RRCConnectionReestablishmentRequest-NB ::= SEQUENCE {
criticalExtensions CHOICE {
rrcConnectionReestablishmentRequest-r13
RRCConnectionReestablishmentRequest-NB-r13-IEs,
later CHOICE {
rrcConnectionReestablishmentRequest-r14
later CHOICE {
rrcConnectionReestablishmentRequest-r14
RRCConnectionReestablishmentRequest-NB-r14-IEs,
criticalExtensionsFuture SEQUENCE {}
criticalExtensionsFuture SEQUENCE {}
}
}
}
RRCConnectionReestablishmentRequest-NB-r13-IEs ::= SEQUENCE {
ue-Identity-r13 ReestabUE-Identity,
reestablishmentCause-r13 ReestablishmentCause-NB-r13,
reestablishmentCause-r13 ReestablishmentCause-NB-r13,
spare BIT STRING (SIZE (25))
}
RRCConnectionReestablishmentRequest-NB-r14-IEs ::= SEQUENCE {
ue-Identity-r14 ReestabUE-Identity-CP-NB-r14,
reestablishmentCause-r14 ReestablishmentCause-NB-r13,
reestablishmentCause-r14 ReestablishmentCause-NB-r13,
spare BIT STRING (SIZE (4))
}
@ -351,9 +351,9 @@ ReestablishmentCause-NB-r13 ::= ENUMERATED {
reconfigurationFailure, otherFailure,
spare2, spare1}
ReestabUE-Identity-CP-NB-r14 ::= SEQUENCE {
s-TMSI-r14 S-TMSI,
ul-NAS-MAC-r14 BIT STRING (SIZE (16)),
ReestabUE-Identity-CP-NB-r14 ::= SEQUENCE {
s-TMSI-r14 S-TMSI,
ul-NAS-MAC-r14 BIT STRING (SIZE (16)),
ul-NAS-Count-r14 BIT STRING (SIZE (5))
}
@ -398,7 +398,7 @@ RRCConnectionRelease-NB-r13-IEs ::= SEQUENCE {
RRCConnectionRelease-NB-v1430-IEs ::= SEQUENCE {
redirectedCarrierInfo-v1430 RedirectedCarrierInfo-NB-v1430 OPTIONAL, -- Cond Redirection
extendedWaitTime-CPdata-r14 INTEGER (1..1800) OPTIONAL, -- Cond NoExtendedWaitTime
extendedWaitTime-CPdata-r14 INTEGER (1..1800) OPTIONAL, -- Cond NoExtendedWaitTime
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -521,13 +521,13 @@ RRCConnectionSetupComplete-NB-r13-IEs ::= SEQUENCE {
}
RRCConnectionSetupComplete-NB-v1430-IEs ::= SEQUENCE {
gummei-Type-r14 ENUMERATED { mapped} OPTIONAL,
dcn-ID-r14 INTEGER (0..65535) OPTIONAL,
gummei-Type-r14 ENUMERATED { mapped} OPTIONAL,
dcn-ID-r14 INTEGER (0..65535) OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
SCPTMConfiguration-NB-r14 ::= SEQUENCE {
SCPTMConfiguration-NB-r14 ::= SEQUENCE {
sc-mtch-InfoList-r14 SC-MTCH-InfoList-NB-r14,
scptm-NeighbourCellList-r14 SCPTM-NeighbourCellList-NB-r14 OPTIONAL, -- Need OP
lateNonCriticalExtension OCTET STRING OPTIONAL,
@ -616,10 +616,9 @@ SchedulingInfoList-NB-r13 ::= SEQUENCE (SIZE (1..maxSI-Message-NB-r13)) OF Sched
SchedulingInfo-NB-r13::= SEQUENCE {
si-Periodicity-r13 ENUMERATED {rf64, rf128, rf256, rf512,
rf1024, rf2048, rf4096, spare},
si-RepetitionPattern-r13 ENUMERATED {every2ndRF, every4thRF,
every8thRF, every16thRF},
si-RepetitionPattern-r13 ENUMERATED {every2ndRF, every4thRF, every8thRF, every16thRF},
sib-MappingInfo-r13 SIB-MappingInfo-NB-r13,
si-TB-r13 ENUMERATED {b56, b120, b208, b256, b328, b440, b552, b680}
si-TB-r13 ENUMERATED {b56, b120, b208, b256, b328, b440, b552, b680}
}
SystemInfoValueTagList-NB-r13 ::= SEQUENCE (SIZE (1.. maxSI-Message-NB-r13)) OF
@ -629,8 +628,8 @@ SIB-MappingInfo-NB-r13 ::= SEQUENCE (SIZE (0..maxSIB-1)) OF SIB-Type-NB-r13
SIB-Type-NB-r13 ::= ENUMERATED {
sibType3-NB-r13, sibType4-NB-r13, sibType5-NB-r13,
sibType14-NB-r13, sibType16-NB-r13, sibType15-NB-r14, sibType20-NB-r14,
sibType22-NB-r14}
sibType14-NB-r13, sibType16-NB-r13, sibType15-NB-r14,
sibType20-NB-r14, sibType22-NB-r14}
CellSelectionInfo-NB-v1350 ::= SEQUENCE {
delta-RxLevMin-v1350 INTEGER (-8..-1)
@ -698,7 +697,7 @@ SystemInformationBlockType2-NB-r13 ::= SEQUENCE {
},
timeAlignmentTimerCommon-r13 TimeAlignmentTimer,
multiBandInfoList-r13 SEQUENCE (SIZE (1..maxMultiBands)) OF AdditionalSpectrumEmission OPTIONAL, -- Need OR
lateNonCriticalExtension OCTET STRING OPTIONAL,
lateNonCriticalExtension OCTET STRING OPTIONAL,
...,
[[ cp-Reestablishment-r14 ENUMERATED {true} OPTIONAL -- Need OP
]]
@ -727,9 +726,9 @@ SystemInformationBlockType3-NB-r13 ::= SEQUENCE {
NS-PmaxList-NB-r13 OPTIONAL, -- Need OR
lateNonCriticalExtension OCTET STRING OPTIONAL,
...,
[[ intraFreqCellReselectionInfo-v1350 IntraFreqCellReselectionInfo-NB-v1350 OPTIONAL -- Cond Qrxlevmin
[[ intraFreqCellReselectionInfo-v1350 IntraFreqCellReselectionInfo-NB-v1350 OPTIONAL -- Cond Qrxlevmin
]],
[[ intraFreqCellReselectionInfo-v1360 IntraFreqCellReselectionInfo-NB-v1360 OPTIONAL -- Need OR
[[ intraFreqCellReselectionInfo-v1360 IntraFreqCellReselectionInfo-NB-v1360 OPTIONAL -- Need OR
]],
[[ intraFreqCellReselectionInfo-v1430 IntraFreqCellReselectionInfo-NB-v1430 OPTIONAL -- Need OR
]]
@ -781,7 +780,7 @@ InterFreqCarrierFreqInfo-NB-r13 ::= SEQUENCE {
interFreqBlackCellList-r13 InterFreqBlackCellList-NB-r13 OPTIONAL, -- Need OR
multiBandInfoList-r13 MultiBandInfoList-NB-r13 OPTIONAL, -- Need OR
...,
[[ delta-RxLevMin-v1350 INTEGER (-8..-1) OPTIONAL -- Cond Qrxlevmin
[[ delta-RxLevMin-v1350 INTEGER (-8..-1) OPTIONAL -- Cond Qrxlevmin
]],
[[ powerClass14dBm-Offset-r14 ENUMERATED {dB-6, dB-3, dB3, dB6, dB9, dB12} OPTIONAL, -- Need OP
ce-AuthorisationOffset-r14 ENUMERATED {dB5, dB10, dB15, dB20, dB25, dB30, dB35} OPTIONAL -- Need OP
@ -838,10 +837,10 @@ SystemInformationBlockType16-NB-r13 ::= SystemInformationBlockType16-r11
SystemInformationBlockType20-NB-r14 ::= SEQUENCE {
npdcch-SC-MCCH-Config-r14 NPDCCH-SC-MCCH-Config-NB-r14,
sc-mcch-CarrierConfig-r14 CHOICE {
dl-CarrierConfig-r14 DL-CarrierConfigCommon-NB-r14,
dl-CarrierConfig-r14 DL-CarrierConfigCommon-NB-r14,
dl-CarrierIndex-r14 INTEGER (0.. maxNonAnchorCarriers-NB-r14)
},
sc-mcch-RepetitionPeriod-r14 ENUMERATED {rf32, rf128, rf512, rf1024,
sc-mcch-RepetitionPeriod-r14 ENUMERATED {rf32, rf128, rf512, rf1024,
rf2048, rf4096, rf8192, rf16384},
sc-mcch-Offset-r14 INTEGER (0..10),
sc-mcch-ModificationPeriod-r14 ENUMERATED { rf32, rf128, rf256, rf512, rf1024,
@ -849,7 +848,7 @@ SystemInformationBlockType20-NB-r14 ::= SEQUENCE {
rf65536, rf131072, rf262144, rf524288,
rf1048576, spare1},
sc-mcch-SchedulingInfo-r14 SC-MCCH-SchedulingInfo-NB-r14 OPTIONAL, -- Need OP
lateNonCriticalExtension OCTET STRING OPTIONAL,
lateNonCriticalExtension OCTET STRING OPTIONAL,
...
}
@ -878,16 +877,16 @@ SC-MCCH-SchedulingInfo-NB-r14::= SEQUENCE {
sf40 INTEGER(0..39),
sf64 INTEGER(0..63),
sf80 INTEGER(0..79),
sf128 INTEGER(0..127),
sf160 INTEGER(0..159),
sf256 INTEGER(0..255),
sf320 INTEGER(0..319),
sf512 INTEGER(0..511),
sf640 INTEGER(0..639),
sf1024 INTEGER(0..1023),
sf2048 INTEGER(0..2047),
sf4096 INTEGER(0..4095),
sf8192 INTEGER(0..8191)
sf128 INTEGER(0..127),
sf160 INTEGER(0..159),
sf256 INTEGER(0..255),
sf320 INTEGER(0..319),
sf512 INTEGER(0..511),
sf640 INTEGER(0..639),
sf1024 INTEGER(0..1023),
sf2048 INTEGER(0..2047),
sf4096 INTEGER(0..4095),
sf8192 INTEGER(0..8191)
},
...
}
@ -897,7 +896,7 @@ SystemInformationBlockType22-NB-r14 ::= SEQUENCE {
dl-ConfigList-r14 DL-ConfigCommonList-NB-r14 OPTIONAL, -- Need OR
ul-ConfigList-r14 UL-ConfigCommonList-NB-r14 OPTIONAL, -- Need OR
pagingWeightAnchor-r14 PagingWeight-NB-r14 OPTIONAL, -- Cond pcch-config
nprach-ProbabilityAnchorList-r14 NPRACH-ProbabilityAnchorList-NB-r14 OPTIONAL, -- Cond nprach-config
nprach-ProbabilityAnchorList-r14 NPRACH-ProbabilityAnchorList-NB-r14 OPTIONAL, -- Cond nprach-config
lateNonCriticalExtension OCTET STRING OPTIONAL,
...
}
@ -910,7 +909,7 @@ UL-ConfigCommonList-NB-r14 ::= SEQUENCE (SIZE (1.. maxNonAnchorCarriers-NB-r14)
DL-ConfigCommon-NB-r14 ::= SEQUENCE {
dl-CarrierConfig-r14 DL-CarrierConfigCommon-NB-r14,
dl-CarrierConfig-r14 DL-CarrierConfigCommon-NB-r14,
pcch-Config-r14 PCCH-Config-NB-r14 OPTIONAL, -- Need OR
...
}
@ -938,26 +937,26 @@ NPRACH-ParametersList-NB-r14 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13
NPRACH-Parameters-NB-r14 ::= SEQUENCE {
nprach-Parameters-r14 SEQUENCE {
nprach-Parameters-r14 SEQUENCE {
nprach-Periodicity-r14 ENUMERATED {ms40, ms80, ms160, ms240,
ms320, ms640, ms1280, ms2560}
OPTIONAL, -- NEED OP
nprach-StartTime-r14 ENUMERATED {ms8, ms16, ms32, ms64,
nprach-StartTime-r14 ENUMERATED {ms8, ms16, ms32, ms64,
ms128, ms256, ms512, ms1024}
OPTIONAL, -- NEED OP
nprach-SubcarrierOffset-r14 ENUMERATED {n0, n12, n24, n36, n2, n18, n34, spare1}
OPTIONAL, -- NEED OP
nprach-NumSubcarriers-r14 ENUMERATED {n12, n24, n36, n48}
OPTIONAL, -- NEED OP
nprach-SubcarrierMSG3-RangeStart-r14 ENUMERATED {zero, oneThird, twoThird, one}
nprach-SubcarrierMSG3-RangeStart-r14 ENUMERATED {zero, oneThird, twoThird, one}
OPTIONAL, -- NEED OP
npdcch-NumRepetitions-RA-r14 ENUMERATED {r1, r2, r4, r8, r16, r32, r64, r128,
npdcch-NumRepetitions-RA-r14 ENUMERATED {r1, r2, r4, r8, r16, r32, r64, r128,
r256, r512, r1024, r2048,
spare4, spare3, spare2, spare1}
OPTIONAL, -- NEED OP
npdcch-StartSF-CSS-RA-r14 ENUMERATED {v1dot5, v2, v4, v8, v16, v32, v48, v64}
OPTIONAL, -- NEED OP
npdcch-Offset-RA-r14 ENUMERATED {zero, oneEighth, oneFourth, threeEighth}
npdcch-Offset-RA-r14 ENUMERATED {zero, oneEighth, oneFourth, threeEighth}
OPTIONAL, -- NEED OP
nprach-NumCBRA-StartSubcarriers-r14 ENUMERATED {n8, n10, n11, n12, n20, n22, n23, n24,
n32, n34, n35, n36, n40, n44, n46, n48}
@ -972,10 +971,10 @@ NPRACH-ProbabilityAnchorList-NB-r14 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-
NPRACH-ProbabilityAnchor-NB-r14
NPRACH-ProbabilityAnchor-NB-r14 ::= SEQUENCE {
nprach-ProbabilityAnchor-r14 ENUMERATED {
nprach-ProbabilityAnchor-r14 ENUMERATED {
zero, oneSixteenth, oneFifteenth, oneFourteenth,
oneThirteenth, oneTwelfth, oneEleventh, oneTenth,
oneNinth, oneEightth, oneSeventh, oneSixth,
oneNinth, oneEighth, oneSeventh, oneSixth,
oneFifth, oneFourth, oneThird, oneHalf}
OPTIONAL -- Need OP
}
@ -1000,16 +999,16 @@ DL-CarrierConfigDedicated-NB-r13 ::= SEQUENCE {
explicitGapConfiguration-r13 DL-GapConfig-NB-r13,
spare NULL
} OPTIONAL, -- Need ON
inbandCarrierInfo-r13 SEQUENCE {
samePCI-Indicator-r13 CHOICE {
samePCI-r13 SEQUENCE {
indexToMidPRB-r13 INTEGER (-55..54)
inbandCarrierInfo-r13 SEQUENCE {
samePCI-Indicator-r13 CHOICE {
samePCI-r13 SEQUENCE {
indexToMidPRB-r13 INTEGER (-55..54)
},
differentPCI-r13 SEQUENCE {
eutra-NumCRS-Ports-r13 ENUMERATED {same, four}
differentPCI-r13 SEQUENCE {
eutra-NumCRS-Ports-r13 ENUMERATED {same, four}
}
} OPTIONAL, -- Cond anchor-guardband
eutraControlRegionSize-r13 ENUMERATED {n1, n2, n3}
eutraControlRegionSize-r13 ENUMERATED {n1, n2, n3}
} OPTIONAL, -- Cond non-anchor-inband
...,
[[ nrs-PowerOffsetNonAnchor-v1330 ENUMERATED {dB-12, dB-10, dB-8, dB-6,
@ -1028,7 +1027,7 @@ CarrierFreq-NB-r13 ::= SEQUENCE {
carrierFreq-r13 ARFCN-ValueEUTRA-r9,
carrierFreqOffset-r13 ENUMERATED {
v-10, v-9, v-8, v-7, v-6, v-5, v-4, v-3, v-2, v-1, v-0dot5,
v0, v1, v2, v3, v4, v5, v6, v7, v8, v9
v0, v1, v2, v3, v4, v5, v6, v7, v8, v9
} OPTIONAL -- Need ON
}
@ -1060,7 +1059,7 @@ DL-CarrierConfigCommon-NB-r14 ::= SEQUENCE {
eutra-NumCRS-Ports-r14 ENUMERATED {same, four}
}
} OPTIONAL, -- Cond anchor-guardband
eutraControlRegionSize-r14 ENUMERATED {n1, n2, n3}
eutraControlRegionSize-r14 ENUMERATED {n1, n2, n3}
} OPTIONAL, -- Cond non-anchor-inband
nrs-PowerOffsetNonAnchor-r14 ENUMERATED {dB-12, dB-10, dB-8, dB-6,
dB-4, dB-2, dB0, dB3} DEFAULT dB0,
@ -1083,10 +1082,10 @@ LogicalChannelConfig-NB-r13 ::= SEQUENCE {
}
MAC-MainConfig-NB-r13 ::= SEQUENCE {
ul-SCH-Config-r13 SEQUENCE {
periodicBSR-Timer-r13 PeriodicBSR-Timer-NB-r13 OPTIONAL, -- Need ON
retxBSR-Timer-r13 RetxBSR-Timer-NB-r13
MAC-MainConfig-NB-r13 ::= SEQUENCE {
ul-SCH-Config-r13 SEQUENCE {
periodicBSR-Timer-r13 PeriodicBSR-Timer-NB-r13 OPTIONAL, -- Need ON
retxBSR-Timer-r13 RetxBSR-Timer-NB-r13
} OPTIONAL, -- Need ON
drx-Config-r13 DRX-Config-NB-r13 OPTIONAL, -- Need ON
timeAlignmentTimerDedicated-r13 TimeAlignmentTimer,
@ -1099,18 +1098,19 @@ MAC-MainConfig-NB-r13 ::= SEQUENCE {
}
} OPTIONAL, -- Need ON
...,
[[ rai-Activation-r14 ENUMERATED {true} OPTIONAL, -- Need OR
dataInactivityTimerConfig-r14 CHOICE {
[[ rai-Activation-r14 ENUMERATED {true} OPTIONAL, -- Need OR
dataInactivityTimerConfig-r14 CHOICE {
release NULL,
setup SEQUENCE {
dataInactivityTimer-r14 DataInactivityTimer-r14
}
} OPTIONAL -- Need ON
]],
[[ drx-Cycle-v1430 ENUMERATED {
[[ drx-Cycle-v1430 ENUMERATED {
sf1280, sf2560, sf5120, sf10240} OPTIONAL -- Need ON
]],
[[ ra-CFRA-Config-r14 ENUMERATED {true} OPTIONAL -- Need ON
]]
}
PeriodicBSR-Timer-NB-r13 ::= ENUMERATED {
@ -1173,7 +1173,7 @@ NPRACH-ParametersList-NB-r13 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)
NPRACH-ParametersList-NB-v1330 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF NPRACH-Parameters-NB-v1330
NPRACH-Parameters-NB-r13::= SEQUENCE {
NPRACH-Parameters-NB-r13::= SEQUENCE {
nprach-Periodicity-r13 ENUMERATED {ms40, ms80, ms160, ms240,
ms320, ms640, ms1280, ms2560},
nprach-StartTime-r13 ENUMERATED {ms8, ms16, ms32, ms64,
@ -1262,6 +1262,8 @@ PhysicalConfigDedicated-NB-r13 ::= SEQUENCE {
uplinkPowerControlDedicated-r13 UplinkPowerControlDedicated-NB-r13 OPTIONAL, -- Need ON
...,
[[ twoHARQ-ProcessesConfig-r14 ENUMERATED {true} OPTIONAL -- Need OR
]],
[[ interferenceRandomisationConfig-r14 ENUMERATED {true} OPTIONAL -- Need OR
]]
}
@ -1473,8 +1475,14 @@ UE-Capability-NB-r13 ::= SEQUENCE {
UE-Capability-NB-v1430-IEs ::= SEQUENCE {
ue-Category-NB-r14 ENUMERATED {nb2} OPTIONAL,
mac-Parameters-r14 MAC-Parameters-NB-r14 OPTIONAL, phyLayerParameters-v1430 PhyLayerParameters-NB-v1430 OPTIONAL,
mac-Parameters-r14 MAC-Parameters-NB-r14 OPTIONAL,
phyLayerParameters-v1430 PhyLayerParameters-NB-v1430 OPTIONAL,
rf-Parameters-v1430 RF-Parameters-NB-v1430,
nonCriticalExtension UE-Capability-NB-v1440-IEs OPTIONAL
}
UE-Capability-NB-v1440-IEs ::= SEQUENCE {
phyLayerParameters-v1440 PhyLayerParameters-NB-v1440 OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -1509,6 +1517,10 @@ PhyLayerParameters-NB-v1430 ::= SEQUENCE {
twoHARQ-Processes-r14 ENUMERATED {supported} OPTIONAL
}
PhyLayerParameters-NB-v1440 ::= SEQUENCE {
interferenceRandomisation-r14 ENUMERATED {supported} OPTIONAL
}
RF-Parameters-NB-r13 ::= SEQUENCE {
supportedBandList-r13 SupportedBandList-NB-r13,
multiNS-Pmax-r13 ENUMERATED {supported} OPTIONAL
@ -1576,9 +1588,9 @@ SC-MTCH-Info-NB-r14 ::= SEQUENCE {
spare3, spare2, spare1},
npdcch-StartSF-SC-MTCH-r14 ENUMERATED {v1dot5, v2, v4, v8,
v16, v32, v48, v64},
npdcch-Offset-SC-MTCH-r14 ENUMERATED {zero, oneEight, oneQuarter,
threeEight, oneHalf, fiveEight,
threeQuarter, sevenEight},
npdcch-Offset-SC-MTCH-r14 ENUMERATED {zero, oneEighth, oneQuarter,
threeEighth, oneHalf, fiveEighth,
threeQuarter, sevenEighth},
...
}
@ -1590,12 +1602,12 @@ SC-MTCH-SchedulingInfo-NB-r14 ::= SEQUENCE {
pp0, pp1, pp2, pp3,
pp4, pp8, pp16, pp32},
schedulingPeriodStartOffsetSCPTM-r14 CHOICE {
sf10 INTEGER(0..9),
sf20 INTEGER(0..19),
sf32 INTEGER(0..31),
sf40 INTEGER(0..39),
sf64 INTEGER(0..63),
sf80 INTEGER(0..79),
sf10 INTEGER(0..9),
sf20 INTEGER(0..19),
sf32 INTEGER(0..31),
sf40 INTEGER(0..39),
sf64 INTEGER(0..63),
sf80 INTEGER(0..79),
sf128 INTEGER(0..127),
sf160 INTEGER(0..159),
sf256 INTEGER(0..255),
@ -1611,11 +1623,11 @@ SC-MTCH-SchedulingInfo-NB-r14 ::= SEQUENCE {
}
SCPTM-NeighbourCellList-NB-r14 ::= SEQUENCE (SIZE (1..maxNeighCell-SCPTM-NB-r14)) OF PCI-ARFCN-NB-r14
SCPTM-NeighbourCellList-NB-r14 ::= SEQUENCE (SIZE (1..maxNeighCell-SCPTM-NB-r14)) OF PCI-ARFCN-NB-r14
PCI-ARFCN-NB-r14 ::= SEQUENCE {
physCellId-r14 PhysCellId,
carrierFreq-r14 CarrierFreq-NB-r13 OPTIONAL -- Need OP
PCI-ARFCN-NB-r14 ::= SEQUENCE {
physCellId-r14 PhysCellId,
carrierFreq-r14 CarrierFreq-NB-r13 OPTIONAL -- Need OP
}

2
epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V14.3.0 (2017-06)
-- 3GPP TS 36.331 V14.4.0 (2017-09)
--
NBIOT-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=

2
epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V14.3.0 (2017-06)
-- 3GPP TS 36.331 V14.4.0 (2017-09)
--
PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=

1
epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
View File

@ -102,7 +102,6 @@ SL-PreconfigV2X-Sync-r14
SL-PreconfigV2X-RxPoolList-r14
SL-PreconfigV2X-TxPoolList-r14
SL-Preconfiguration-r12
SL-TypeTxSyncList-r14
SL-V2X-PreconfigCommPool-r14
SL-V2X-PreconfigFreqInfo-r14
SL-V2X-PreconfigFreqList-r14

2
epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
View File

@ -1,7 +1,7 @@
/* packet-lte-rrc-template.c
* Routines for Evolved Universal Terrestrial Radio Access (E-UTRA);
* Radio Resource Control (RRC) protocol specification
* (3GPP TS 36.331 V14.3.0 Release 14) packet dissection
* (3GPP TS 36.331 V14.4.0 Release 14) packet dissection
* Copyright 2008, Vincent Helfre
* Copyright 2009-2017, Pascal Quantin
*

5327
epan/dissectors/packet-lte-rrc.c
View File

File diff suppressed because it is too large Load Diff