diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-01-10 19:19:04 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-01-11 09:43:02 +0000 |
| commit | aa9376e0b4df49bf131f044ca5df274b92688914 (patch) | |
| tree | 0ae7cabe1de3f3ffd70628f3a60855360abff7ff /asn1 | |
| parent | d07364d0426fa7ef9fa4851c79340d6197f9e3c6 (diff) | |
LTE RRC: upgrade dissector to v12.4.0
Change-Id: I0bd6c124bd3aa0efe09db81135adc690751e08ae
Reviewed-on: https://code.wireshark.org/review/6477
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn | 126 | ||||
| -rw-r--r-- | asn1/lte-rrc/EUTRA-RRC-Definitions.asn | 880 | ||||
| -rw-r--r-- | asn1/lte-rrc/EUTRA-UE-Variables.asn | 23 | ||||
| -rw-r--r-- | asn1/lte-rrc/lte-rrc.cnf | 151 | ||||
| -rw-r--r-- | asn1/lte-rrc/packet-lte-rrc-template.c | 449 |
5 files changed, 1391 insertions, 238 deletions
diff --git a/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn b/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn index fd02477a82..a63057c8a6 100644 --- a/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn +++ b/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.331 V12.3.0 (2014-09) +-- 3GPP TS 36.331 V12.4.0 (2014-12) -- EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::= @@ -12,18 +12,32 @@ IMPORTS CellIdentity, C-RNTI, DL-DCCH-Message, + DRB-Identity, + DRB-ToReleaseList, InDeviceCoexIndication-r11, MasterInformationBlock, maxFreq, + maxDRB, + maxSCell-r10, + maxServCell-r10, MBMSInterestIndication-r11, MeasConfig, + MeasGapConfig, OtherConfig-r9, PhysCellId, + P-Max, + PowerCoordinationInfo-r12, RadioResourceConfigDedicated, + RRCConnectionReconfigurationComplete, RSRP-Range, RSRQ-Range, + RSRQ-Range-v12xy, SCellToAddModList-r10, + SCG-ConfigPartSCG-r12, SecurityAlgorithmConfig, + SCellIndex-r10, + SCellToReleaseList-r10, + ServCellIndex-r10, ShortMAC-I, SystemInformationBlockType1, SystemInformationBlockType1-v890-IEs, @@ -32,7 +46,7 @@ IMPORTS UECapabilityInformation, UE-CapabilityRAT-ContainerList, UE-RadioPagingInfo-r12, - WLAN-OffloadConfig-r12 + WLAN-OffloadConfig-r12 FROM EUTRA-RRC-Definitions; @@ -68,16 +82,16 @@ HandoverPreparationInformation ::= SEQUENCE { HandoverPreparationInformation-r8-IEs ::= SEQUENCE { ue-RadioAccessCapabilityInfo UE-CapabilityRAT-ContainerList, - as-Config AS-Config OPTIONAL, -- Cond HO + as-Config AS-Config OPTIONAL, -- Cond HO rrm-Config RRM-Config OPTIONAL, - as-Context AS-Context OPTIONAL, -- Cond HO + as-Context AS-Context OPTIONAL, -- Cond HO nonCriticalExtension HandoverPreparationInformation-v920-IEs OPTIONAL } HandoverPreparationInformation-v920-IEs ::= SEQUENCE { ue-ConfigRelease-r9 ENUMERATED { rel9, rel10, rel11, spare5, spare4, spare3, - spare2, spare1, ...} OPTIONAL, -- Cond HO2 + spare2, spare1, ...} OPTIONAL, -- Cond HO2 nonCriticalExtension HandoverPreparationInformation-v9d0-IEs OPTIONAL } @@ -97,12 +111,106 @@ HandoverPreparationInformation-v1130-IEs ::= SEQUENCE { } HandoverPreparationInformation-v12xy-IEs ::= SEQUENCE { - ue-SupportedEARFCN-r12 ARFCN-ValueEUTRA-r9 OPTIONAL, -- Cond HO3 - as-Config-v12xy AS-Config-v12xy OPTIONAL, -- Cond HO2 + ue-SupportedEARFCN-r12 ARFCN-ValueEUTRA-r9 OPTIONAL, -- Cond HO3 + as-Config-v12xy AS-Config-v12xy OPTIONAL, -- Cond HO2 nonCriticalExtension SEQUENCE {} OPTIONAL } +SCG-Config-r12 ::= SEQUENCE { + criticalExtensions CHOICE { + c1 CHOICE{ + scg-Config-r12 SCG-Config-r12-IEs, + spare7 NULL, + spare6 NULL, spare5 NULL, spare4 NULL, + spare3 NULL, spare2 NULL, spare1 NULL + }, + criticalExtensionsFuture SEQUENCE {} + } +} + +SCG-Config-r12-IEs ::= SEQUENCE { + scg-RadioConfig-r12 SCG-ConfigPartSCG-r12 OPTIONAL, + nonCriticalExtension SEQUENCE {} OPTIONAL +} + + +SCG-ConfigInfo-r12 ::= SEQUENCE { + criticalExtensions CHOICE { + c1 CHOICE{ + scg-ConfigInfo-r12 SCG-ConfigInfo-r12-IEs, + spare7 NULL, + spare6 NULL, spare5 NULL, spare4 NULL, + spare3 NULL, spare2 NULL, spare1 NULL + }, + criticalExtensionsFuture SEQUENCE {} + } +} + +SCG-ConfigInfo-r12-IEs ::= SEQUENCE { + -- Current dedicated MCG configuration + radioResourceConfigDedMCG-r12 RadioResourceConfigDedicated OPTIONAL, + securityAlgorithmConfig SecurityAlgorithmConfig OPTIONAL, + sCellToAddModListMCG-r12 SCellToAddModList-r10 OPTIONAL, + measGapConfig-r12 MeasGapConfig OPTIONAL, + -- MeNB controlled SCG configuration relevant for SeNB + powerCoordinationInfo-r12 PowerCoordinationInfo-r12 OPTIONAL, + -- Current SCG configuration (as delta signalling is used upon SCG change) + scg-RadioConfig-r12 SCG-ConfigPartSCG-r12 OPTIONAL, + -- UE capability related information + eutra-CapabilityInfo-r12 OCTET STRING (CONTAINING UECapabilityInformation) OPTIONAL, + scg-ConfigRestrictInfo-r12 SCG-ConfigRestrictInfo-r12 OPTIONAL, + -- AS-Context information + mbmsInterestIndication-r11 OCTET STRING (CONTAINING + MBMSInterestIndication-r11) OPTIONAL, + -- RRM config alike fields + measResultServCellListSCG-r12 MeasResultServCellListSCG-r12 OPTIONAL, + -- Fields for different SCG configuration request + drb-ToAddModListSCG-r12 DRB-InfoListSCG-r12 OPTIONAL, + drb-ToReleaseListSCG-r12 DRB-ToReleaseList OPTIONAL, + sCellToAddModListSCG-r12 SCellToAddModListSCG-r12 OPTIONAL, + sCellToReleaseListSCG-r12 SCellToReleaseList-r10 OPTIONAL, + -- Other fields + p-Max P-Max OPTIONAL, + nonCriticalExtension SEQUENCE {} OPTIONAL +} + +DRB-InfoListSCG-r12 ::= SEQUENCE (SIZE (1..maxDRB)) OF DRB-InfoSCG-r12 + +DRB-InfoSCG-r12 ::= SEQUENCE { + eps-BearerIdentity-r12 INTEGER (0..15) OPTIONAL, -- Cond DRB-Setup + drb-Identity-r12 DRB-Identity, + drb-Type-r12 ENUMERATED {split, scg} OPTIONAL -- Cond DRB-Setup +} + +SCellToAddModListSCG-r12 ::= SEQUENCE (SIZE (1..maxSCell-r10)) OF Cell-ToAddMod-r12 +Cell-ToAddMod-r12 ::= SEQUENCE { + sCellIndex-r12 SCellIndex-r10, + cellIdentification-r12 SEQUENCE { + physCellId-r12 PhysCellId, + dl-CarrierFreq-r12 ARFCN-ValueEUTRA + } OPTIONAL, -- Cond SCellAdd + measResultCellToAdd-r12 SEQUENCE { + rsrpResult-r12 RSRP-Range, + rsrqResult-r12 RSRQ-Range + } OPTIONAL -- Cond SCellAdd +} + +MeasResultServCellListSCG-r12 ::= SEQUENCE (SIZE (1..maxServCell-r10)) OF MeasResultServCellSCG-r12 +MeasResultServCellSCG-r12 ::= SEQUENCE { + servCellId-r12 ServCellIndex-r10, + measResultSCell-r12 SEQUENCE { + rsrpResultSCell-r12 RSRP-Range, + rsrqResultSCell-r12 RSRQ-Range + } +} + +SCG-ConfigRestrictInfo-r12 ::= SEQUENCE { + maxSCH-TB-BitsDL-r12 INTEGER (1..100), + maxSCH-TB-BitsUL-r12 INTEGER (1..100) +} + + UERadioAccessCapabilityInformation ::= SEQUENCE { criticalExtensions CHOICE { c1 CHOICE{ @@ -160,6 +268,8 @@ AS-Config ::= SEQUENCE { -- e.g. from a legacy source eNB ]], [[ sourceSCellConfigList-r10 SCellToAddModList-r10 OPTIONAL + ]], + [[ sourceConfigSCG-r12 SCG-Config-r12 OPTIONAL ]] } @@ -232,6 +342,8 @@ CandidateCellInfo-r10 ::= SEQUENCE { rsrqResult-r10 RSRQ-Range OPTIONAL, ..., [[ dl-CarrierFreq-v1090 ARFCN-ValueEUTRA-v9e0 OPTIONAL + ]], + [[ rsrqResult-v12xy RSRQ-Range-v12xy OPTIONAL ]] } diff --git a/asn1/lte-rrc/EUTRA-RRC-Definitions.asn b/asn1/lte-rrc/EUTRA-RRC-Definitions.asn index 8213eadb13..a096dc2b37 100644 --- a/asn1/lte-rrc/EUTRA-RRC-Definitions.asn +++ b/asn1/lte-rrc/EUTRA-RRC-Definitions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.331 V12.3.0 (2014-09) +-- 3GPP TS 36.331 V12.4.0 (2014-12) -- EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::= @@ -25,7 +25,7 @@ BCCH-DL-SCH-MessageType ::= CHOICE { } -MCCH-Message ::= SEQUENCE { +MCCH-Message ::= SEQUENCE { message MCCH-MessageType } @@ -135,7 +135,7 @@ UL-DCCH-MessageType ::= CHOICE { ueAssistanceInformation-r11 UEAssistanceInformation-r11, inDeviceCoexIndication-r11 InDeviceCoexIndication-r11, mbmsInterestIndication-r11 MBMSInterestIndication-r11, - spare13 NULL, + scgFailureInformation-r12 SCGFailureInformation-r12, spare12 NULL, spare11 NULL, spare10 NULL, spare9 NULL, spare8 NULL, spare7 NULL, spare6 NULL, spare5 NULL, spare4 NULL, @@ -421,7 +421,7 @@ LoggedMeasurementConfiguration-v12xy-IEs ::= SEQUENCE { nonCriticalExtension SEQUENCE {} OPTIONAL } -TargetMBSFN-AreaList-r12 ::= SEQUENCE (SIZE (0..8)) OF TargetMBSFN-Area-r12 +TargetMBSFN-AreaList-r12 ::= SEQUENCE (SIZE (0..8)) OF TargetMBSFN-Area-r12 TargetMBSFN-Area-r12 ::= SEQUENCE { mbsfn-AreaId-r12 INTEGER (0..255) OPTIONAL, -- Need OR @@ -464,7 +464,7 @@ MBMSCountingResponse-r10 ::= SEQUENCE { } MBMSCountingResponse-r10-IEs ::= SEQUENCE { - mbsfn-AreaIndex-r10 INTEGER (0..maxMBSFN-Area-1) OPTIONAL, + mbsfn-AreaIndex-r10 INTEGER (0..maxMBSFN-Area-1) OPTIONAL, countingResponseList-r10 CountingResponseList-r10 OPTIONAL, lateNonCriticalExtension OCTET STRING OPTIONAL, nonCriticalExtension SEQUENCE {} OPTIONAL @@ -510,7 +510,7 @@ MBSFNAreaConfiguration-v930-IEs ::= SEQUENCE { } MBSFNAreaConfiguration-v12xy-IEs ::= SEQUENCE { - pmch-InfoListExt-r12 PMCH-InfoListExt-r12 OPTIONAL, + pmch-InfoListExt-r12 PMCH-InfoListExt-r12 OPTIONAL, nonCriticalExtension SEQUENCE {} OPTIONAL } @@ -545,8 +545,8 @@ MobilityFromEUTRACommand ::= SEQUENCE { criticalExtensions CHOICE { c1 CHOICE{ mobilityFromEUTRACommand-r8 MobilityFromEUTRACommand-r8-IEs, - mobilityFromEUTRACommand-r9 MobilityFromEUTRACommand-r9-IEs, - spare2 NULL, spare1 NULL + mobilityFromEUTRACommand-r9 MobilityFromEUTRACommand-r9-IEs, + spare2 NULL, spare1 NULL }, criticalExtensionsFuture SEQUENCE {} } @@ -597,7 +597,7 @@ Handover ::= SEQUENCE { utra, geran, cdma2000-1XRTT, cdma2000-HRPD, spare4, spare3, spare2, spare1, ...}, targetRAT-MessageContainer OCTET STRING, - nas-SecurityParamFromEUTRA OCTET STRING (SIZE (1)) OPTIONAL, -- Cond UTRAGERAN + nas-SecurityParamFromEUTRA OCTET STRING (SIZE (1)) OPTIONAL, -- Cond UTRAGERAN systemInformation SI-OrPSI-GERAN OPTIONAL -- Cond PSHO } @@ -609,7 +609,7 @@ CellChangeOrder ::= SEQUENCE { geran SEQUENCE { physCellId PhysCellIdGERAN, carrierFreq CarrierFreqGERAN, - networkControlOrder BIT STRING (SIZE (2)) OPTIONAL, -- Need OP + networkControlOrder BIT STRING (SIZE (2)) OPTIONAL, -- Need OP systemInformation SI-OrPSI-GERAN OPTIONAL -- Need OP }, ... @@ -622,17 +622,17 @@ SI-OrPSI-GERAN ::= CHOICE { } E-CSFB-r9 ::= SEQUENCE { - messageContCDMA2000-1XRTT-r9 OCTET STRING OPTIONAL, -- Need ON + messageContCDMA2000-1XRTT-r9 OCTET STRING OPTIONAL, -- Need ON mobilityCDMA2000-HRPD-r9 ENUMERATED { handover, redirection } OPTIONAL, -- Need OP - messageContCDMA2000-HRPD-r9 OCTET STRING OPTIONAL, -- Cond concHO + messageContCDMA2000-HRPD-r9 OCTET STRING OPTIONAL, -- Cond concHO redirectCarrierCDMA2000-HRPD-r9 CarrierFreqCDMA2000 OPTIONAL -- Cond concRedir } Paging ::= SEQUENCE { - pagingRecordList PagingRecordList OPTIONAL, -- Need ON + pagingRecordList PagingRecordList OPTIONAL, -- Need ON systemInfoModification ENUMERATED {true} OPTIONAL, -- Need ON etws-Indication ENUMERATED {true} OPTIONAL, -- Need ON nonCriticalExtension Paging-v890-IEs OPTIONAL @@ -783,21 +783,39 @@ RRCConnectionReconfiguration-v1020-IEs ::= SEQUENCE { RRCConnectionReconfiguration-v1130-IEs ::= SEQUENCE { systemInfomationBlockType1Dedicated-r11 OCTET STRING (CONTAINING SystemInformationBlockType1) OPTIONAL, -- Need ON - nonCriticalExtension RRCConnectionReconfiguration-v12xy-IEs OPTIONAL -- Need OP + nonCriticalExtension RRCConnectionReconfiguration-v12xy-IEs OPTIONAL } RRCConnectionReconfiguration-v12xy-IEs ::= SEQUENCE { wlan-OffloadDedicated-r12 CHOICE { - release NULL, + release NULL, setup SEQUENCE { wlan-OffloadConfig-r12 WLAN-OffloadConfig-r12, t350-r12 ENUMERATED {min5, min10, min20, min30, min60, min120, min180, spare1} OPTIONAL-- Need ON } } OPTIONAL, -- Need ON + scg-Configuration-r12 SCG-Configuration-r12 OPTIONAL, -- Cond nonFullConfig nonCriticalExtension SEQUENCE {} OPTIONAL } +PSCell-r12 ::= SEQUENCE { + sCellIndex-r12 SCellIndex-r10, + cellIdentification-r12 SEQUENCE { + physCellId-r12 PhysCellId, + dl-CarrierFreq-r12 ARFCN-ValueEUTRA-r9 + } OPTIONAL, -- Cond SCellAdd + radioResourceConfigCommonPSCell-r12 RadioResourceConfigCommonPSCell-r12 OPTIONAL, -- Cond SCellAdd + radioResourceConfigDedicatedPSCell-r12 RadioResourceConfigDedicatedPSCell-r12 OPTIONAL, -- Cond SCellAdd2 + ... +} + +PowerCoordinationInfo-r12 ::= SEQUENCE { + p-MeNB-r12 INTEGER (1..16), + p-SeNB-r12 INTEGER (1..16), + powerControlMode-r12 INTEGER (1..2) +} + SCellToAddModList-r10 ::= SEQUENCE (SIZE (1..maxSCell-r10)) OF SCellToAddMod-r10 SCellToAddMod-r10 ::= SEQUENCE { @@ -815,6 +833,28 @@ SCellToAddMod-r10 ::= SEQUENCE { SCellToReleaseList-r10 ::= SEQUENCE (SIZE (1..maxSCell-r10)) OF SCellIndex-r10 +SCG-Configuration-r12 ::= CHOICE { + release NULL, + setup SEQUENCE { + scg-ConfigPartMCG SEQUENCE { + scg-Counter-r12 INTEGER (0.. 65535) OPTIONAL, -- Cond SCG-Est4 + powerCoordinationInfo-r12 PowerCoordinationInfo-r12 OPTIONAL, -- Cond SCG-Est + ... + } OPTIONAL, -- Cond SCG-Est6 + scg-ConfigPartSCG SCG-ConfigPartSCG-r12 OPTIONAL -- Cond SCG-Est5 + } +} + +SCG-ConfigPartSCG-r12 ::= SEQUENCE { + cipheringAlgorithmSCG-r12 CipheringAlgorithm-r12 OPTIONAL, -- Cond SCG-Est4 + radioResourceConfigDedicatedSCG-r12 RadioResourceConfigDedicatedSCG-r12 OPTIONAL, -- Cond SCG-Est + sCellToReleaseListSCG-r12 SCellToReleaseList-r10 OPTIONAL, -- Need ON + psCellToAddMod-r12 PSCell-r12 OPTIONAL, -- Cond SCG-Est + sCellToAddModListSCG-r12 SCellToAddModList-r10 OPTIONAL, -- Cond SCG-Est + mobilityControlInfoSCG-r12 MobilityControlInfoSCG-r12 OPTIONAL, -- Cond SCG-Est2 + ... +} + SecurityConfigHO ::= SEQUENCE { handoverType CHOICE { intraLTE SEQUENCE { @@ -873,8 +913,8 @@ RRCConnectionReestablishment ::= SEQUENCE { c1 CHOICE{ rrcConnectionReestablishment-r8 RRCConnectionReestablishment-r8-IEs, spare7 NULL, - spare6 NULL, spare5 NULL, spare4 NULL, - spare3 NULL, spare2 NULL, spare1 NULL + spare6 NULL, spare5 NULL, spare4 NULL, + spare3 NULL, spare2 NULL, spare1 NULL }, criticalExtensionsFuture SEQUENCE {} } @@ -1085,7 +1125,9 @@ IdleModeMobilityControlInfo ::= SEQUENCE { t320 ENUMERATED { min5, min10, min20, min30, min60, min120, min180, spare1} OPTIONAL, -- Need OR - ... + ..., + [[ freqPriorityListExtEUTRA-r12 FreqPriorityListExtEUTRA-r12 OPTIONAL -- Need ON + ]] } IdleModeMobilityControlInfo-v9e0 ::= SEQUENCE { @@ -1094,6 +1136,8 @@ IdleModeMobilityControlInfo-v9e0 ::= SEQUENCE { FreqPriorityListEUTRA ::= SEQUENCE (SIZE (1..maxFreq)) OF FreqPriorityEUTRA +FreqPriorityListExtEUTRA-r12 ::= SEQUENCE (SIZE (1..maxFreq)) OF FreqPriorityEUTRA-r12 + FreqPriorityEUTRA ::= SEQUENCE { carrierFreq ARFCN-ValueEUTRA, cellReselectionPriority CellReselectionPriority @@ -1103,6 +1147,11 @@ FreqPriorityEUTRA-v9e0 ::= SEQUENCE { carrierFreq-v9e0 ARFCN-ValueEUTRA-v9e0 OPTIONAL -- Cond EARFCN-max } +FreqPriorityEUTRA-r12 ::= SEQUENCE { + carrierFreq-r12 ARFCN-ValueEUTRA-r9, + cellReselectionPriority-r12 CellReselectionPriority +} + FreqsPriorityListGERAN ::= SEQUENCE (SIZE (1..maxGNFG)) OF FreqsPriorityGERAN FreqsPriorityGERAN ::= SEQUENCE { @@ -1266,6 +1315,32 @@ RegisteredMME ::= SEQUENCE { } +SCGFailureInformation-r12 ::= SEQUENCE { + criticalExtensions CHOICE { + c1 CHOICE { + scgFailureInformation-r12 SCGFailureInformation-r12-IEs, + spare3 NULL, spare2 NULL, spare1 NULL + }, + criticalExtensionsFuture SEQUENCE {} + } +} + +SCGFailureInformation-r12-IEs ::= SEQUENCE { + failureReportSCG-r12 FailureReportSCG-r12 OPTIONAL, + nonCriticalExtension SEQUENCE {} OPTIONAL +} + +FailureReportSCG-r12 ::= SEQUENCE { + failureType-r12 ENUMERATED {t313-Expiry, randomAccessProblem, + rlc-MaxNumRetx, scg-ChangeFailure } OPTIONAL, + measResultServFreqList-r12 MeasResultServFreqList-r10 OPTIONAL, + measResultNeighCells-r12 SEQUENCE { + measResultListEUTRA-r12 MeasResultList2EUTRA-r9 OPTIONAL + }, + ... +} + + SecurityModeCommand ::= SEQUENCE { rrc-TransactionIdentifier RRC-TransactionIdentifier, criticalExtensions CHOICE { @@ -1423,6 +1498,7 @@ SystemInformationBlockType1-v12xy-IEs ::= SEQUENCE { cellAccessRelatedInfo-v12xy SEQUENCE { category0Allowed-r12 ENUMERATED {true} OPTIONAL -- Need OR }, + cellSelectionInfo-v12xy CellSelectionInfo-v12xy OPTIONAL, -- Cond RSRQ2 nonCriticalExtension SEQUENCE {} OPTIONAL } @@ -1459,6 +1535,10 @@ CellSelectionInfo-v1130 ::= SEQUENCE { q-QualMinWB-r11 Q-QualMin-r9 } +CellSelectionInfo-v12xy ::= SEQUENCE { + q-QualMinRSRQ-OnAllSymbols-r12 Q-QualMin-r9 +} + UEAssistanceInformation-r11 ::= SEQUENCE { criticalExtensions CHOICE { @@ -1620,7 +1700,7 @@ UEInformationResponse-v12xy-IEs ::= SEQUENCE { nonCriticalExtension SEQUENCE {} OPTIONAL } -RLF-Report-r9 ::= SEQUENCE { +RLF-Report-r9 ::= SEQUENCE { measResultLastServCell-r9 SEQUENCE { rsrpResult-r9 RSRP-Range, rsrqResult-r9 RSRQ-Range OPTIONAL @@ -1674,12 +1754,15 @@ RLF-Report-r9 ::= SEQUENCE { ]], [[ failedPCellId-v12xy SEQUENCE { tac-FailedPCell-r12 TrackingAreaCode - } OPTIONAL + } OPTIONAL, + measResultLastServCell-v12xy RSRQ-Range-v12xy OPTIONAL, + lastServCellRSRQ-Type-r12 RSRQ-Type-r12 OPTIONAL, + measResultListEUTRA-v12xy MeasResultList2EUTRA-v12xy OPTIONAL ]] } -RLF-Report-v9e0 ::= SEQUENCE { +RLF-Report-v9e0 ::= SEQUENCE { measResultListEUTRA-v9e0 MeasResultList2EUTRA-v9e0 } @@ -1687,6 +1770,8 @@ MeasResultList2EUTRA-r9 ::= SEQUENCE (SIZE (1..maxFreq)) OF MeasResult2EUTRA- MeasResultList2EUTRA-v9e0 ::= SEQUENCE (SIZE (1..maxFreq)) OF MeasResult2EUTRA-v9e0 +MeasResultList2EUTRA-v12xy ::= SEQUENCE (SIZE (1..maxFreq)) OF MeasResult2EUTRA-v12xy + MeasResult2EUTRA-r9 ::= SEQUENCE { carrierFreq-r9 ARFCN-ValueEUTRA, measResultList-r9 MeasResultListEUTRA @@ -1696,6 +1781,10 @@ MeasResult2EUTRA-v9e0 ::= SEQUENCE { carrierFreq-v9e0 ARFCN-ValueEUTRA-v9e0 OPTIONAL } +MeasResult2EUTRA-v12xy ::= SEQUENCE { + rsrqType-r12 RSRQ-Type-r12 OPTIONAL +} + MeasResultList2UTRA-r9 ::= SEQUENCE (SIZE (1..maxFreq)) OF MeasResult2UTRA-r9 MeasResult2UTRA-r9 ::= SEQUENCE { @@ -1705,12 +1794,12 @@ MeasResult2UTRA-r9 ::= SEQUENCE { MeasResultList2CDMA2000-r9 ::= SEQUENCE (SIZE (1..maxFreq)) OF MeasResult2CDMA2000-r9 -MeasResult2CDMA2000-r9 ::= SEQUENCE { +MeasResult2CDMA2000-r9 ::= SEQUENCE { carrierFreq-r9 CarrierFreqCDMA2000, measResultList-r9 MeasResultsCDMA2000 } -LogMeasReport-r10 ::= SEQUENCE { +LogMeasReport-r10 ::= SEQUENCE { absoluteTimeStamp-r10 AbsoluteTimeInfo-r10, traceReference-r10 TraceReference-r10, traceRecordingSessionRef-r10 OCTET STRING (SIZE (2)), @@ -1720,9 +1809,9 @@ LogMeasReport-r10 ::= SEQUENCE { ... } -LogMeasInfoList-r10 ::= SEQUENCE (SIZE (1..maxLogMeasReport-r10)) OF LogMeasInfo-r10 +LogMeasInfoList-r10 ::= SEQUENCE (SIZE (1..maxLogMeasReport-r10)) OF LogMeasInfo-r10 -LogMeasInfo-r10 ::= SEQUENCE { +LogMeasInfo-r10 ::= SEQUENCE { locationInfo-r10 LocationInfo-r10 OPTIONAL, relativeTimeStamp-r10 INTEGER (0..7200), servCellIdentity-r10 CellGlobalIdEUTRA, @@ -1739,36 +1828,44 @@ LogMeasInfo-r10 ::= SEQUENCE { ..., [[ measResultListEUTRA-v1090 MeasResultList2EUTRA-v9e0 OPTIONAL ]], - [[ measResultListMBSFN-r12 MeasResultListMBSFN-r12 OPTIONAL + [[ measResultListMBSFN-r12 MeasResultListMBSFN-r12 OPTIONAL, + measResultServCell-v12xy RSRQ-Range-v12xy OPTIONAL, + servCellRSRQ-Type-r12 RSRQ-Type-r12 OPTIONAL, + measResultListEUTRA-v12xy MeasResultList2EUTRA-v12xy OPTIONAL ]] } -MeasResultListMBSFN-r12 ::= SEQUENCE (SIZE (1..8)) OF MeasResultMBSFN-r12 +MeasResultListMBSFN-r12 ::= SEQUENCE (SIZE (1..8)) OF MeasResultMBSFN-r12 -MeasResultMBSFN-r12 ::= SEQUENCE { +MeasResultMBSFN-r12 ::= SEQUENCE { mbsfn-Area-r12 SEQUENCE { mbsfn-AreaId-r12 INTEGER(0..255), carrierFreq-r12 ARFCN-ValueEUTRA-r9 }, rsrpResultMBSFN-r12 RSRP-Range, - rsrqResultMBSFN-r12 RSRQ-Range, - signallingBLER-Result-r12 BLER-Range-r12 OPTIONAL, + rsrqResultMBSFN-r12 MBSFN-RSRQ-Range-r12, + signallingBLER-Result-r12 BLER-Result-r12 OPTIONAL, dataBLER-MCH-ResultList-r12 DataBLER-MCH-ResultList-r12 OPTIONAL } DataBLER-MCH-ResultList-r12 ::= SEQUENCE (SIZE (1.. maxPMCH-PerMBSFN)) OF DataBLER-MCH-Result-r12 -DataBLER-MCH-Result-r12 ::= SEQUENCE { +DataBLER-MCH-Result-r12 ::= SEQUENCE { mch-Index-r12 INTEGER (1..maxPMCH-PerMBSFN), - dataBLER-Result-r12 BLER-Range-r12 + dataBLER-Result-r12 BLER-Result-r12 +} + +BLER-Result-r12 ::= SEQUENCE { + bler-r12 BLER-Range-r12, + blocksReceived-r12 BIT STRING (SIZE (11)) } BLER-Range-r12 ::= INTEGER(0..31) MeasResultList2GERAN-r10 ::= SEQUENCE (SIZE (1..maxCellListGERAN)) OF MeasResultListGERAN -ConnEstFailReport-r11 ::= SEQUENCE { +ConnEstFailReport-r11 ::= SEQUENCE { failedCellId-r11 CellGlobalIdEUTRA, locationInfo-r11 LocationInfo-r10 OPTIONAL, measResultFailedCell-r11 SEQUENCE { @@ -1786,7 +1883,11 @@ ConnEstFailReport-r11 ::= SEQUENCE { maxTxPowerReached-r11 BOOLEAN, timeSinceFailure-r11 TimeSinceFailure-r11, measResultListEUTRA-v1130 MeasResultList2EUTRA-v9e0 OPTIONAL, - ... + ..., + [[ measResultFailedCell-v12xy RSRQ-Range-v12xy OPTIONAL, + failedCellRSRQ-Type-r12 RSRQ-Type-r12 OPTIONAL, + measResultListEUTRA-v12xy MeasResultList2EUTRA-v12xy OPTIONAL + ]] } NumberOfPreamblesSent-r11::= INTEGER (1..200) @@ -1858,7 +1959,7 @@ SystemInformationBlockType2 ::= SEQUENCE { OPTIONAL, -- Need OP additionalSpectrumEmission AdditionalSpectrumEmission }, - mbsfn-SubframeConfigList MBSFN-SubframeConfigList OPTIONAL, -- Need OR + mbsfn-SubframeConfigList MBSFN-SubframeConfigList OPTIONAL, -- Need OR timeAlignmentTimerCommon TimeAlignmentTimer, ..., lateNonCriticalExtension OCTET STRING (CONTAINING SystemInformationBlockType2-v8h0-IEs) OPTIONAL, @@ -1868,9 +1969,10 @@ SystemInformationBlockType2 ::= SEQUENCE { [[ ac-BarringForCSFB-r10 AC-BarringConfig OPTIONAL -- Need OP ]], [[ - ac-BarringSkipForMMTELVoice-r12 ENUMERATED {true} OPTIONAL, -- Need OP - ac-BarringSkipForMMTELVideo-r12 ENUMERATED {true} OPTIONAL, -- Need OP - ac-BarringSkipForSMS-r12 ENUMERATED {true} OPTIONAL -- Need OP + ac-BarringSkipForMMTELVoice-r12 ENUMERATED {true} OPTIONAL, -- Need OP + ac-BarringSkipForMMTELVideo-r12 ENUMERATED {true} OPTIONAL, -- Need OP + ac-BarringSkipForSMS-r12 ENUMERATED {true} OPTIONAL, -- Need OP + ac-BarringPerPLMNList-r12 AC-BarringPerPLMNList-r12 OPTIONAL -- Need OP ]] } @@ -1892,7 +1994,24 @@ AC-BarringConfig ::= SEQUENCE { ac-BarringForSpecialAC BIT STRING (SIZE(5)) } -MBSFN-SubframeConfigList ::= SEQUENCE (SIZE (1..maxMBSFN-Allocations)) OF MBSFN-SubframeConfig +MBSFN-SubframeConfigList ::= SEQUENCE (SIZE (1..maxMBSFN-Allocations)) OF MBSFN-SubframeConfig + +AC-BarringPerPLMNList-r12 ::= SEQUENCE (SIZE (1.. maxPLMN-r11)) OF AC-BarringPerPLMN-r12 + +AC-BarringPerPLMN-r12 ::= SEQUENCE { + plmn-IdentityIndex-r12 INTEGER (1..maxPLMN-r11), + ac-BarringInfo-r12 SEQUENCE { + ac-BarringForEmergency-r12 BOOLEAN, + ac-BarringForMO-Signalling-r12 AC-BarringConfig OPTIONAL, -- Need OP + ac-BarringForMO-Data-r12 AC-BarringConfig OPTIONAL -- Need OP + } OPTIONAL, -- Need OP + ac-BarringSkipForMMTELVoice-r12 ENUMERATED {true} OPTIONAL, -- Need OP + ac-BarringSkipForMMTELVideo-r12 ENUMERATED {true} OPTIONAL, -- Need OP + ac-BarringSkipForSMS-r12 ENUMERATED {true} OPTIONAL, -- Need OP + ac-BarringForCSFB-r12 AC-BarringConfig OPTIONAL, -- Need OP + ssac-BarringForMMTEL-Voice-r12 AC-BarringConfig OPTIONAL, -- Need OP + ssac-BarringForMMTEL-Video-r12 AC-BarringConfig OPTIONAL -- Need OP +} SystemInformationBlockType3 ::= SEQUENCE { @@ -1939,6 +2058,8 @@ SystemInformationBlockType3 ::= SEQUENCE { threshServingLowQ-r9 ReselectionThresholdQ-r9 OPTIONAL -- Need OP ]], [[ q-QualMinWB-r11 Q-QualMin-r9 OPTIONAL -- Cond WB-RSRQ + ]], + [[ q-QualMinRSRQ-OnAllSymbols-r12 Q-QualMin-r9 OPTIONAL -- Cond RSRQ ]] } @@ -1975,11 +2096,21 @@ SystemInformationBlockType5-v8h0-IEs ::= SEQUENCE { SystemInformationBlockType5-v9e0-IEs ::= SEQUENCE { interFreqCarrierFreqList-v9e0 SEQUENCE (SIZE (1..maxFreq)) OF InterFreqCarrierFreqInfo-v9e0 OPTIONAL, -- Need OR + nonCriticalExtension SystemInformationBlockType5-v12xy-IEs OPTIONAL +} + +SystemInformationBlockType5-v12xy-IEs ::= SEQUENCE { + interFreqCarrierFreqList-v12xy InterFreqCarrierFreqList-v12xy OPTIONAL, -- Need OR + interFreqCarrierFreqListExt-r12 InterFreqCarrierFreqListExt-r12 OPTIONAL, -- Need OR nonCriticalExtension SEQUENCE {} OPTIONAL } InterFreqCarrierFreqList ::= SEQUENCE (SIZE (1..maxFreq)) OF InterFreqCarrierFreqInfo +InterFreqCarrierFreqList-v12xy ::= SEQUENCE (SIZE (1.. maxFreq)) OF InterFreqCarrierFreqInfo-v12xy + +InterFreqCarrierFreqListExt-r12 ::= SEQUENCE (SIZE (1.. maxFreq)) OF InterFreqCarrierFreqInfo-r12 + InterFreqCarrierFreqInfo ::= SEQUENCE { dl-CarrierFreq ARFCN-ValueEUTRA, q-RxLevMin Q-RxLevMin, @@ -1993,8 +2124,8 @@ InterFreqCarrierFreqInfo ::= SEQUENCE { cellReselectionPriority CellReselectionPriority OPTIONAL, -- Need OP neighCellConfig NeighCellConfig, q-OffsetFreq Q-OffsetRange DEFAULT dB0, - interFreqNeighCellList InterFreqNeighCellList OPTIONAL, -- Need OR - interFreqBlackCellList InterFreqBlackCellList OPTIONAL, -- Need OR + interFreqNeighCellList InterFreqNeighCellList OPTIONAL, -- Need OR + interFreqBlackCellList InterFreqBlackCellList OPTIONAL, -- Need OR ..., [[ q-QualMin-r9 Q-QualMin-r9 OPTIONAL, -- Need OP threshX-Q-r9 SEQUENCE { @@ -2015,6 +2146,37 @@ InterFreqCarrierFreqInfo-v9e0 ::= SEQUENCE { multiBandInfoList-v9e0 MultiBandInfoList-v9e0 OPTIONAL -- Need OR } +InterFreqCarrierFreqInfo-v12xy ::= SEQUENCE { + reducedMeasPerformance-r12 ENUMERATED {true} OPTIONAL, -- Need OR + q-QualMinRSRQ-OnAllSymbols-r12 Q-QualMin-r9 OPTIONAL -- Cond RSRQ2 +} + +InterFreqCarrierFreqInfo-r12 ::= SEQUENCE { + dl-CarrierFreq-r12 ARFCN-ValueEUTRA-r9, + q-RxLevMin-r12 Q-RxLevMin, + p-Max-r12 P-Max OPTIONAL, -- Need OP + t-ReselectionEUTRA-r12 T-Reselection, + t-ReselectionEUTRA-SF-r12 SpeedStateScaleFactors OPTIONAL, -- Need OP + threshX-High-r12 ReselectionThreshold, + threshX-Low-r12 ReselectionThreshold, + allowedMeasBandwidth-r12 AllowedMeasBandwidth, + presenceAntennaPort1-r12 PresenceAntennaPort1, + cellReselectionPriority-r12 CellReselectionPriority OPTIONAL, -- Need OP + neighCellConfig-r12 NeighCellConfig, + q-OffsetFreq-r12 Q-OffsetRange DEFAULT dB0, + interFreqNeighCellList-r12 InterFreqNeighCellList OPTIONAL, -- Need OR + interFreqBlackCellList-r12 InterFreqBlackCellList OPTIONAL, -- Need OR + q-QualMin-r12 Q-QualMin-r9 OPTIONAL, -- Need OP + threshX-Q-r12 SEQUENCE { + threshX-HighQ-r12 ReselectionThresholdQ-r9, + threshX-LowQ-r12 ReselectionThresholdQ-r9 + } OPTIONAL, -- Cond RSRQ + q-QualMinWB-r12 Q-QualMin-r9 OPTIONAL, -- Cond WB-RSRQ + multiBandInfoList-r12 MultiBandInfoList-r11 OPTIONAL, -- Need OR + reducedMeasPerformance-r12 ENUMERATED {true} OPTIONAL, -- Need OR +... +} + InterFreqNeighCellList ::= SEQUENCE (SIZE (1..maxCellInter)) OF InterFreqNeighCellInfo InterFreqNeighCellInfo ::= SEQUENCE { @@ -2026,8 +2188,8 @@ InterFreqBlackCellList ::= SEQUENCE (SIZE (1..maxCellBlack)) OF PhysCellIdRang SystemInformationBlockType6 ::= SEQUENCE { - carrierFreqListUTRA-FDD CarrierFreqListUTRA-FDD OPTIONAL, -- Need OR - carrierFreqListUTRA-TDD CarrierFreqListUTRA-TDD OPTIONAL, -- Need OR + carrierFreqListUTRA-FDD CarrierFreqListUTRA-FDD OPTIONAL, -- Need OR + carrierFreqListUTRA-TDD CarrierFreqListUTRA-TDD OPTIONAL, -- Need OR t-ReselectionUTRA T-Reselection, t-ReselectionUTRA-SF SpeedStateScaleFactors OPTIONAL, -- Need OP ..., @@ -2036,14 +2198,30 @@ SystemInformationBlockType6 ::= SEQUENCE { SystemInformationBlockType6-v8h0-IEs ::= SEQUENCE { carrierFreqListUTRA-FDD-v8h0 SEQUENCE (SIZE (1..maxUTRA-FDD-Carrier)) OF CarrierFreqInfoUTRA-FDD-v8h0 OPTIONAL, -- Cond UTRA-FDD + nonCriticalExtension SystemInformationBlockType6-v12xy-IEs OPTIONAL +} + +SystemInformationBlockType6-v12xy-IEs ::= SEQUENCE { + carrierFreqListUTRA-FDD-v12xy SEQUENCE (SIZE (1..maxUTRA-FDD-Carrier)) OF + CarrierFreqInfoUTRA-v12xy OPTIONAL, -- Cond UTRA-FDD + carrierFreqListUTRA-TDD-v12xy SEQUENCE (SIZE (1..maxUTRA-TDD-Carrier)) OF + CarrierFreqInfoUTRA-v12xy OPTIONAL, -- Cond UTRA-TDD + carrierFreqListUTRA-FDD-Ext-r12 + CarrierFreqListUTRA-FDD-Ext-r12 OPTIONAL, -- Cond UTRA-FDD + carrierFreqListUTRA-TDD-Ext-r12 + CarrierFreqListUTRA-TDD-Ext-r12 OPTIONAL, -- Cond UTRA-TDD nonCriticalExtension SEQUENCE {} OPTIONAL } +CarrierFreqInfoUTRA-v12xy ::= SEQUENCE { + reducedMeasPerformance-r12 ENUMERATED {true} OPTIONAL -- Need OR +} + CarrierFreqListUTRA-FDD ::= SEQUENCE (SIZE (1..maxUTRA-FDD-Carrier)) OF CarrierFreqUTRA-FDD CarrierFreqUTRA-FDD ::= SEQUENCE { carrierFreq ARFCN-ValueUTRA, - cellReselectionPriority CellReselectionPriority OPTIONAL, -- Need OP + cellReselectionPriority CellReselectionPriority OPTIONAL, -- Need OP threshX-High ReselectionThreshold, threshX-Low ReselectionThreshold, q-RxLevMin INTEGER (-60..-13), @@ -2061,11 +2239,31 @@ CarrierFreqInfoUTRA-FDD-v8h0 ::= SEQUENCE { multiBandInfoList SEQUENCE (SIZE (1..maxMultiBands)) OF FreqBandIndicator-UTRA-FDD OPTIONAL -- Need OR } +CarrierFreqListUTRA-FDD-Ext-r12 ::= SEQUENCE (SIZE (1..maxUTRA-FDD-Carrier)) OF + CarrierFreqUTRA-FDD-Ext-r12 + +CarrierFreqUTRA-FDD-Ext-r12 ::= SEQUENCE { + carrierFreq-r12 ARFCN-ValueUTRA, + cellReselectionPriority-r12 CellReselectionPriority OPTIONAL, -- Need OP + threshX-High-r12 ReselectionThreshold, + threshX-Low-r12 ReselectionThreshold, + q-RxLevMin-r12 INTEGER (-60..-13), + p-MaxUTRA-r12 INTEGER (-50..33), + q-QualMin-r12 INTEGER (-24..0), + threshX-Q-r12 SEQUENCE { + threshX-HighQ-r12 ReselectionThresholdQ-r9, + threshX-LowQ-r12 ReselectionThresholdQ-r9 + } OPTIONAL, -- Cond RSRQ + multiBandInfoList-r12 SEQUENCE (SIZE (1..maxMultiBands)) OF FreqBandIndicator-UTRA-FDD OPTIONAL, -- Need OR + reducedMeasPerformance-r12 ENUMERATED {true} OPTIONAL, -- Need OR + ... +} + CarrierFreqListUTRA-TDD ::= SEQUENCE (SIZE (1..maxUTRA-TDD-Carrier)) OF CarrierFreqUTRA-TDD CarrierFreqUTRA-TDD ::= SEQUENCE { carrierFreq ARFCN-ValueUTRA, - cellReselectionPriority CellReselectionPriority OPTIONAL, -- Need OP + cellReselectionPriority CellReselectionPriority OPTIONAL, -- Need OP threshX-High ReselectionThreshold, threshX-Low ReselectionThreshold, q-RxLevMin INTEGER (-60..-13), @@ -2073,6 +2271,20 @@ CarrierFreqUTRA-TDD ::= SEQUENCE { ... } +CarrierFreqListUTRA-TDD-Ext-r12 ::= SEQUENCE (SIZE (1..maxUTRA-TDD-Carrier)) OF + CarrierFreqUTRA-TDD-r12 + +CarrierFreqUTRA-TDD-r12 ::= SEQUENCE { + carrierFreq-r12 ARFCN-ValueUTRA, + cellReselectionPriority-r12 CellReselectionPriority OPTIONAL, -- Need OP + threshX-High-r12 ReselectionThreshold, + threshX-Low-r12 ReselectionThreshold, + q-RxLevMin-r12 INTEGER (-60..-13), + p-MaxUTRA-r12 INTEGER (-50..33), + reducedMeasPerformance-r12 ENUMERATED {true} OPTIONAL, -- Need OR + ... +} + FreqBandIndicator-UTRA-FDD ::= INTEGER (1..86) @@ -2263,7 +2475,7 @@ SystemInformationBlockType11 ::= SEQUENCE { warningMessageSegmentType ENUMERATED {notLastSegment, lastSegment}, warningMessageSegmentNumber INTEGER (0..63), warningMessageSegment OCTET STRING, - dataCodingScheme OCTET STRING (SIZE (1)) OPTIONAL, -- Cond Segment1 + dataCodingScheme OCTET STRING (SIZE (1)) OPTIONAL, -- Cond Segment1 ..., lateNonCriticalExtension OCTET STRING OPTIONAL } @@ -2275,7 +2487,7 @@ SystemInformationBlockType12-r9 ::= SEQUENCE { warningMessageSegmentType-r9 ENUMERATED {notLastSegment, lastSegment}, warningMessageSegmentNumber-r9 INTEGER (0..63), warningMessageSegment-r9 OCTET STRING, - dataCodingScheme-r9 OCTET STRING (SIZE (1)) OPTIONAL, -- Cond Segment1 + dataCodingScheme-r9 OCTET STRING (SIZE (1)) OPTIONAL, -- Cond Segment1 lateNonCriticalExtension OCTET STRING OPTIONAL, ... } @@ -2355,10 +2567,9 @@ SystemInformationBlockType17-r12 ::= SEQUENCE { ... } -WLAN-OffloadPerPLMN-r12 ::= SEQUENCE { - plmn-Identity-r12 INTEGER (1..maxPLMN-r11), - wlan-OffloadConfigCommon-r12 WLAN-OffloadConfig-r12, - wlan-Id-List-r12 WLAN-Id-List-r12 OPTIONAL +WLAN-OffloadPerPLMN-r12 ::= SEQUENCE { + wlan-OffloadConfigCommon-r12 WLAN-OffloadConfig-r12 OPTIONAL, -- Need OR + wlan-Id-List-r12 WLAN-Id-List-r12 OPTIONAL -- Need OR } WLAN-Id-List-r12 ::= SEQUENCE (SIZE (1..maxWLAN-Id-r12)) OF WLAN-Id-r12 @@ -2389,7 +2600,7 @@ AntennaInfoDedicated ::= SEQUENCE { n4TxAntenna-tm5 BIT STRING (SIZE (16)), n2TxAntenna-tm6 BIT STRING (SIZE (4)), n4TxAntenna-tm6 BIT STRING (SIZE (16)) - } OPTIONAL, -- Cond TM + } OPTIONAL, -- Cond TM ue-TransmitAntennaSelection CHOICE{ release NULL, setup ENUMERATED {closedLoop, openLoop} @@ -2400,7 +2611,7 @@ AntennaInfoDedicated-v920 ::= SEQUENCE { codebookSubsetRestriction-v920 CHOICE { n2TxAntenna-tm8-r9 BIT STRING (SIZE (6)), n4TxAntenna-tm8-r9 BIT STRING (SIZE (32)) - } OPTIONAL -- Cond TM8 + } OPTIONAL -- Cond TM8 } AntennaInfoDedicated-r10 ::= SEQUENCE { @@ -2465,7 +2676,10 @@ CQI-ReportConfig-v12x0 ::= SEQUENCE { } } OPTIONAL, -- Need ON cqi-ReportBoth-r12 CQI-ReportBoth-r12, - cqi-ReportAperiodic-v12x0 CQI-ReportAperiodic-v12x0 OPTIONAL -- Need ON + cqi-ReportAperiodic-v12x0 CQI-ReportAperiodic-v12x0 OPTIONAL, -- Need ON + altCQI-Table-r12 ENUMERATED { + allSubframes-r12, csi-SubframeSet1-r12, + csi-SubframeSet2-r12, spare1} OPTIONAL -- Need OR } CQI-ReportConfigSCell-r10 ::= SEQUENCE { @@ -2486,7 +2700,7 @@ CQI-ReportPeriodic ::= CHOICE { k INTEGER (1..4) } }, - ri-ConfigIndex INTEGER (0..1023) OPTIONAL, -- Need OR + ri-ConfigIndex INTEGER (0..1023) OPTIONAL, -- Need OR simultaneousAckNackAndCQI BOOLEAN } } @@ -2697,13 +2911,24 @@ CSI-RS-Config-r10 ::= SEQUENCE { } CSI-RS-Config2-r12 ::= SEQUENCE { - zeroTxPowerCSI-RS-r12 CHOICE { + eimta-ZeroTxPowerCSI-RS-r12 CHOICE { release NULL, setup SEQUENCE { zeroTxPowerResourceConfigList-r12 BIT STRING (SIZE (16)), zeroTxPowerSubframeConfig-r12 INTEGER (0..154) } - } OPTIONAL -- Need ON + } OPTIONAL, -- Need ON + ds-ZeroTxPowerCSI-RS-r12 CHOICE { + release NULL, + setup SEQUENCE { + zeroTxPowerCSI-RS-List-r12 SEQUENCE (SIZE (1..maxDS-ZTP-CSI-RS-r12)) OF ZeroTxPowerCSI-RS-r12 + } + } OPTIONAL -- Need ON +} + +ZeroTxPowerCSI-RS-r12 ::= SEQUENCE { + zeroTxPowerResourceConfigList-r12 BIT STRING (SIZE (16)), + zeroTxPowerSubframeConfig-r12 INTEGER (0..154) } @@ -2830,6 +3055,8 @@ LogicalChannelConfig ::= SEQUENCE { } OPTIONAL, -- Cond UL ..., [[ logicalChannelSR-Mask-r9 ENUMERATED {setup} OPTIONAL -- Cond SRmask + ]], + [[ logicalChannelSR-Prohibit-r12 BOOLEAN OPTIONAL -- Need ON ]] } @@ -2848,7 +3075,7 @@ MAC-MainConfig ::= SEQUENCE { sf320, sf640, sf1280, sf2560, sf5120, sf10240, spare2, spare1}, ttiBundling BOOLEAN - } OPTIONAL, -- Need ON + } OPTIONAL, -- Need ON drx-Config DRX-Config OPTIONAL, -- Need ON timeAlignmentTimerDedicated TimeAlignmentTimer, phr-Config CHOICE { @@ -2876,9 +3103,20 @@ MAC-MainConfig ::= SEQUENCE { stag-ToAddModList-r11 STAG-ToAddModList-r11 OPTIONAL, -- Need ON drx-Config-v1130 DRX-Config-v1130 OPTIONAL -- Need ON ]], - [[ e-HARQ-Pattern-r12 BOOLEAN OPTIONAL -- Need ON + [[ e-HARQ-Pattern-r12 BOOLEAN OPTIONAL, -- Need ON + dualConnectivityPHR CHOICE { + release NULL, + setup SEQUENCE { + phr-ModeOtherCG-r12 ENUMERATED {real, virtual} + } + } OPTIONAL, -- Need ON + logicalChannelSR-Config-r12 CHOICE { + release NULL, + setup SEQUENCE { + logicalChannelSR-ProhibitTimer-r12 ENUMERATED {sf20, sf40, sf64, sf128, sf512, sf1024, sf2560, spare1} + } + } OPTIONAL -- Need ON ]] - } MAC-MainConfigSCell-r11 ::= SEQUENCE { @@ -2989,6 +3227,14 @@ PDCP-Config ::= SEQUENCE { [[ rn-IntegrityProtection-r10 ENUMERATED {enabled} OPTIONAL -- Cond RN ]], [[ pdcp-SN-Size-v1130 ENUMERATED {len15bits} OPTIONAL -- Cond Rlc-AM2 + ]], + [[ ul-DataPath-r12 ENUMERATED {mcg, scg} OPTIONAL, -- Need ON + t-Reordering-r12 ENUMERATED { + ms0, ms20, ms40, ms60, ms80, ms100, ms120, ms140, + ms160, ms180, ms200, ms220, ms240, ms260, ms280, ms300, + ms500, ms750, spare14, spare13, spare12, spare11, spare10, + spare9, spare8, spare7, spare6, spare5, spare4, spare3, + spare2, spare1} OPTIONAL -- Cond SetupS ]] } @@ -3048,15 +3294,15 @@ PhysicalConfigDedicated ::= SEQUENCE { pucch-ConfigDedicated PUCCH-ConfigDedicated OPTIONAL, -- Need ON pusch-ConfigDedicated PUSCH-ConfigDedicated OPTIONAL, -- Need ON uplinkPowerControlDedicated UplinkPowerControlDedicated OPTIONAL, -- Need ON - tpc-PDCCH-ConfigPUCCH TPC-PDCCH-Config OPTIONAL, -- Need ON - tpc-PDCCH-ConfigPUSCH TPC-PDCCH-Config OPTIONAL, -- Need ON + tpc-PDCCH-ConfigPUCCH TPC-PDCCH-Config OPTIONAL, -- Need ON + tpc-PDCCH-ConfigPUSCH TPC-PDCCH-Config OPTIONAL, -- Need ON cqi-ReportConfig CQI-ReportConfig OPTIONAL, -- Cond CQI-r8 soundingRS-UL-ConfigDedicated SoundingRS-UL-ConfigDedicated OPTIONAL, -- Need ON antennaInfo CHOICE { explicitValue AntennaInfoDedicated, defaultValue NULL } OPTIONAL, -- Cond AI-r8 - schedulingRequestConfig SchedulingRequestConfig OPTIONAL, -- Need ON + schedulingRequestConfig SchedulingRequestConfig OPTIONAL, -- Need ON ..., [[ cqi-ReportConfig-v920 CQI-ReportConfig-v920 OPTIONAL, -- Cond CQI-r8 antennaInfo-v920 AntennaInfoDedicated-v920 OPTIONAL -- Cond AI-r8 @@ -3078,7 +3324,7 @@ PhysicalConfigDedicated ::= SEQUENCE { SoundingRS-UL-ConfigDedicatedAperiodic-r10 OPTIONAL, -- Need ON uplinkPowerControlDedicated-v1020 UplinkPowerControlDedicated-v1020 OPTIONAL -- Need ON ]], - [[ additionalSpectrumEmissionCA-r10 CHOICE { + [[ additionalSpectrumEmissionCA-r10 CHOICE { release NULL, setup SEQUENCE { additionalSpectrumEmissionPCell-r10 AdditionalSpectrumEmission @@ -3105,7 +3351,7 @@ PhysicalConfigDedicated ::= SEQUENCE { cqi-ReportConfigPCell-v12x0 CQI-ReportConfig-v12x0 OPTIONAL, -- Need ON uplinkPowerControlDedicated-v12x0 UplinkPowerControlDedicated-v12x0 OPTIONAL, -- Need ON pusch-ConfigDedicated-v12x0 PUSCH-ConfigDedicated-v12x0 OPTIONAL, -- Cond TwoSetsUL - csi-RS-Config2-r12 CSI-RS-Config2-r12 OPTIONAL -- Need OR + csi-RS-Config2-r12 CSI-RS-Config2-r12 OPTIONAL -- Need ON ]] } PhysicalConfigDedicatedSCell-r10 ::= SEQUENCE { @@ -3115,7 +3361,7 @@ PhysicalConfigDedicatedSCell-r10 ::= SEQUENCE { crossCarrierSchedulingConfig-r10 CrossCarrierSchedulingConfig-r10 OPTIONAL, -- Need ON csi-RS-Config-r10 CSI-RS-Config-r10 OPTIONAL, -- Need ON pdsch-ConfigDedicated-r10 PDSCH-ConfigDedicated OPTIONAL -- Need ON - } OPTIONAL, -- Cond SCellAdd + } OPTIONAL, -- Cond SCellAdd -- UL configuration ul-Configuration-r10 SEQUENCE { antennaInfoUL-r10 AntennaInfoUL-r10 OPTIONAL, -- Need ON @@ -3145,7 +3391,7 @@ PhysicalConfigDedicatedSCell-r10 ::= SEQUENCE { eimta-MainConfigSCell-r12 EIMTA-MainConfigServCell-r12 OPTIONAL, -- Cond eimta cqi-ReportConfigSCell-v12x0 CQI-ReportConfig-v12x0 OPTIONAL, -- Need ON uplinkPowerControlDedicatedSCell-v12x0 UplinkPowerControlDedicated-v12x0 OPTIONAL, -- Need ON - csi-RS-Config2-r12 CSI-RS-Config2-r12 OPTIONAL -- Need OR + csi-RS-Config2-r12 CSI-RS-Config2-r12 OPTIONAL -- Need ON ]] } @@ -3246,10 +3492,10 @@ PUCCH-ConfigDedicated-v1130 ::= SEQUENCE { } PUCCH-ConfigDedicated-v12x0 ::= SEQUENCE { - n1PUCCH-Param-r12 CHOICE { + nkaPUCCH-Param-r12 CHOICE { release NULL, setup SEQUENCE { - n1PUCCH-AN-r12 INTEGER (0..2047) + nkaPUCCH-AN-r12 INTEGER (0..2047) } } } @@ -3355,7 +3601,7 @@ RACH-ConfigCommon ::= SEQUENCE { } RACH-ConfigCommon-v12xy ::= SEQUENCE { - txFailParams-r12 SEQUENCE { + txFailParams-r12 SEQUENCE { connEstFailCount-r12 ENUMERATED {n1, n2, n3, n4}, connEstFailOffsetValidity-r12 ENUMERATED {s30, s60, s120, s240, s300, s420, s600, s900}, @@ -3393,8 +3639,8 @@ RACH-ConfigDedicated ::= SEQUENCE { RadioResourceConfigCommonSIB ::= SEQUENCE { rach-ConfigCommon RACH-ConfigCommon, - bcch-Config BCCH-Config, - pcch-Config PCCH-Config, + bcch-Config BCCH-Config, + pcch-Config PCCH-Config, prach-Config PRACH-ConfigSIB, pdsch-ConfigCommon PDSCH-ConfigCommon, pusch-ConfigCommon PUSCH-ConfigCommon, @@ -3429,6 +3675,14 @@ RadioResourceConfigCommon ::= SEQUENCE { ]] } +RadioResourceConfigCommonPSCell-r12 ::= SEQUENCE { + basicFields-r12 RadioResourceConfigCommonSCell-r10, + pucch-ConfigCommon-r12 PUCCH-ConfigCommon, + rach-ConfigCommon-r12 RACH-ConfigCommon, + uplinkPowerControlCommonPSCell-r12 UplinkPowerControlCommonPSCell-r12, + ... +} + RadioResourceConfigCommonSCell-r10 ::= SEQUENCE { -- DL configuration as well as configuration applicable for DL and UL nonUL-Configuration-r10 SEQUENCE { @@ -3464,7 +3718,7 @@ RadioResourceConfigCommonSCell-r10 ::= SEQUENCE { ..., [[ ul-CarrierFreq-v1090 ARFCN-ValueEUTRA-v9e0 OPTIONAL -- Need OP ]], - [[ rach-ConfigCommonSCell-r11 RACH-ConfigCommonSCell-r11 OPTIONAL, -- Cond UL + [[ rach-ConfigCommonSCell-r11 RACH-ConfigCommonSCell-r11 OPTIONAL, -- Cond ULSCell prach-ConfigSCell-r11 PRACH-Config OPTIONAL, -- Cond UL tdd-Config-v1130 TDD-Config-v1130 OPTIONAL, -- Cond TDD2 uplinkPowerControlCommonSCell-v1130 @@ -3488,14 +3742,14 @@ UL-CyclicPrefixLength ::= ENUMERATED {len1, len2} RadioResourceConfigDedicated ::= SEQUENCE { - srb-ToAddModList SRB-ToAddModList OPTIONAL, -- Cond HO-Conn - drb-ToAddModList DRB-ToAddModList OPTIONAL, -- Cond HO-toEUTRA - drb-ToReleaseList DRB-ToReleaseList OPTIONAL, -- Need ON + srb-ToAddModList SRB-ToAddModList OPTIONAL, -- Cond HO-Conn + drb-ToAddModList DRB-ToAddModList OPTIONAL, -- Cond HO-toEUTRA + drb-ToReleaseList DRB-ToReleaseList OPTIONAL, -- Need ON mac-MainConfig CHOICE { explicitValue MAC-MainConfig, defaultValue NULL } OPTIONAL, -- Cond HO-toEUTRA2 - sps-Config SPS-Config OPTIONAL, -- Need ON + sps-Config SPS-Config OPTIONAL, -- Need ON physicalConfigDedicated PhysicalConfigDedicated OPTIONAL, -- Need ON ..., [[ rlf-TimersAndConstants-r9 RLF-TimersAndConstants-r9 OPTIONAL -- Need ON @@ -3503,7 +3757,22 @@ RadioResourceConfigDedicated ::= SEQUENCE { [[ measSubframePatternPCell-r10 MeasSubframePatternPCell-r10 OPTIONAL -- Need ON ]], [[ neighCellsCRS-Info-r11 NeighCellsCRS-Info-r11 OPTIONAL -- Need ON - ]] + ]], + [[ naics-InfoPCell-r12 NAICS-AssistanceInfo-r12 OPTIONAL -- Need ON + ]]} + +RadioResourceConfigDedicatedPSCell-r12 ::= SEQUENCE { + -- UE specific configuration extensions applicable for an PSCell + physicalConfigDedicatedPSCell-r12 PhysicalConfigDedicated OPTIONAL, -- Need ON + sps-Config-r12 SPS-Config OPTIONAL, -- Need ON + ... +} + +RadioResourceConfigDedicatedSCG-r12 ::= SEQUENCE { + drb-ToAddModListSCG-r12 DRB-ToAddModListSCG-r12 OPTIONAL, -- Cond SCG-Est + mac-MainConfigSCG-r12 MAC-MainConfig OPTIONAL, -- Cond SCG-Est + rlf-TimersAndConstantsSCG-r12 RLF-TimersAndConstantsSCG-r12 OPTIONAL, -- Cond SCG-Est + ... } RadioResourceConfigDedicatedSCell-r10 ::= SEQUENCE { @@ -3511,6 +3780,8 @@ RadioResourceConfigDedicatedSCell-r10 ::= SEQUENCE { physicalConfigDedicatedSCell-r10 PhysicalConfigDedicatedSCell-r10 OPTIONAL, -- Need ON ..., [[ mac-MainConfigSCell-r11 MAC-MainConfigSCell-r11 OPTIONAL -- Cond SCellAdd + ]], + [[ naics-InfoSCell-r12 NAICS-AssistanceInfo-r12 OPTIONAL -- Need ON ]] } @@ -3531,13 +3802,33 @@ SRB-ToAddMod ::= SEQUENCE { DRB-ToAddModList ::= SEQUENCE (SIZE (1..maxDRB)) OF DRB-ToAddMod +DRB-ToAddModListSCG-r12 ::= SEQUENCE (SIZE (1..maxDRB)) OF DRB-ToAddModSCG-r12 + DRB-ToAddMod ::= SEQUENCE { eps-BearerIdentity INTEGER (0..15) OPTIONAL, -- Cond DRB-Setup drb-Identity DRB-Identity, pdcp-Config PDCP-Config OPTIONAL, -- Cond PDCP - rlc-Config RLC-Config OPTIONAL, -- Cond Setup + rlc-Config RLC-Config OPTIONAL, -- Cond SetupM logicalChannelIdentity INTEGER (3..10) OPTIONAL, -- Cond DRB-Setup - logicalChannelConfig LogicalChannelConfig OPTIONAL, -- Cond Setup + logicalChannelConfig LogicalChannelConfig OPTIONAL, -- Cond SetupM + ..., + [[ drb-TypeChange-r12 ENUMERATED {toMCG} OPTIONAL, -- Cond ToMCG + rlc-Config-v12xy RLC-Config-v12xy OPTIONAL -- Cond Setup + ]] +} + +DRB-ToAddModSCG-r12 ::= SEQUENCE { + drb-Identity-r12 DRB-Identity, + drb-Type-r12 CHOICE { + split-r12 NULL, + scg-r12 SEQUENCE { + eps-BearerIdentity-r12 INTEGER (0..15) OPTIONAL, -- Cond DRB-Setup + pdcp-Config-r12 PDCP-Config OPTIONAL -- Cond PDCP + } + } OPTIONAL, -- Cond SetupS2 + rlc-ConfigSCG-r12 RLC-Config OPTIONAL, -- Cond SetupS + logicalChannelIdentitySCG-r12 INTEGER (3..10) OPTIONAL, -- Cond Setup + logicalChannelConfigSCG-r12 LogicalChannelConfig OPTIONAL, -- Cond SetupS ... } @@ -3562,6 +3853,32 @@ CRS-AssistanceInfo-r11 ::= SEQUENCE { ... } +NAICS-AssistanceInfo-r12 ::= CHOICE { + release NULL, + setup SEQUENCE { + neighCellsToReleaseList-r12 NeighCellsToReleaseList-r12 OPTIONAL , -- Need ON + neighCellsToAddModList-r12 NeighCellsToAddModList-r12 OPTIONAL, -- Need ON + servCellp-a-r12 P-a OPTIONAL -- Need ON + } +} + +NeighCellsToReleaseList-r12 ::= SEQUENCE (SIZE (1..maxNeighCell-r12)) OF PhysCellId + +NeighCellsToAddModList-r12 ::= SEQUENCE (SIZE (1..maxNeighCell-r12)) OF NeighCellsInfo-r12 + +NeighCellsInfo-r12 ::= SEQUENCE { + physCellId-r12 PhysCellId, + p-b-r12 INTEGER (0..3), + crs-PortsCount-r12 ENUMERATED {n1, n2, n4, spare}, + mbsfn-SubframeConfig-r12 MBSFN-SubframeConfigList OPTIONAL, -- Need ON + p-aList-r12 SEQUENCE (SIZE (1..maxP-a-PerNeighCell-r12)) OF P-a, + transmissionModeList-r12 BIT STRING (SIZE(8)), + resAllocGranularity-r12 INTEGER (1..4), + ... +} +P-a ::= ENUMERATED { dB-6, dB-4dot77, dB-3, dB-1dot77, + dB0, dB1, dB2, dB3} + RLC-Config ::= CHOICE { am SEQUENCE { @@ -3578,11 +3895,12 @@ RLC-Config ::= CHOICE { um-Uni-Directional-DL SEQUENCE { dl-UM-RLC DL-UM-RLC }, - ..., - am-v12xy SEQUENCE { - ul-AM-RLC-r12 UL-AM-RLC-r12, - dl-AM-RLC-r12 DL-AM-RLC-r12 - } + ... +} + +RLC-Config-v12xy ::= SEQUENCE { + ul-extended-RLC-LI-Field-r12 BOOLEAN, + dl-extended-RLC-LI-Field-r12 BOOLEAN } UL-AM-RLC ::= SEQUENCE { @@ -3593,21 +3911,11 @@ UL-AM-RLC ::= SEQUENCE { t1, t2, t3, t4, t6, t8, t16, t32} } -UL-AM-RLC-r12 ::= SEQUENCE { - ul-AM-RLC-r12 UL-AM-RLC, - extended-RLC-LI-Field-r12 BOOLEAN -} - DL-AM-RLC ::= SEQUENCE { t-Reordering T-Reordering, t-StatusProhibit T-StatusProhibit } -DL-AM-RLC-r12 ::= SEQUENCE { - dl-AM-RLC-r12 DL-AM-RLC, - extended-RLC-LI-Field-r12 BOOLEAN -} - UL-UM-RLC ::= SEQUENCE { sn-FieldLength SN-FieldLength } @@ -3680,6 +3988,19 @@ RLF-TimersAndConstants-r9 ::= CHOICE { } } +RLF-TimersAndConstantsSCG-r12 ::= CHOICE { + release NULL, + setup SEQUENCE { + t313-r12 ENUMERATED { + ms0, ms50, ms100, ms200, ms500, ms1000, ms2000}, + n313-r12 ENUMERATED { + n1, n2, n3, n4, n6, n8, n10, n20}, + n314-r12 ENUMERATED { + n1, n2, n3, n4, n5, n6, n8, n10}, + ... + } +} + RN-SubframeConfig-r10 ::= SEQUENCE { subframeConfigPattern-r10 CHOICE { @@ -3847,10 +4168,10 @@ SPS-ConfigUL ::= CHOICE { } OPTIONAL, -- Need OP twoIntervalsConfig ENUMERATED {true} OPTIONAL, -- Cond TDD ..., - [[ p0-Persistent-SubframeSet2-r12 SEQUENCE { - p0-NominalPUSCH-Persistent-SubframeSet2-r12 INTEGER (-126..24), - p0-UE-PUSCH-Persistent-SubframeSet2-r12 INTEGER (-8..7) - } OPTIONAL -- Cond TwoSetsUL + [[ p0-PersistentSubframeSet2-r12 SEQUENCE { + p0-NominalPUSCH-PersistentSubframeSet2-r12 INTEGER (-126..24), + p0-UE-PUSCH-PersistentSubframeSet2-r12 INTEGER (-8..7) + } OPTIONAL -- Cond TwoSetsUL ]] } } @@ -3903,6 +4224,15 @@ UplinkPowerControlCommon-v1020 ::= SEQUENCE { deltaF-PUCCH-Format1bCS-r10 ENUMERATED {deltaF1, deltaF2, spare2, spare1} } +UplinkPowerControlCommonPSCell-r12 ::= SEQUENCE { +-- For uplink power control the additional/ missing fields are signalled (compared to SCell) + deltaF-PUCCH-Format3-r10 ENUMERATED {deltaF-1, deltaF0, deltaF1, deltaF2, + deltaF3, deltaF4, deltaF5, deltaF6}, + deltaF-PUCCH-Format1bCS-r10 ENUMERATED {deltaF1, deltaF2, spare2, spare1}, + p0-NominalPUCCH INTEGER (-127..-96), + deltaFList-PUCCH DeltaFList-PUCCH +} + UplinkPowerControlCommonSCell-r10 ::= SEQUENCE { p0-NominalPUSCH-r10 INTEGER (-126..24), alpha-r10 ENUMERATED {al0, al04, al05, al06, al07, al08, al09, al1} @@ -3949,7 +4279,7 @@ UplinkPowerControlDedicatedSCell-r10 ::= SEQUENCE { deltaMCS-Enabled-r10 ENUMERATED {en0, en1}, accumulationEnabled-r10 BOOLEAN, pSRS-Offset-r10 INTEGER (0..15), - pSRS-OffsetAp-r10 INTEGER (0..15) OPTIONAL, -- Need OR + pSRS-OffsetAp-r10 INTEGER (0..15) OPTIONAL, -- Need OR filterCoefficient-r10 FilterCoefficient DEFAULT fc4, pathlossReferenceLinking-r10 ENUMERATED {pCell, sCell} } @@ -3979,14 +4309,16 @@ NextHopChainingCount ::= INTEGER (0..7) SecurityAlgorithmConfig ::= SEQUENCE { - cipheringAlgorithm ENUMERATED { - eea0, eea1, eea2, eea3-v1130, spare4, spare3, - spare2, spare1, ...}, + cipheringAlgorithm CipheringAlgorithm-r12, integrityProtAlgorithm ENUMERATED { eia0-v920, eia1, eia2, eia3-v1130, spare4, spare3, spare2, spare1, ...} } +CipheringAlgorithm-r12 ::= ENUMERATED { + eea0, eea1, eea2, eea3-v1130, spare4, spare3, + spare2, spare1, ...} + ShortMAC-I ::= BIT STRING (SIZE (16)) @@ -4140,6 +4472,15 @@ MobilityControlInfo ::= SEQUENCE { ]] } +MobilityControlInfoSCG-r12 ::= SEQUENCE { + t307 ENUMERATED { + ms50, ms100, ms150, ms200, ms500, ms1000, + ms2000, spare1}, + ue-IdentitySCG-r12 C-RNTI OPTIONAL, -- Cond SCGEst, + rach-ConfigDedicated-r12 RACH-ConfigDedicated OPTIONAL, -- Need OP + ... +} + CarrierBandwidthEUTRA ::= SEQUENCE { dl-Bandwidth ENUMERATED { n6, n15, n25, n50, n75, n100, spare10, @@ -4194,7 +4535,7 @@ PhysCellIdRange ::= SEQUENCE { range ENUMERATED { n4, n8, n12, n16, n24, n32, n48, n64, n84, n96, n128, n168, n252, n504, spare2, - spare1} OPTIONAL -- Need OP + spare1} OPTIONAL -- Need OP } @@ -4306,6 +4647,9 @@ T-Reselection ::= INTEGER (0..7) AllowedMeasBandwidth ::= ENUMERATED {mbw6, mbw15, mbw25, mbw50, mbw75, mbw100} +CSI-RSRP-Range-r12 ::= INTEGER(0..97) + + Hysteresis ::= INTEGER (0..30) @@ -4317,7 +4661,7 @@ LocationInfo-r10 ::= SEQUENCE { ellipsoidPointWithUncertaintyCircle-r11 OCTET STRING, ellipsoidPointWithUncertaintyEllipse-r11 OCTET STRING, ellipsoidPointWithAltitudeAndUncertaintyEllipsoid-r11 OCTET STRING, - ellipsoidArc-r11 OCTET STRING, + ellipsoidArc-r11 OCTET STRING, polygon-r11 OCTET STRING }, horizontalVelocity-r10 OCTET STRING OPTIONAL, @@ -4326,6 +4670,8 @@ LocationInfo-r10 ::= SEQUENCE { } +MBSFN-RSRQ-Range-r12 ::= INTEGER(0..31) + MeasConfig ::= SEQUENCE { -- Measurement objects measObjectToRemoveList MeasObjectToRemoveList OPTIONAL, -- Need ON @@ -4340,7 +4686,7 @@ MeasConfig ::= SEQUENCE { quantityConfig QuantityConfig OPTIONAL, -- Need ON measGapConfig MeasGapConfig OPTIONAL, -- Need ON s-Measure RSRP-Range OPTIONAL, -- Need ON - preRegistrationInfoHRPD PreRegistrationInfoHRPD OPTIONAL, -- Need OP + preRegistrationInfoHRPD PreRegistrationInfoHRPD OPTIONAL, -- Need OP speedStatePars CHOICE { release NULL, setup SEQUENCE { @@ -4350,16 +4696,62 @@ MeasConfig ::= SEQUENCE { } OPTIONAL, -- Need ON ..., [[ measObjectToAddModList-v9e0 MeasObjectToAddModList-v9e0 OPTIONAL -- Need ON + ]], + [[ allowInterruptions-r11 BOOLEAN OPTIONAL -- Need ON + ]], + [[ measScaleFactor-r12 CHOICE { + release NULL, + setup MeasScaleFactor-r12 + } OPTIONAL, -- Need ON + measIdToRemoveListExt-r12 MeasIdToRemoveListExt-r12 OPTIONAL, -- Need ON + measIdToAddModListExt-r12 MeasIdToAddModListExt-r12 OPTIONAL, -- Need ON + measRSRQ-OnAllSymbols-r12 BOOLEAN OPTIONAL -- Need ON ]] } MeasIdToRemoveList ::= SEQUENCE (SIZE (1..maxMeasId)) OF MeasId +MeasIdToRemoveListExt-r12 ::= SEQUENCE (SIZE (1..maxMeasId)) OF MeasId-v12xy + MeasObjectToRemoveList ::= SEQUENCE (SIZE (1..maxObjectId)) OF MeasObjectId ReportConfigToRemoveList ::= SEQUENCE (SIZE (1..maxReportConfigId)) OF ReportConfigId +MeasDS-Config-r12 ::= CHOICE { + release NULL, + setup SEQUENCE { + dmtc-PeriodOffset-r12 CHOICE { + ms40-r12 INTEGER(0..39), + ms80-r12 INTEGER(0..79), + ms160-r12 INTEGER(0..159), + ... + }, + ds-OccasionDuration-r12 CHOICE { + durationFDD-r12 INTEGER(1..maxDS-Duration-r12), + durationTDD-r12 INTEGER(2..maxDS-Duration-r12) + }, + measCSI-RS-ToRemoveList-r12 MeasCSI-RS-ToRemoveList-r12 OPTIONAL, -- Need ON + measCSI-RS-ToAddModList-r12 MeasCSI-RS-ToAddModList-r12 OPTIONAL, -- Need ON + ... + } +} + +MeasCSI-RS-ToRemoveList-r12 ::= SEQUENCE (SIZE (1..maxCSI-RS-Meas-r12)) OF MeasCSI-RS-Id-r12 + +MeasCSI-RS-ToAddModList-r12 ::= SEQUENCE (SIZE (1..maxCSI-RS-Meas-r12)) OF MeasCSI-RS-Config-r12 + +MeasCSI-RS-Id-r12 ::= INTEGER (1..maxCSI-RS-Meas-r12) + +MeasCSI-RS-Config-r12 ::= SEQUENCE { + measCSI-RS-Id-r12 MeasCSI-RS-Id-r12, + physCellId-r12 INTEGER (0..503), + scramblingIdentity-r12 INTEGER (0..503), + resourceConfig-r12 INTEGER (0..31), + subframeOffset-r12 INTEGER (0..4), + csi-RS-IndividualOffset-r12 Q-OffsetRange} + + MeasGapConfig ::= CHOICE { release NULL, setup SEQUENCE { @@ -4374,15 +4766,25 @@ MeasGapConfig ::= CHOICE { MeasId ::= INTEGER (1..maxMeasId) +MeasId-v12xy ::= INTEGER (maxMeasId-Plus1..maxMeasId-r12) + MeasIdToAddModList ::= SEQUENCE (SIZE (1..maxMeasId)) OF MeasIdToAddMod +MeasIdToAddModListExt-r12 ::= SEQUENCE (SIZE (1..maxMeasId)) OF MeasIdToAddModExt-r12 + MeasIdToAddMod ::= SEQUENCE { measId MeasId, measObjectId MeasObjectId, reportConfigId ReportConfigId } +MeasIdToAddModExt-r12 ::= SEQUENCE { + measId-v12xy MeasId-v12xy, + measObjectId-r12 MeasObjectId, + reportConfigId-r12 ReportConfigId +} + MeasObjectCDMA2000 ::= SEQUENCE { cdma2000-Type CDMA2000-Type, @@ -4426,7 +4828,9 @@ MeasObjectEUTRA ::= SEQUENCE { altTTT-CellsToAddModList-r12 AltTTT-CellsToAddModList-r12 OPTIONAL -- Need ON ]], [[t312-r12 ENUMERATED {ms0, ms50, ms100, ms200, ms300, ms400, ms500, - ms1000} OPTIONAL -- Need ON + ms1000} OPTIONAL, -- Need ON + reducedMeasPerformance-r12 BOOLEAN OPTIONAL, -- Need ON + measDS-Config-r12 MeasDS-Config-r12 OPTIONAL -- Need ON ]] } @@ -4475,7 +4879,7 @@ MeasObjectGERAN ::= SEQUENCE { carrierFreqs CarrierFreqsGERAN, offsetFreq Q-OffsetRangeInterRAT DEFAULT 0, ncc-Permitted BIT STRING(SIZE (8)) DEFAULT '11111111'B, - cellForWhichToReportCGI PhysCellIdGERAN OPTIONAL, -- Need ON + cellForWhichToReportCGI PhysCellIdGERAN OPTIONAL, -- Need ON ... } @@ -4514,9 +4918,11 @@ MeasObjectUTRA ::= SEQUENCE { cellForWhichToReportCGI CHOICE { utra-FDD PhysCellIdUTRA-FDD, utra-TDD PhysCellIdUTRA-TDD - } OPTIONAL, -- Need ON + } OPTIONAL, -- Need ON ..., [[ csg-allowedReportingCells-v930 CSG-AllowedReportingCells-r9 OPTIONAL -- Need ON + ]], + [[ reducedMeasPerformance-r12 BOOLEAN OPTIONAL -- Need ON ]] } @@ -4556,6 +4962,10 @@ MeasResults ::= SEQUENCE { ]], [[ locationInfo-r10 LocationInfo-r10 OPTIONAL, measResultServFreqList-r10 MeasResultServFreqList-r10 OPTIONAL + ]], + [[ measId-v12xy MeasId-v12xy OPTIONAL, + measResultPCell-v12xy RSRQ-Range-v12xy OPTIONAL, + measResultCSI-RS-List-r12 MeasResultCSI-RS-List-r12 OPTIONAL ]] } @@ -4566,15 +4976,16 @@ MeasResultEUTRA ::= SEQUENCE { cgi-Info SEQUENCE { cellGlobalId CellGlobalIdEUTRA, trackingAreaCode TrackingAreaCode, - plmn-IdentityList PLMN-IdentityList2 OPTIONAL - } OPTIONAL, + plmn-IdentityList PLMN-IdentityList2 OPTIONAL + } OPTIONAL, measResult SEQUENCE { rsrpResult RSRP-Range OPTIONAL, rsrqResult RSRQ-Range OPTIONAL, ..., [[ additionalSI-Info-r9 AdditionalSI-Info-r9 OPTIONAL ]], - [[ primaryPLMN-Suitable-r12 ENUMERATED {true} OPTIONAL + [[ primaryPLMN-Suitable-r12 ENUMERATED {true} OPTIONAL, + measResult-v12xy RSRQ-Range-v12xy OPTIONAL ]] } } @@ -4592,7 +5003,17 @@ MeasResultServFreq-r10 ::= SEQUENCE { rsrpResultNCell-r10 RSRP-Range, rsrqResultNCell-r10 RSRQ-Range } OPTIONAL, - ... + ..., + [[ measResultSCell-v12xy RSRQ-Range-v12xy OPTIONAL, + measResultBestNeighCell-v12xy RSRQ-Range-v12xy OPTIONAL + ]] +} + +MeasResultCSI-RS-List-r12 ::= SEQUENCE (SIZE (1..maxCellReport)) OF MeasResultCSI-RS-r12 + +MeasResultCSI-RS-r12 ::= SEQUENCE { + measCSI-RS-Id-r12 MeasCSI-RS-Id-r12, + csi-RSRP-Result-r12 CSI-RSRP-Range-r12, ... } MeasResultListUTRA ::= SEQUENCE (SIZE (1..maxCellReport)) OF MeasResultUTRA @@ -4606,8 +5027,8 @@ MeasResultUTRA ::= SEQUENCE { cellGlobalId CellGlobalIdUTRA, locationAreaCode BIT STRING (SIZE (16)) OPTIONAL, routingAreaCode BIT STRING (SIZE (8)) OPTIONAL, - plmn-IdentityList PLMN-IdentityList2 OPTIONAL - } OPTIONAL, + plmn-IdentityList PLMN-IdentityList2 OPTIONAL + } OPTIONAL, measResult SEQUENCE { utra-RSCP INTEGER (-5..91) OPTIONAL, utra-EcN0 INTEGER (0..49) OPTIONAL, @@ -4627,7 +5048,7 @@ MeasResultGERAN ::= SEQUENCE { cgi-Info SEQUENCE { cellGlobalId CellGlobalIdGERAN, routingAreaCode BIT STRING (SIZE (8)) OPTIONAL - } OPTIONAL, + } OPTIONAL, measResult SEQUENCE { rssi INTEGER (0..63), ... @@ -4643,7 +5064,7 @@ MeasResultListCDMA2000 ::= SEQUENCE (SIZE (1..maxCellReport)) OF MeasResultCDM MeasResultCDMA2000 ::= SEQUENCE { physCellId PhysCellIdCDMA2000, - cgi-Info CellGlobalIdCDMA2000 OPTIONAL, + cgi-Info CellGlobalIdCDMA2000 OPTIONAL, measResult SEQUENCE { pilotPnPhase INTEGER (0..32767) OPTIONAL, pilotStrength INTEGER (0..63), @@ -4664,6 +5085,9 @@ AdditionalSI-Info-r9 ::= SEQUENCE { } +MeasScaleFactor-r12 ::= ENUMERATED {sf-EUTRA-cf1, sf-EUTRA-cf2} + + QuantityConfig ::= SEQUENCE { quantityConfigEUTRA QuantityConfigEUTRA OPTIONAL, -- Need ON quantityConfigUTRA QuantityConfigUTRA OPTIONAL, -- Need ON @@ -4671,6 +5095,8 @@ QuantityConfig ::= SEQUENCE { quantityConfigCDMA2000 QuantityConfigCDMA2000 OPTIONAL, -- Need ON ..., [[ quantityConfigUTRA-v1020 QuantityConfigUTRA-v1020 OPTIONAL -- Need ON + ]], + [[ quantityConfigEUTRA-v12xy QuantityConfigEUTRA-v12xy OPTIONAL -- Need ON ]] } @@ -4679,6 +5105,10 @@ QuantityConfigEUTRA ::= SEQUENCE { filterCoefficientRSRQ FilterCoefficient DEFAULT fc4 } +QuantityConfigEUTRA-v12xy ::= SEQUENCE { + filterCoefficientCSI-RSRP-r12 FilterCoefficient DEFAULT fc4 +} + QuantityConfigUTRA ::= SEQUENCE { measQuantityUTRA-FDD ENUMERATED {cpich-RSCP, cpich-EcN0}, measQuantityUTRA-TDD ENUMERATED {pccpch-RSCP}, @@ -4724,6 +5154,15 @@ ReportConfigEUTRA ::= SEQUENCE { eventA6-r10 SEQUENCE { a6-Offset-r10 INTEGER (-30..30), a6-ReportOnLeave-r10 BOOLEAN + }, + eventC1-r12 SEQUENCE { + c1-Threshold-r12 ThresholdEUTRA-v12xy, + c1-ReportOnLeave-r12 BOOLEAN + }, + eventC2-r12 SEQUENCE { + c2-RefCSI-RS-r12 MeasCSI-RS-Id-r12, + c2-Offset-r12 INTEGER (-30..30), + c2-ReportOnLeave-r12 BOOLEAN } }, hysteresis Hysteresis, @@ -4743,11 +5182,17 @@ ReportConfigEUTRA ::= SEQUENCE { [[ si-RequestForHO-r9 ENUMERATED {setup} OPTIONAL, -- Cond reportCGI ue-RxTxTimeDiffPeriodical-r9 ENUMERATED {setup} OPTIONAL -- Need OR ]], - [[ includeLocationInfo-r10 ENUMERATED {true} OPTIONAL, -- Need OR + [[ includeLocationInfo-r10 ENUMERATED {true} OPTIONAL, -- Need OR reportAddNeighMeas-r10 ENUMERATED {setup} OPTIONAL -- Need OR ]], [[ alternativeTimeToTrigger-r12 TimeToTrigger OPTIONAL, -- Need OR - useT312-r12 ENUMERATED {setup} OPTIONAL -- Cond event + useT312-r12 ENUMERATED {setup} OPTIONAL, -- Cond event + usePSCell-r12 ENUMERATED {true} OPTIONAL, -- Cond a3OrA5 + aN-Threshold1-v12xy RSRQ-Range-v12xy OPTIONAL, -- Need OR + a5-Threshold2-v12xy RSRQ-Range-v12xy OPTIONAL, -- Need OR + reportStrongestCSI-RSs-r12 ENUMERATED {true} OPTIONAL, -- Cond periodic + reportCRS-Meas-r12 ENUMERATED {true} OPTIONAL, -- Need OR + triggerQuantityCSI-RS-r12 ENUMERATED {csi-RSRP-r12} OPTIONAL -- Cond CSI-RS ]] } @@ -4756,6 +5201,8 @@ ThresholdEUTRA ::= CHOICE{ threshold-RSRQ RSRQ-Range } +ThresholdEUTRA-v12xy ::= CSI-RSRP-Range-r12 + ReportConfigId ::= INTEGER (1..maxReportConfigId) @@ -4799,7 +5246,9 @@ ReportConfigInterRAT ::= SEQUENCE { ]], [[ reportQuantityUTRA-FDD-r10 ENUMERATED {both} OPTIONAL -- Need OR ]], - [[ includeLocationInfo-r11 BOOLEAN OPTIONAL -- Need ON + [[ includeLocationInfo-r11 BOOLEAN OPTIONAL -- Need ON + ]], + [[ b2-Threshold1-v12xy RSRQ-Range-v12xy OPTIONAL -- Need OR ]] } @@ -4808,9 +5257,9 @@ ThresholdUTRA ::= CHOICE{ utra-EcN0 INTEGER (0..49) } -ThresholdGERAN ::= INTEGER (0..63) +ThresholdGERAN ::= INTEGER (0..63) -ThresholdCDMA2000 ::= INTEGER (0..63) +ThresholdCDMA2000 ::= INTEGER (0..63) ReportConfigToAddModList ::= SEQUENCE (SIZE (1..maxReportConfigId)) OF ReportConfigToAddMod @@ -4835,6 +5284,12 @@ RSRP-Range ::= INTEGER(0..97) RSRQ-Range ::= INTEGER(0..34) +RSRQ-Range-v12xy ::= INTEGER(-30..46) + + + +RSRQ-Type-r12 ::= ENUMERATED {crsSymbols, allSymbols, wideBand, allSymbolsWithWideBand} + TimeToTrigger ::= ENUMERATED { ms0, ms40, ms64, ms80, ms100, ms128, ms160, ms256, @@ -4914,7 +5369,7 @@ OtherConfig-r9 ::= SEQUENCE { ]] } -IDC-Config-r11 ::= SEQUENCE { +IDC-Config-r11 ::= SEQUENCE { idc-Indication-r11 ENUMERATED {setup} OPTIONAL, -- Need OR autonomousDenialParameters-r11 SEQUENCE { autonomousDenialSubframes-r11 ENUMERATED {n2, n5, n10, n15, @@ -4922,7 +5377,7 @@ IDC-Config-r11 ::= SEQUENCE { autonomousDenialValidity-r11 ENUMERATED { sf200, sf500, sf1000, sf2000, spare4, spare3, spare2, spare1} - } OPTIONAL, -- Need OR + } OPTIONAL, -- Need OR ... } @@ -5028,7 +5483,12 @@ UE-EUTRA-Capability-v9h0-IEs ::= SEQUENCE { UE-EUTRA-Capability-v10c0-IEs ::= SEQUENCE { otdoa-PositioningCapabilities-r10 OTDOA-PositioningCapabilities-r10 OPTIONAL, - -- Following field is only to be used for late extensions from REL-10 + nonCriticalExtension UE-EUTRA-Capability-v10f0-IEs OPTIONAL +} + +UE-EUTRA-Capability-v10f0-IEs ::= SEQUENCE { + rf-Parameters-v10f0 RF-Parameters-v10f0 OPTIONAL, + -- Following field is only to be used for late REL-10 extensions nonCriticalExtension SEQUENCE {} OPTIONAL } @@ -5098,15 +5558,28 @@ UE-EUTRA-Capability-v1180-IEs ::= SEQUENCE { mbms-Parameters-r11 MBMS-Parameters-r11 OPTIONAL, fdd-Add-UE-EUTRA-Capabilities-v1180 UE-EUTRA-CapabilityAddXDD-Mode-v1180 OPTIONAL, tdd-Add-UE-EUTRA-Capabilities-v1180 UE-EUTRA-CapabilityAddXDD-Mode-v1180 OPTIONAL, + nonCriticalExtension UE-EUTRA-Capability-v11a0-IEs OPTIONAL +} + +UE-EUTRA-Capability-v11a0-IEs ::= SEQUENCE { + ue-Category-v11a0 INTEGER (11..12) OPTIONAL, + measParameters-v11a0 MeasParameters-v11a0 OPTIONAL, nonCriticalExtension UE-EUTRA-Capability-v12xy-IEs OPTIONAL } UE-EUTRA-Capability-v12xy-IEs ::= SEQUENCE { phyLayerParameters-v12xy PhyLayerParameters-v12xy OPTIONAL, + rf-Parameters-v12xy RF-Parameters-v12xy OPTIONAL, rlc-Parameters-r12 RLC-Parameters-r12 OPTIONAL, ue-BasedNetwPerfMeasParameters-v12xy UE-BasedNetwPerfMeasParameters-v12xy OPTIONAL, - ue-Category-v12xy INTEGER (0) OPTIONAL, - measParameters-v12xy MeasParameters-v12xy OPTIONAL, + ue-Category-v12xy INTEGER (0..15) OPTIONAL, + wlan-IW-Parameters-r12 WLAN-IW-Parameters-r12 OPTIONAL, + measParameters-v12xy MeasParameters-v12xy OPTIONAL, + dc-Parameters-r12 DC-Parameters-r12 OPTIONAL, + mbms-Parameters-v12xy MBMS-Parameters-v12xy OPTIONAL, + mac-Parameters-r12 MAC-Parameters-r12 OPTIONAL, + fdd-Add-UE-EUTRA-Capabilities-v12xy UE-EUTRA-CapabilityAddXDD-Mode-v12xy OPTIONAL, + tdd-Add-UE-EUTRA-Capabilities-v12xy UE-EUTRA-CapabilityAddXDD-Mode-v12xy OPTIONAL, nonCriticalExtension SEQUENCE {} OPTIONAL } @@ -5142,10 +5615,26 @@ UE-EUTRA-CapabilityAddXDD-Mode-v1180 ::= SEQUENCE { mbms-Parameters-r11 MBMS-Parameters-r11 } +UE-EUTRA-CapabilityAddXDD-Mode-v12xy ::= SEQUENCE { + phyLayerParameters-v12xy PhyLayerParameters-v12xy OPTIONAL, + measParameters-v12xy MeasParameters-v12xy OPTIONAL +} + AccessStratumRelease ::= ENUMERATED { rel8, rel9, rel10, rel11, spare4, spare3, spare2, spare1, ...} +DC-Parameters-r12 ::= SEQUENCE { + drb-TypeSplit-r12 ENUMERATED {supported} OPTIONAL, + drb-TypeSCG-r12 ENUMERATED {supported} OPTIONAL, + singleDuplexModeCG-r12 ENUMERATED {supported} OPTIONAL +} + +MAC-Parameters-r12 ::= SEQUENCE { + logicalChannelSR-ProhibitTimer-r12 ENUMERATED {supported} OPTIONAL, + longDRX-Command-r12 ENUMERATED {supported} OPTIONAL +} + RLC-Parameters-r12 ::= SEQUENCE { extended-RLC-LI-Field-r12 ENUMERATED {supported} } @@ -5215,11 +5704,16 @@ PhyLayerParameters-v1170 ::= SEQUENCE { PhyLayerParameters-v12xy ::= SEQUENCE { e-HARQ-Pattern-FDD-r12 ENUMERATED {supported} OPTIONAL, + enhanced-4TxCodebook-r12 ENUMERATED {supported} OPTIONAL, tdd-FDD-CA-PCellDuplex-r12 BIT STRING (SIZE (2)) OPTIONAL, phy-TDD-ReConfig-TDDPCell-r12 ENUMERATED {supported} OPTIONAL, phy-TDD-ReConfig-FDDPCell-r12 ENUMERATED {supported} OPTIONAL, + pusch-FeedbackMode-r12 ENUMERATED {supported} OPTIONAL, pusch-SRS-PowerControl-SubframeSet-r12 ENUMERATED {supported} OPTIONAL, - csi-SubframeSet-r12 ENUMERATED {supported} OPTIONAL + csi-SubframeSet-r12 ENUMERATED {supported} OPTIONAL, + noResourceRestrictionForTTIBundling-r12 ENUMERATED {supported} OPTIONAL, + discoverySignalsInDeactSCell-r12 ENUMERATED {supported} OPTIONAL, + naics-Capability-List-r12 NAICS-Capability-List-r12 OPTIONAL } @@ -5249,6 +5743,10 @@ RF-Parameters-v1090 ::= SEQUENCE { supportedBandCombination-v1090 SupportedBandCombination-v1090 OPTIONAL } +RF-Parameters-v10f0 ::= SEQUENCE { + modifiedMPR-Behavior-r10 BIT STRING (SIZE (32)) OPTIONAL +} + RF-Parameters-v1130 ::= SEQUENCE { supportedBandCombination-v1130 SupportedBandCombination-v1130 OPTIONAL } @@ -5259,6 +5757,12 @@ RF-Parameters-v1180 ::= SEQUENCE { supportedBandCombinationAdd-r11 SupportedBandCombinationAdd-r11 OPTIONAL } +RF-Parameters-v12xy ::= SEQUENCE { + supportedBandListEUTRA-v12xy SupportedBandListEUTRA-v12xy OPTIONAL, + supportedBandCombination-v12xy SupportedBandCombination-v12xy OPTIONAL, + supportedBandCombinationAdd-v12xy SupportedBandCombinationAdd-v12xy OPTIONAL +} + SupportedBandCombination-r10 ::= SEQUENCE (SIZE (1..maxBandComb-r10)) OF BandCombinationParameters-r10 SupportedBandCombinationExt-r10 ::= SEQUENCE (SIZE (1..maxBandComb-r10)) OF BandCombinationParametersExt-r10 @@ -5267,8 +5771,12 @@ SupportedBandCombination-v1090 ::= SEQUENCE (SIZE (1..maxBandComb-r10)) OF BandC SupportedBandCombination-v1130 ::= SEQUENCE (SIZE (1..maxBandComb-r10)) OF BandCombinationParameters-v1130 +SupportedBandCombination-v12xy ::= SEQUENCE (SIZE (1..maxBandComb-r10)) OF BandCombinationParameters-v12xy + SupportedBandCombinationAdd-r11 ::= SEQUENCE (SIZE (1..maxBandComb-r11)) OF BandCombinationParameters-r11 +SupportedBandCombinationAdd-v12xy ::= SEQUENCE (SIZE (1..maxBandComb-r11)) OF BandCombinationParameters-v12xy + BandCombinationParameters-r10 ::= SEQUENCE (SIZE (1..maxSimultaneousBands-r10)) OF BandParameters-r10 BandCombinationParametersExt-r10 ::= SEQUENCE { @@ -5294,6 +5802,18 @@ BandCombinationParameters-r11 ::= SEQUENCE { ... } +BandCombinationParameters-v12xy::= SEQUENCE { + dc-Support-r12 SEQUENCE { + supported-r12 SEQUENCE { + asynchronous-r12 ENUMERATED {supported} OPTIONAL, + supportedCellGrouping-r12 BIT STRING (SIZE (1..15)) OPTIONAL + } OPTIONAL + }, + supportedNAICS-2CRS-AP-r12 BIT STRING (SIZE (1..maxNAICS-Entries-r12)) OPTIONAL, + ... +} + + SupportedBandwidthCombinationSet-r10 ::= BIT STRING (SIZE (1..maxBandwidthCombSet-r10)) BandParameters-r10 ::= SEQUENCE { @@ -5342,6 +5862,8 @@ SupportedBandListEUTRA ::= SEQUENCE (SIZE (1..maxBands)) OF SupportedBandEUTRA SupportedBandListEUTRA-v9e0::= SEQUENCE (SIZE (1..maxBands)) OF SupportedBandEUTRA-v9e0 +SupportedBandListEUTRA-v12xy ::= SEQUENCE (SIZE (1..maxBands)) OF SupportedBandEUTRA-v12xy + SupportedBandEUTRA ::= SEQUENCE { bandEUTRA FreqBandIndicator, halfDuplex BOOLEAN @@ -5351,6 +5873,10 @@ SupportedBandEUTRA-v9e0 ::= SEQUENCE { bandEUTRA-v9e0 FreqBandIndicator-v9e0 OPTIONAL } +SupportedBandEUTRA-v12xy ::= SEQUENCE { + dl-256QAM-r12 ENUMERATED {supported} OPTIONAL +} + MeasParameters ::= SEQUENCE { bandListEUTRA BandListEUTRA } @@ -5363,9 +5889,20 @@ MeasParameters-v1130 ::= SEQUENCE { rsrqMeasWideband-r11 ENUMERATED {supported} OPTIONAL } +MeasParameters-v11a0 ::= SEQUENCE { + benefitsFromInterruption-r11 ENUMERATED {true} OPTIONAL +} + MeasParameters-v12xy ::= SEQUENCE { timerT312-r12 ENUMERATED {supported} OPTIONAL, - alternativeTimeToTrigger-r12 ENUMERATED {supported} OPTIONAL + alternativeTimeToTrigger-r12 ENUMERATED {supported} OPTIONAL, + incMonEUTRA-r12 ENUMERATED {supported} OPTIONAL, + incMonUTRA-r12 ENUMERATED {supported} OPTIONAL, + extendedMaxMeasId-r12 ENUMERATED {supported} OPTIONAL, + extendedRSRQ-LowerRange-r12 ENUMERATED {supported} OPTIONAL, + rsrqOnAllSymbols-r12 ENUMERATED {supported} OPTIONAL, + crs-DiscoverySignalsMeas-r12 ENUMERATED {supported} OPTIONAL, + csi-RS-DiscoverySignalsMeas-r12 ENUMERATED {supported} OPTIONAL } BandListEUTRA ::= SEQUENCE (SIZE (1..maxBands)) OF BandInfoEUTRA @@ -5522,7 +6059,7 @@ UE-BasedNetwPerfMeasParameters-r10 ::= SEQUENCE { standaloneGNSS-Location-r10 ENUMERATED {supported} OPTIONAL } -UE-BasedNetwPerfMeasParameters-v12xy ::= SEQUENCE { +UE-BasedNetwPerfMeasParameters-v12xy ::= SEQUENCE { loggedMBSFNMeasurements-r12 ENUMERATED {supported} } @@ -5542,6 +6079,26 @@ MBMS-Parameters-r11 ::= SEQUENCE { mbms-NonServingCell-r11 ENUMERATED {supported} OPTIONAL } +MBMS-Parameters-v12xy ::= SEQUENCE { + mbms-AsyncDC-r12 ENUMERATED {supported} OPTIONAL +} + +WLAN-IW-Parameters-r12 ::= SEQUENCE { + wlan-IW-RAN-Rules-r12 ENUMERATED {supported} OPTIONAL, + wlan-IW-ANDSF-Policies-r12 ENUMERATED {supported} OPTIONAL +} + +NAICS-Capability-List-r12 ::= SEQUENCE (SIZE (1..maxNAICS-Entries-r12)) OF NAICS-Capability-Entry-r12 + + +NAICS-Capability-Entry-r12 ::= SEQUENCE { + numberOfNAICSCapableCC-r12 INTEGER(1..5), + numberOfAggregatedPRB-r12 ENUMERATED { + n50, n75, n100, n125, n150, n175, + n200, n225, n250, n275, n300, n350, + n400, n450, n500, spare} +} + UE-RadioPagingInfo-r12 ::= SEQUENCE { ue-Category-v12xy INTEGER (0) OPTIONAL, @@ -5583,7 +6140,7 @@ VisitedCellInfo-r12 ::= SEQUENCE { } -WLAN-OffloadConfig-r12 ::= SEQUENCE { +WLAN-OffloadConfig-r12 ::= SEQUENCE { thresholdRSRP-r12 SEQUENCE { thresholdRSRP-Low-r12 RSRP-Range, thresholdRSRP-High-r12 RSRP-Range @@ -5592,6 +6149,19 @@ WLAN-OffloadConfig-r12 ::= SEQUENCE { thresholdRSRQ-Low-r12 RSRQ-Range, thresholdRSRQ-High-r12 RSRQ-Range } OPTIONAL, -- Need OR + thresholdRSRQ-OnAllSymbolsWithWB-r12 SEQUENCE { + thresholdRSRQ-OnAllSymbolsWithWB-Low-r12 RSRQ-Range, + thresholdRSRQ-OnAllSymbolsWithWB-High-r12 RSRQ-Range + } OPTIONAL, -- Cond RSRQ + thresholdRSRQ-OnAllSymbols-r12 SEQUENCE { + thresholdRSRQ-OnAllSymbolsLow-r12 RSRQ-Range, + thresholdRSRQ-OnAllSymbolsHigh-r12 RSRQ-Range + } OPTIONAL, -- Cond RSRQ2 + thresholdRSRQ-WB-r12 SEQUENCE { + thresholdRSRQ-WB-Low-r12 RSRQ-Range, + thresholdRSRQ-WB-High-r12 RSRQ-Range + } OPTIONAL, -- Cond RSRQ3 + thresholdChannelUtilization-r12 SEQUENCE { thresholdChannelUtilizationLow-r12 INTEGER (0..255), thresholdChannelUtilizationHigh-r12 INTEGER (0..255) @@ -5600,7 +6170,7 @@ WLAN-OffloadConfig-r12 ::= SEQUENCE { thresholdBackhaulDL-BandwidthLow-r12 WLAN-backhaulRate, thresholdBackhaulDL-BandwidthHigh-r12 WLAN-backhaulRate, thresholdBackhaulUL-BandwidthLow-r12 WLAN-backhaulRate, - thresholdBackhaulUL-BandwidthHigh-r12 WLAN-backhaulRate + thresholdBackhaulUL-BandwidthHigh-r12 WLAN-backhaulRate } OPTIONAL, -- Need OR thresholdBeaconRSSI-r12 SEQUENCE { thresholdBeaconRSSI-Low-r12 INTEGER (0..255), @@ -5612,7 +6182,7 @@ WLAN-OffloadConfig-r12 ::= SEQUENCE { } WLAN-backhaulRate ::= ENUMERATED - {r0, r2, r4, r8, r16, r32, r64, r128, r256, r512, + {r0, r4, r8, r16, r32, r64, r128, r256, r512, r1024, r2048, r4096, r8192, r16384, r32768, r65536, r131072, r262144, r524288, r1048576, r2097152, r4194304, r8388608, r16777216, r33554432, r67108864, r134217728, r268435456, @@ -5672,7 +6242,7 @@ MBMS-SessionInfoList-r9 ::= SEQUENCE (SIZE (0..maxSessionPerPMCH)) OF MBMS-Sess MBMS-SessionInfo-r9 ::= SEQUENCE { tmgi-r9 TMGI-r9, - sessionId-r9 OCTET STRING (SIZE (1)) OPTIONAL, -- Need OR + sessionId-r9 OCTET STRING (SIZE (1)) OPTIONAL, -- Need OR logicalChannelIdentity-r9 INTEGER (0..maxSessionPerPMCH-1), ... } @@ -5687,7 +6257,10 @@ PMCH-Config-r9 ::= SEQUENCE { PMCH-Config-r12 ::= SEQUENCE { sf-AllocEnd-r12 INTEGER (0..1535), - dataMCS-r12 INTEGER (0..28), + dataMCS-r12 CHOICE { + t1-r12 INTEGER (0..28), + t2-r12 INTEGER (0..27) + }, mch-SchedulingPeriod-r12 ENUMERATED { rf4, rf8, rf16, rf32, rf64, rf128, rf256, rf512, rf1024}, ... @@ -5713,7 +6286,7 @@ maxCDMA-BandClass INTEGER ::= 32 -- Maximum value of the CDMA band classes maxCellBlack INTEGER ::= 16 -- Maximum number of blacklisted physical cell identity -- ranges listed in SIB type 4 and 5 maxCellHistory-r12 INTEGER ::= 16 -- Maximum number of visited EUTRA cells reported -maxCellInfoGERAN-r9 INTEGER ::= 32 -- Maximum number of GERAN cells for which system in- +maxCellInfoGERAN-r9 INTEGER ::= 32 -- Maximum number of GERAN cells for which system in- -- formation can be provided as redirection assistance maxCellInfoUTRA-r9 INTEGER ::= 16 -- Maximum number of UTRA cells for which system -- information can be provided as redirection @@ -5723,13 +6296,13 @@ maxCSI-IM-r11 INTEGER ::= 3 -- Maximum number of CSI-IM configurations maxCSI-IM-r12 INTEGER ::= 4 -- Maximum number of CSI-IM configurations -- (per carrier frequency) maxCSI-Proc-r11 INTEGER ::= 4 -- Maximum number of CSI RS processes (per carrier - -- frequency) + -- frequency) maxCSI-RS-NZP-r11 INTEGER ::= 3 -- Maximum number of CSI RS resource - -- configurations using non-zero Tx power - -- (per carrier frequency) + -- configurations using non-zero Tx power + -- (per carrier frequency) maxCSI-RS-ZP-r11 INTEGER ::= 4 -- Maximum number of CSI RS resource - -- configurations using zero Tx power(per carrier - -- frequency) + -- configurations using zero Tx power(per carrier + -- frequency) maxCQI-ProcExt-r11 INTEGER ::= 3 -- Maximum number of additional periodic CQI -- configurations (per carrier frequency) maxFreqUTRA-TDD-r10 INTEGER ::= 6 -- Maximum number of UTRA TDD carrier frequencies for @@ -5742,8 +6315,14 @@ maxCellIntra INTEGER ::= 16 -- Maximum number of neighbouring intra-frequency maxCellListGERAN INTEGER ::= 3 -- Maximum number of lists of GERAN cells maxCellMeas INTEGER ::= 32 -- Maximum number of entries in each of the -- cell lists in a measurement object -maxCellReport INTEGER ::= 8 -- Maximum number of reported cells +maxCellReport INTEGER ::= 8 -- Maximum number of reported cells/CSI-RS resources +maxCSI-RS-Meas-r12 INTEGER ::= 96 -- Maximum number of entries in the CSI-RS list + -- in a measurement object maxDRB INTEGER ::= 11 -- Maximum number of Data Radio Bearers +maxDS-Duration-r12 INTEGER ::= 5 -- Maximum number of subframes in a discovery signals + -- occasion +maxDS-ZTP-CSI-RS-r12 INTEGER ::= 5 -- Maximum number of zero transmission power CSI-RS for + -- a serving cell concerning discovery signals maxEARFCN INTEGER ::= 65535 -- Maximum value of EUTRA carrier frequency maxEARFCN-Plus1 INTEGER ::= 65536 -- Lowest value extended EARFCN range maxEARFCN2 INTEGER ::= 262143 -- Highest value extended EARFCN range @@ -5760,23 +6339,30 @@ maxGERAN-SI INTEGER ::= 10 -- Maximum number of GERAN SI blocks that can be -- provided as part of NACC information maxGNFG INTEGER ::= 16 -- Maximum number of GERAN neighbour freq groups maxLogMeasReport-r10 INTEGER ::= 520 -- Maximum number of logged measurement entries - -- that can be reported by the UE in one message + -- that can be reported by the UE in one message maxMBSFN-Allocations INTEGER ::= 8 -- Maximum number of MBSFN frame allocations with -- different offset maxMBSFN-Area INTEGER ::= 8 maxMBSFN-Area-1 INTEGER ::= 7 maxMeasId INTEGER ::= 32 +maxMeasId-Plus1 INTEGER ::= 33 +maxMeasId-r12 INTEGER ::= 64 maxMultiBands INTEGER ::= 8 -- Maximum number of additional frequency bands -- that a cell belongs to +maxNAICS-Entries-r12 INTEGER ::= 8 -- Maximum number of supported NAICS combination(s) +maxNeighCell-r12 INTEGER ::= 8 -- Maximum number of neighbouring cells in NAICS + -- configuration (per carrier frequency) maxObjectId INTEGER ::= 32 +maxP-a-PerNeighCell-r12 INTEGER ::= 3 -- Maximum number of power offsets for a neighbour cell + -- in NAICS configuration maxPageRec INTEGER ::= 16 -- -maxPhysCellIdRange-r9 INTEGER ::= 4 -- Maximum number of physical cell identity ranges +maxPhysCellIdRange-r9 INTEGER ::= 4 -- Maximum number of physical cell identity ranges maxPLMN-r11 INTEGER ::= 6 -- Maximum number of PLMNs maxPNOffset INTEGER ::= 511 -- Maximum number of CDMA2000 PNOffsets maxPMCH-PerMBSFN INTEGER ::= 15 maxRAT-Capabilities INTEGER ::= 8 -- Maximum number of interworking RATs (incl EUTRA) maxRE-MapQCL-r11 INTEGER ::= 4 -- Maximum number of PDSCH RE Mapping configurations - -- (per carrier frequency) + -- (per carrier frequency) maxReportConfigId INTEGER ::= 32 maxRSTD-Freq-r10 INTEGER ::= 3 -- Maximum number of frequency layers for RSTD -- measurement @@ -5785,8 +6371,8 @@ maxSAI-MBMS-r11 INTEGER ::= 64 -- Maximum number of MBMS service area identit maxSCell-r10 INTEGER ::= 4 -- Maximum number of SCells maxSTAG-r11 INTEGER ::= 3 -- Maximum number of STAGs maxServCell-r10 INTEGER ::= 5 -- Maximum number of Serving cells -maxServiceCount INTEGER ::= 16 -- Maximum number of MBMS services that can be included - -- in an MBMS counting request and response +maxServiceCount INTEGER ::= 16 -- Maximum number of MBMS services that can be included + -- in an MBMS counting request and response maxServiceCount-1 INTEGER ::= 15 maxSessionPerPMCH INTEGER ::= 29 maxSessionPerPMCH-1 INTEGER ::= 28 diff --git a/asn1/lte-rrc/EUTRA-UE-Variables.asn b/asn1/lte-rrc/EUTRA-UE-Variables.asn index b3c1838ed1..eb10896ae4 100644 --- a/asn1/lte-rrc/EUTRA-UE-Variables.asn +++ b/asn1/lte-rrc/EUTRA-UE-Variables.asn @@ -1,4 +1,4 @@ --- 3GPP TS 36.331 V12.3.0 (2014-09) +-- 3GPP TS 36.331 V12.4.0 (2014-12) -- EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::= @@ -16,10 +16,14 @@ IMPORTS LoggingDuration-r10, LoggingInterval-r10, LogMeasInfo-r10, + MeasCSI-RS-Id-r12, MeasId, + MeasId-v12xy, MeasIdToAddModList, + MeasIdToAddModListExt-r12, MeasObjectToAddModList, MeasObjectToAddModList-v9e0, + MeasScaleFactor-r12, MobilityStateParameters, NeighCellConfig, PhysCellId, @@ -37,7 +41,9 @@ IMPORTS TraceReference-r10, VisitedCellInfoList-r12, maxCellMeas, - maxMeasId + maxCSI-RS-Meas-r12, + maxMeasId, + maxMeasId-r12 FROM EUTRA-RRC-Definitions; @@ -93,6 +99,7 @@ LogMeasInfoList2-r10 ::= SEQUENCE (SIZE (1..maxLogMeas-r10)) OF LogMeasInfo-r VarMeasConfig ::= SEQUENCE { -- Measurement identities measIdList MeasIdToAddModList OPTIONAL, + measIdListExt-r12 MeasIdToAddModListExt-r12 OPTIONAL, -- Measurement objects measObjectList MeasObjectToAddModList OPTIONAL, measObjectList-v9i0 MeasObjectToAddModList-v9e0 OPTIONAL, @@ -100,6 +107,7 @@ VarMeasConfig ::= SEQUENCE { reportConfigList ReportConfigToAddModList OPTIONAL, -- Other parameters quantityConfig QuantityConfig OPTIONAL, + measScaleFactor-r12 MeasScaleFactor-r12 OPTIONAL, s-Measure INTEGER (-140..-44) OPTIONAL, speedStatePars CHOICE { release NULL, @@ -107,16 +115,20 @@ VarMeasConfig ::= SEQUENCE { mobilityStateParameters MobilityStateParameters, timeToTrigger-SF SpeedStateScaleFactors } - } OPTIONAL + } OPTIONAL, + allowInterruptions-r11 BOOLEAN OPTIONAL } VarMeasReportList ::= SEQUENCE (SIZE (1..maxMeasId)) OF VarMeasReport +VarMeasReportList-r12 ::= SEQUENCE (SIZE (1..maxMeasId-r12)) OF VarMeasReport VarMeasReport ::= SEQUENCE { -- List of measurement that have been triggered measId MeasId, + measId-v12xy MeasId-v12xy OPTIONAL, cellsTriggeredList CellsTriggeredList OPTIONAL, + csi-RS-TriggeredList-r12 CSI-RS-TriggeredList-r12 OPTIONAL, numberOfReportsSent INTEGER } @@ -132,6 +144,9 @@ CellsTriggeredList ::= SEQUENCE (SIZE (1..maxCellMeas)) OF CHOICE { }, physCellIdCDMA2000 PhysCellIdCDMA2000 } + +CSI-RS-TriggeredList-r12 ::= SEQUENCE (SIZE (1..maxCSI-RS-Meas-r12)) OF MeasCSI-RS-Id-r12 + VarMobilityHistoryReport-r12 ::= VisitedCellInfoList-r12 @@ -153,7 +168,7 @@ VarShortMAC-Input ::= SEQUENCE { } maxLogMeas-r10 INTEGER ::= 4060-- Maximum number of logged measurement entries - -- that can be stored by the UE + -- that can be stored by the UE END diff --git a/asn1/lte-rrc/lte-rrc.cnf b/asn1/lte-rrc/lte-rrc.cnf index 0dbcd364fb..0de257f2ad 100644 --- a/asn1/lte-rrc/lte-rrc.cnf +++ b/asn1/lte-rrc/lte-rrc.cnf @@ -1,6 +1,6 @@ # lte-rrc.cnf # lte-rrc conformation file -# Copyright 2008 Vincent Helfre, 2009-2014 Pascal Quantin +# Copyright 2008 Vincent Helfre, 2009-2015 Pascal Quantin #.OPT PER @@ -10,6 +10,7 @@ UNALIGNED #.USE_VALS_EXT BandclassCDMA2000 DRX-Config/setup/drx-InactivityTimer +PDCP-Config/eag_3/t-Reordering-r12 Q-OffsetRange RRM-Config/ue-InactiveTime SupportedBandUTRA-FDD @@ -47,23 +48,34 @@ UE-EUTRA-Capability @ue_eutra_cap #.OMIT_ASSIGNMENT # Get rid of unused code warnings -VarShortMAC-Input -VarMeasConfig -VarMeasReportList -VarMeasReport +Cell-ToAddMod-r12 CellsTriggeredList +CSI-RS-TriggeredList-r12 +DRB-InfoListSCG-r12 +DRB-InfoSCG-r12 +LogMeasInfoList2-r10 +MeasResultServCellListSCG-r12 +MeasResultServCellSCG-r12 +SCellToAddModListSCG-r12 +SCG-ConfigInfo-r12 +SCG-ConfigInfo-r12-IEs +SCG-ConfigRestrictInfo-r12 +UERadioPagingInformation +UERadioPagingInformation-r12-IEs VarConnEstFailReport-r11 VarLogMeasConfig-r10 -VarLogMeasReport-r10 -LogMeasInfoList2-r10 -VarRLF-Report-r10 VarLogMeasConfig-r11 -VarLogMeasReport-r11 -VarRLF-Report-r11 VarLogMeasConfig-r12 +VarLogMeasReport-r10 +VarLogMeasReport-r11 +VarMeasConfig +VarMeasReportList +VarMeasReportList-r12 +VarMeasReport VarMobilityHistoryReport-r12 -UERadioPagingInformation -UERadioPagingInformation-r12-IEs +VarRLF-Report-r10 +VarRLF-Report-r11 +VarShortMAC-Input #.MAKE_ENUM RAT-Type TYPE_PREFIX @@ -247,6 +259,46 @@ if(ue_cap_tvb){ proto_tree_add_bits_item(subtree, hf_lte_rrc_tdd_FDD_CA_PCellDuplex_r12_bit2, pcellduplex_tvb, 1, 1, ENC_BIG_ENDIAN); } +#.FN_BODY RF-Parameters-v10f0/modifiedMPR-Behavior-r10 VAL_PTR = &modifiedMPR_Behavior_r10_tvb + tvbuff_t *modifiedMPR_Behavior_r10_tvb=NULL; + proto_tree *subtree; +%(DEFAULT_BODY)s + if (modifiedMPR_Behavior_r10_tvb) { + subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_modifiedMPR_Behavior_r10); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_0, modifiedMPR_Behavior_r10_tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_1, modifiedMPR_Behavior_r10_tvb, 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_2, modifiedMPR_Behavior_r10_tvb, 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_3, modifiedMPR_Behavior_r10_tvb, 3, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_4, modifiedMPR_Behavior_r10_tvb, 4, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_5, modifiedMPR_Behavior_r10_tvb, 5, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_6, modifiedMPR_Behavior_r10_tvb, 6, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_7, modifiedMPR_Behavior_r10_tvb, 7, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_8, modifiedMPR_Behavior_r10_tvb, 8, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_9, modifiedMPR_Behavior_r10_tvb, 9, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_10, modifiedMPR_Behavior_r10_tvb, 10, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_11, modifiedMPR_Behavior_r10_tvb, 11, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_12, modifiedMPR_Behavior_r10_tvb, 12, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_13, modifiedMPR_Behavior_r10_tvb, 13, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_14, modifiedMPR_Behavior_r10_tvb, 14, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_15, modifiedMPR_Behavior_r10_tvb, 15, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_16, modifiedMPR_Behavior_r10_tvb, 16, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_17, modifiedMPR_Behavior_r10_tvb, 17, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_18, modifiedMPR_Behavior_r10_tvb, 18, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_19, modifiedMPR_Behavior_r10_tvb, 19, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_20, modifiedMPR_Behavior_r10_tvb, 20, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_21, modifiedMPR_Behavior_r10_tvb, 21, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_22, modifiedMPR_Behavior_r10_tvb, 22, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_23, modifiedMPR_Behavior_r10_tvb, 23, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_24, modifiedMPR_Behavior_r10_tvb, 24, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_25, modifiedMPR_Behavior_r10_tvb, 25, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_26, modifiedMPR_Behavior_r10_tvb, 26, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_27, modifiedMPR_Behavior_r10_tvb, 27, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_28, modifiedMPR_Behavior_r10_tvb, 28, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_29, modifiedMPR_Behavior_r10_tvb, 29, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_30, modifiedMPR_Behavior_r10_tvb, 30, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_31, modifiedMPR_Behavior_r10_tvb, 31, 1, ENC_BIG_ENDIAN); + } + #.FN_BODY Handover /* Initialise to invalid value */ private_data_set_rat_target_type(actx, 0xFF); @@ -508,11 +560,14 @@ NeighCellConfig TYPE=FT_UINT8 DISPLAY=BASE_DEC STRINGS=VALS(lte_rrc_neighCellCon proto_tree *subtree; subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_absTimeInfo); str = tvb_bcd_dig_to_wmem_packet_str(abs_time_info_tvb, 0, 6, NULL, FALSE); - hf_str = wmem_strdup_printf(wmem_packet_scope(), "%c%c-%c%c-%c%c %c%c:%c%c:%c%c", str[0], str[1], + hf_str = wmem_strdup_printf(wmem_packet_scope(), "%c%c-%c%c-%c%c %c%c:%c%c:%c%c", str[0], str[1], str[2], str[3], str[4], str[5], str[6], str[7], str[8], str[9], str[10], str[11]); proto_tree_add_string(subtree, hf_lte_rrc_absolute_time, abs_time_info_tvb, 0, 6, hf_str); } +#.TYPE_RENAME +CarrierFreqUTRA-FDD-Ext-r12/multiBandInfoList-r12 FreqBandIndicator_UTRA_FDD_r12 + #.TYPE_ATTR SystemInformationBlockType9/hnb-Name TYPE=FT_STRING DISPLAY=STR_UNICODE @@ -747,6 +802,9 @@ RLF-Report-r9/eag_1/timeConnFailure-r10 DISPLAY=BASE_CUSTOM STRINGS=<e_rrc_tim %(DEFAULT_BODY)s proto_item_append_text(actx->created_item, "s"); +#.TYPE_ATTR +BLER-Range-r12 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_BLER_Range_r12_vals_ext + #.FN_BODY TimeSinceFailure-r11 %(DEFAULT_BODY)s proto_item_append_text(actx->created_item, "s"); @@ -755,20 +813,38 @@ RLF-Report-r9/eag_1/timeConnFailure-r10 DISPLAY=BASE_CUSTOM STRINGS=<e_rrc_tim CarrierFreqUTRA-FDD/q-RxLevMin DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_utra_q_RxLevMin_vals_ext #.TYPE_ATTR +CarrierFreqUTRA-FDD-Ext-r12/q-RxLevMin-r12 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_utra_q_RxLevMin_vals_ext + +#.TYPE_ATTR CarrierFreqUTRA-TDD/q-RxLevMin DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_utra_q_RxLevMin_vals_ext +#.TYPE_ATTR +CarrierFreqUTRA-TDD-r12/q-RxLevMin-r12 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_utra_q_RxLevMin_vals_ext + #.FN_BODY CarrierFreqUTRA-FDD/p-MaxUTRA %(DEFAULT_BODY)s proto_item_append_text(actx->created_item, "dBm"); +#.FN_BODY CarrierFreqUTRA-FDD-Ext-r12/p-MaxUTRA-r12 +%(DEFAULT_BODY)s + proto_item_append_text(actx->created_item, "dBm"); + #.FN_BODY CarrierFreqUTRA-TDD/p-MaxUTRA %(DEFAULT_BODY)s proto_item_append_text(actx->created_item, "dBm"); +#.FN_BODY CarrierFreqUTRA-TDD-r12/p-MaxUTRA-r12 +%(DEFAULT_BODY)s + proto_item_append_text(actx->created_item, "dBm"); + #.FN_BODY CarrierFreqUTRA-FDD/q-QualMin %(DEFAULT_BODY)s proto_item_append_text(actx->created_item, "dB"); +#.FN_BODY CarrierFreqUTRA-FDD-Ext-r12/q-QualMin-r12 +%(DEFAULT_BODY)s + proto_item_append_text(actx->created_item, "dB"); + #.TYPE_ATTR CarrierFreqsInfoGERAN/commonInfo/q-RxLevMin DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_geran_q_RxLevMin_vals_ext @@ -843,11 +919,11 @@ CQI-ReportConfigSCell-r10/nomPDSCH-RS-EPRE-Offset-r10 STRINGS=VALS(lte_rrc_nomPD %(DEFAULT_BODY)s proto_item_append_text(actx->created_item, "dB"); -#.FN_BODY SPS-ConfigUL/setup/eag_1/p0-Persistent-SubframeSet2-r12/p0-NominalPUSCH-Persistent-SubframeSet2-r12 +#.FN_BODY SPS-ConfigUL/setup/eag_1/p0-PersistentSubframeSet2-r12/p0-NominalPUSCH-PersistentSubframeSet2-r12 %(DEFAULT_BODY)s proto_item_append_text(actx->created_item, "dBm"); -#.FN_BODY SPS-ConfigUL/setup/eag_1/p0-Persistent-SubframeSet2-r12/p0-UE-PUSCH-Persistent-SubframeSet2-r12 +#.FN_BODY SPS-ConfigUL/setup/eag_1/p0-PersistentSubframeSet2-r12/p0-UE-PUSCH-PersistentSubframeSet2-r12 %(DEFAULT_BODY)s proto_item_append_text(actx->created_item, "dB"); @@ -865,6 +941,10 @@ UplinkPowerControlCommonSCell-v11x0/deltaPreambleMsg3-r11 STRINGS=VALS(lte_rrc_d %(DEFAULT_BODY)s proto_item_append_text(actx->created_item, "dBm"); +#.FN_BODY UplinkPowerControlCommonPSCell-r12/p0-NominalPUCCH +%(DEFAULT_BODY)s + proto_item_append_text(actx->created_item, "dBm"); + #.FN_BODY UplinkPowerControlCommonSCell-r10/p0-NominalPUSCH-r10 %(DEFAULT_BODY)s proto_item_append_text(actx->created_item, "dBm"); @@ -914,6 +994,12 @@ ReselectionThreshold DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_Reselecti #.TYPE_ATTR Hysteresis DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_Hysteresis_vals_ext +#.TYPE_ATTR +CSI-RSRP-Range-r12 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_RSRP_Range_vals_ext + +#.TYPE_ATTR +MBSFN-RSRQ-Range-r12 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_MBSFN_RSRQ_Range_vals_ext + #.TYPE_RENAME MeasConfig/s-Measure S_Measure @@ -930,10 +1016,13 @@ MeasResultUTRA/measResult/utra-EcN0 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=< MeasResultUTRA/measResult/utra-RSCP DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_utra_RSCP_vals_ext #.TYPE_ATTR -ReportConfigEUTRA/triggerType/event/eventId/eventA3/a3-Offset DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_a3_a6_Offset_vals_ext +ReportConfigEUTRA/triggerType/event/eventId/eventA3/a3-Offset DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_a3_a6_c2_Offset_vals_ext + +#.TYPE_ATTR +ReportConfigEUTRA/triggerType/event/eventId/eventA6-r10/a6-Offset-r10 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_a3_a6_c2_Offset_vals_ext #.TYPE_ATTR -ReportConfigEUTRA/triggerType/event/eventId/eventA6-r10/a6-Offset-r10 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_a3_a6_Offset_vals_ext +ReportConfigEUTRA/triggerType/event/eventId/eventC2-r12/c2-Offset-r12 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_a3_a6_c2_Offset_vals_ext #.TYPE_RENAME ThresholdEUTRA/threshold-RSRP Threshold_RSRP_Range @@ -969,6 +1058,9 @@ RSRP-Range DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_RSRP_Range_vals_ext RSRQ-Range DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_RSRQ_Range_vals_ext #.TYPE_ATTR +RSRQ-Range-v12xy DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_RSRQ_Range_vals_ext + +#.TYPE_ATTR MeasResultForECID-r9/ue-RxTxTimeDiffResult-r9 DISPLAY=BASE_CUSTOM STRINGS=<e_rrc_ue_RxTxTimeDiffResult_fmt #.FN_BODY SoundingRS-UL-ConfigDedicated/setup/duration @@ -1230,6 +1322,10 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val) col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSInterestIndication-r11"); +#.FN_HDR SCGFailureInformation-r12 + + col_append_str(actx->pinfo->cinfo, COL_INFO, "SCGFailureInformation-r12"); + #.FN_BODY Paging/systemInfoModification %(DEFAULT_BODY)s col_append_str(actx->pinfo->cinfo, COL_INFO, " (systemInfoModification)"); @@ -1344,7 +1440,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val) } } -#.FN_BODY UL-AM-RLC-r12/extended-RLC-LI-Field-r12 VAL_PTR=&ext_li_field +#.FN_BODY RLC-Config-v12xy/ul-extended-RLC-LI-Field-r12 VAL_PTR=&ext_li_field gboolean ext_li_field; drb_mapping_t *mapping = private_data_get_drb_mapping(actx); %(DEFAULT_BODY)s @@ -1352,7 +1448,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val) mapping->rlc_ul_ext_li_field = ext_li_field; } -#.FN_BODY DL-AM-RLC-r12/extended-RLC-LI-Field-r12 VAL_PTR=&ext_li_field +#.FN_BODY RLC-Config-v12xy/dl-extended-RLC-LI-Field-r12 VAL_PTR=&ext_li_field gboolean ext_li_field; drb_mapping_t *mapping = private_data_get_drb_mapping(actx); %(DEFAULT_BODY)s @@ -1404,6 +1500,21 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val) mapping->pdcp_sn_size_present = TRUE; } +#.FN_BODY NeighCellsInfo-r12/transmissionModeList-r12 VAL_PTR=&tm_list_tvb + tvbuff_t *tm_list_tvb=NULL; + proto_tree *subtree; +%(DEFAULT_BODY)s + if (tm_list_tvb) { + subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_transmissionModeList_r12); + proto_tree_add_bits_item(subtree, hf_lte_rrc_transmissionModeList_r12_tm1, tm_list_tvb, 0, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_transmissionModeList_r12_tm2, tm_list_tvb, 1, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_transmissionModeList_r12_tm3, tm_list_tvb, 2, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_transmissionModeList_r12_tm4, tm_list_tvb, 3, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_transmissionModeList_r12_tm6, tm_list_tvb, 4, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_transmissionModeList_r12_tm8, tm_list_tvb, 5, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_transmissionModeList_r12_tm9, tm_list_tvb, 6, 1, ENC_BIG_ENDIAN); + proto_tree_add_bits_item(subtree, hf_lte_rrc_transmissionModeList_r12_tm10, tm_list_tvb, 7, 1, ENC_BIG_ENDIAN); + } #.FN_BODY RACH-ConfigCommon/preambleInfo %(DEFAULT_BODY)s @@ -1649,7 +1760,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(<e_rrc_duration_val) set_pdcp_lte_security_algorithms(p_pdcp_lte_info->ueid, p_security_algorithms); } -#.FN_BODY SecurityAlgorithmConfig/cipheringAlgorithm VAL_PTR=&value +#.FN_BODY CipheringAlgorithm-r12 VAL_PTR=&value guint32 value; pdcp_security_info_t *p_security_algorithms; %(DEFAULT_BODY)s diff --git a/asn1/lte-rrc/packet-lte-rrc-template.c b/asn1/lte-rrc/packet-lte-rrc-template.c index 8773cba32b..d2dcd3e504 100644 --- a/asn1/lte-rrc/packet-lte-rrc-template.c +++ b/asn1/lte-rrc/packet-lte-rrc-template.c @@ -1,9 +1,9 @@ /* packet-lte-rrc-template.c * Routines for Evolved Universal Terrestrial Radio Access (E-UTRA); * Radio Resource Control (RRC) protocol specification - * (3GPP TS 36.331 V12.3.0 Release 12) packet dissection + * (3GPP TS 36.331 V12.4.0 Release 12) packet dissection * Copyright 2008, Vincent Helfre - * Copyright 2009-2014, Pascal Quantin + * Copyright 2009-2015, Pascal Quantin * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -193,6 +193,46 @@ static int hf_lte_rrc_cdma_time = -1; static int hf_lte_rrc_utc_time = -1; static int hf_lte_rrc_local_time = -1; static int hf_lte_rrc_absolute_time = -1; +static int hf_lte_rrc_transmissionModeList_r12_tm1 = -1; +static int hf_lte_rrc_transmissionModeList_r12_tm2 = -1; +static int hf_lte_rrc_transmissionModeList_r12_tm3 = -1; +static int hf_lte_rrc_transmissionModeList_r12_tm4 = -1; +static int hf_lte_rrc_transmissionModeList_r12_tm6 = -1; +static int hf_lte_rrc_transmissionModeList_r12_tm8 = -1; +static int hf_lte_rrc_transmissionModeList_r12_tm9 = -1; +static int hf_lte_rrc_transmissionModeList_r12_tm10 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_0 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_1 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_2 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_3 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_4 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_5 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_6 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_7 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_8 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_9 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_10 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_11 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_12 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_13 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_14 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_15 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_16 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_17 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_18 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_19 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_20 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_21 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_22 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_23 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_24 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_25 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_26 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_27 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_28 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_29 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_30 = -1; +static int hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_31 = -1; /* Initialize the subtree pointers */ static int ett_lte_rrc = -1; @@ -215,6 +255,8 @@ static gint ett_lte_rrc_warningMessageSegment = -1; static gint ett_lte_rrc_interBandTDD_CA_WithDifferentConfig = -1; static gint ett_lte_rrc_tdd_FDD_CA_PCellDuplex_r12 = -1; static gint ett_lte_rrc_sr_ConfigIndex = -1; +static gint ett_lte_rrc_transmissionModeList_r12 = -1; +static gint ett_lte_rrc_modifiedMPR_Behavior_r10 = -1; static expert_field ei_lte_rrc_number_pages_le15 = EI_INIT; static expert_field ei_lte_rrc_si_info_value_changed = EI_INIT; @@ -688,6 +730,43 @@ lte_rrc_timeConnFailure_r10_fmt(gchar *s, guint32 v) g_snprintf(s, ITEM_LABEL_LENGTH, "%ums (%u)", 100*v, v); } +static const value_string lte_rrc_BLER_Range_r12_vals[] = { + { 0, "BLER < 0.1%"}, + { 1, "0.1% <= BLER < 0.123%"}, + { 2, "0.123% <= BLER < 0.151%"}, + { 3, "0.151% <= BLER < 0.186%"}, + { 4, "0.186% <= BLER < 0.229%"}, + { 5, "0.229% <= BLER < 0.282%"}, + { 6, "0.282% <= BLER < 0.347%"}, + { 7, "0.347% <= BLER < 0.426%"}, + { 8, "0.426% <= BLER < 0.525%"}, + { 9, "0.525% <= BLER < 0.645%"}, + { 10, "0.645% <= BLER < 0.794%"}, + { 11, "0.794% <= BLER < 0.976%"}, + { 12, "0.976% <= BLER < 1.201%"}, + { 13, "1.201% <= BLER < 1.478%"}, + { 14, "1.478% <= BLER < 1.818%"}, + { 15, "1.818% <= BLER < 2.236%"}, + { 16, "2.236% <= BLER < 2.751%"}, + { 17, "2.751% <= BLER < 3.384%"}, + { 18, "3.384% <= BLER < 4.163%"}, + { 19, "4.163% <= BLER < 5.121%"}, + { 20, "5.121% <= BLER < 6.300%"}, + { 21, "6.300% <= BLER < 7.750%"}, + { 22, "7.750% <= BLER < 9.533%"}, + { 23, "9.533% <= BLER < 11.728%"}, + { 24, "11.728% <= BLER < 14.427%"}, + { 25, "14.427% <= BLER < 17.478%"}, + { 26, "17.478% <= BLER < 21.833%"}, + { 27, "21.833% <= BLER < 26.858%"}, + { 28, "26.858% <= BLER < 33.040%"}, + { 29, "33.040% <= BLER < 40.645%"}, + { 30, "40.645% <= BLER < 50%"}, + { 31, "50% <= BLER"}, + { 0, NULL} +}; +static value_string_ext lte_rrc_BLER_Range_r12_vals_ext = VALUE_STRING_EXT_INIT(lte_rrc_BLER_Range_r12_vals); + static const value_string lte_rrc_utra_q_RxLevMin_vals[] = { { -60, "-119dBm"}, { -59, "-117dBm"}, @@ -1149,7 +1228,7 @@ static const value_string lte_rrc_utra_RSCP_vals[] = { }; static value_string_ext lte_rrc_utra_RSCP_vals_ext = VALUE_STRING_EXT_INIT(lte_rrc_utra_RSCP_vals); -static const value_string lte_rrc_a3_a6_Offset_vals[] = { +static const value_string lte_rrc_a3_a6_c2_Offset_vals[] = { { -30, "-15dB"}, { -29, "-14.5dB"}, { -28, "-14dB"}, @@ -1213,7 +1292,7 @@ static const value_string lte_rrc_a3_a6_Offset_vals[] = { { 30, "15dB"}, { 0, NULL} }; -static value_string_ext lte_rrc_a3_a6_Offset_vals_ext = VALUE_STRING_EXT_INIT(lte_rrc_a3_a6_Offset_vals); +static value_string_ext lte_rrc_a3_a6_c2_Offset_vals_ext = VALUE_STRING_EXT_INIT(lte_rrc_a3_a6_c2_Offset_vals); static const value_string lte_rrc_threshold_RSRP_vals[] = { { 0, "-140dBm"}, @@ -1688,6 +1767,40 @@ static const value_string lte_rrc_RSRP_Range_vals[] = { static value_string_ext lte_rrc_RSRP_Range_vals_ext = VALUE_STRING_EXT_INIT(lte_rrc_RSRP_Range_vals); static const value_string lte_rrc_RSRQ_Range_vals[] = { + {-34, "RSRQ < -36dB"}, + {-33, "-36dB <= RSRQ < -35.5dB"}, + {-32, "-35.5dB <= RSRQ < -35dB"}, + {-31, "-35dB <= RSRQ < -34.5dB"}, + {-30, "-34.5dB <= RSRQ < -34dB"}, + {-29, "-34dB <= RSRQ < -33.5dB"}, + {-28, "-33.5dB <= RSRQ < -33dB"}, + {-27, "-33dB <= RSRQ < -32.5dB"}, + {-26, "-32.5dB <= RSRQ < -32dB"}, + {-25, "-32dB <= RSRQ < -31.5dB"}, + {-24, "-31.5dB <= RSRQ < -31dB"}, + {-23, "-31dB <= RSRQ < -30.5dB"}, + {-22, "-30.5dB <= RSRQ < -30dB"}, + {-21, "-30dB <= RSRQ < -29.5dB"}, + {-20, "-29.5dB <= RSRQ < -29dB"}, + {-19, "-29dB <= RSRQ < -28.5dB"}, + {-18, "-28.5dB <= RSRQ < -28dB"}, + {-17, "-28dB <= RSRQ < -27.5dB"}, + {-16, "-27.5dB <= RSRQ < -27dB"}, + {-15, "-27dB <= RSRQ < -26.5dB"}, + {-14, "-26.5dB <= RSRQ < -26dB"}, + {-13, "-26dB <= RSRQ < -25.5dB"}, + {-12, "-25.5dB <= RSRQ < -25dB"}, + {-11, "-25dB <= RSRQ < -24.5dB"}, + {-10, "-24.5dB <= RSRQ < -24dB"}, + { -9, "-24dB <= RSRQ < -23.5dB"}, + { -8, "-23.5dB <= RSRQ < -23dB"}, + { -7, "-23dB <= RSRQ < -22.5dB"}, + { -6, "-22.5dB <= RSRQ < -22dB"}, + { -5, "-22dB <= RSRQ < -21.5dB"}, + { -4, "-21.5dB <= RSRQ < -21dB"}, + { -3, "-21dB <= RSRQ < -20.5dB"}, + { -2, "-20.5dB <= RSRQ < -20dB"}, + { -1, "-20dB <= RSRQ < -19.5dB"}, { 0, "RSRQ < -19.5dB"}, { 1, "-19.5dB <= RSRQ < -19dB"}, { 2, "-19dB <= RSRQ < -18.5dB"}, @@ -1723,10 +1836,59 @@ static const value_string lte_rrc_RSRQ_Range_vals[] = { { 32, "-4dB <= RSRQ < -3.5dB"}, { 33, "-3.5dB <= RSRQ < -3dB"}, { 34, "-3dB <= RSRQ"}, + { 35, "-3dB <= RSRQ < -2.5dB"}, + { 36, "-2.5dB <= RSRQ < -2dB"}, + { 37, "-2dB <= RSRQ < -1.5dB"}, + { 38, "-1.5dB <= RSRQ < -1dB"}, + { 39, "-1dB <= RSRQ < -0.5dB"}, + { 40, "-0.5dB <= RSRQ < 0dB"}, + { 41, "0dB <= RSRQ < 0.5dB"}, + { 42, "0.5dB <= RSRQ < 1dB"}, + { 43, "1dB <= RSRQ < 1.5dB"}, + { 44, "1.5dB <= RSRQ < 2dB"}, + { 45, "2dB <= RSRQ < 2.5dB"}, + { 46, "2.5dB <= RSRQ"}, { 0, NULL} }; static value_string_ext lte_rrc_RSRQ_Range_vals_ext = VALUE_STRING_EXT_INIT(lte_rrc_RSRQ_Range_vals); +static const value_string lte_rrc_MBSFN_RSRQ_Range_vals[] = { + { 0, "RSRQ < -23dB"}, + { 1, "-23dB <= RSRQ < -22.5dB"}, + { 2, "-22.5dB <= RSRQ < -22dB"}, + { 3, "-22dB <= RSRQ < -21.5dB"}, + { 4, "-21.5dB <= RSRQ < -21dB"}, + { 5, "-21dB <= RSRQ < -20.5dB"}, + { 6, "-20.5dB <= RSRQ < -20dB"}, + { 7, "-20dB <= RSRQ < -19.5dB"}, + { 8, "-19.5dB <= RSRQ < -19dB"}, + { 9, "-19dB <= RSRQ < -18.5dB"}, + { 10, "-18.5dB <= RSRQ < -18dB"}, + { 11, "-18dB <= RSRQ < -17.5dB"}, + { 12, "-17.5dB <= RSRQ < -17dB"}, + { 13, "-17dB <= RSRQ < -16.5dB"}, + { 14, "-16.5dB <= RSRQ < -16dB"}, + { 15, "-16dB <= RSRQ < -15.5dB"}, + { 16, "-15.5dB <= RSRQ < -15dB"}, + { 17, "-15dB <= RSRQ < -14.5dB"}, + { 18, "-14.5dB <= RSRQ < -14dB"}, + { 19, "-14dB <= RSRQ < -13.5dB"}, + { 20, "-13.5dB <= RSRQ < -13dB"}, + { 21, "-13dB <= RSRQ < -12.5dB"}, + { 22, "-12.5dB <= RSRQ < -12dB"}, + { 23, "-12dB <= RSRQ < -11.5dB"}, + { 24, "-11.5dB <= RSRQ < -11dB"}, + { 25, "-11dB <= RSRQ < -10.5dB"}, + { 26, "-10.5dB <= RSRQ < -10dB"}, + { 27, "-10dB <= RSRQ < -9.5dB"}, + { 28, "-9.5dB <= RSRQ < -9dB"}, + { 29, "-9dB <= RSRQ < -8.5dB"}, + { 30, "-8.5dB <= RSRQ < -8dB"}, + { 31, "-8dB <= RSRQ"}, + { 0, NULL} +}; +static value_string_ext lte_rrc_MBSFN_RSRQ_Range_vals_ext = VALUE_STRING_EXT_INIT(lte_rrc_MBSFN_RSRQ_Range_vals); + static void lte_rrc_ue_RxTxTimeDiffResult_fmt(gchar *s, guint32 v) { @@ -1838,6 +2000,11 @@ static const true_false_string lte_rrc_tdd_FDD_CA_PCellDuplex_r12_bit2_val = { "FDD PCell - Not supported" }; +static const true_false_string lte_rrc_transmissionModeList_r12_val = { + "NeighCellsInfo applies", + "NeighCellsInfo does not apply" +}; + /*****************************************************************************/ /* Packet private data */ /* For this dissector, all access to actx->private_data should be made */ @@ -1845,10 +2012,10 @@ static const true_false_string lte_rrc_tdd_FDD_CA_PCellDuplex_r12_bit2_val = { /*****************************************************************************/ typedef struct meas_capabilities_item_band_mappings_t { - guint16 number_of_bands_set; - guint16 number_of_interfreq_serving_read; - guint16 number_of_interfreq_target_read; - guint16 band_by_item[256]; + guint16 number_of_bands_set; + guint16 number_of_interfreq_serving_read; + guint16 number_of_interfreq_target_read; + guint16 band_by_item[256]; } meas_capabilities_item_band_mappings_t; @@ -1856,139 +2023,139 @@ typedef struct meas_capabilities_item_band_mappings_t { /* Struct to store all current uses of packet private data */ typedef struct lte_rrc_private_data_t { - guint8 rat_type; - guint8 target_rat_type; - guint8 si_or_psi_geran; - guint8 ra_preambles; - guint16 message_identifier; - drb_mapping_t drb_mapping; - drx_config_t drx_config; - pdcp_security_info_t pdcp_security; - meas_capabilities_item_band_mappings_t meas_capabilities_item_band_mappings; + guint8 rat_type; + guint8 target_rat_type; + guint8 si_or_psi_geran; + guint8 ra_preambles; + guint16 message_identifier; + drb_mapping_t drb_mapping; + drx_config_t drx_config; + pdcp_security_info_t pdcp_security; + meas_capabilities_item_band_mappings_t meas_capabilities_item_band_mappings; } lte_rrc_private_data_t; /* Helper function to get or create a struct that will be actx->private_data */ static lte_rrc_private_data_t* lte_rrc_get_private_data(asn1_ctx_t *actx) { - if (actx->private_data != NULL) { - return (lte_rrc_private_data_t*)actx->private_data; - } - else { - lte_rrc_private_data_t* new_struct = - (lte_rrc_private_data_t*)wmem_alloc0(wmem_packet_scope(), sizeof(lte_rrc_private_data_t)); - actx->private_data = new_struct; - return new_struct; - } + if (actx->private_data != NULL) { + return (lte_rrc_private_data_t*)actx->private_data; + } + else { + lte_rrc_private_data_t* new_struct = + (lte_rrc_private_data_t*)wmem_alloc0(wmem_packet_scope(), sizeof(lte_rrc_private_data_t)); + actx->private_data = new_struct; + return new_struct; + } } /* DRX config data */ static drx_config_t* private_data_get_drx_config(asn1_ctx_t *actx) { - lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); - return &private_data->drx_config; + lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); + return &private_data->drx_config; } /* DRB mapping info */ static drb_mapping_t* private_data_get_drb_mapping(asn1_ctx_t *actx) { - lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); - return &private_data->drb_mapping; + lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); + return &private_data->drb_mapping; } /* RAT type */ static guint8 private_data_get_rat_type(asn1_ctx_t *actx) { - lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); - return private_data->rat_type; + lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); + return private_data->rat_type; } static void private_data_set_rat_type(asn1_ctx_t *actx, guint8 rat_type) { - lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); - private_data->rat_type = rat_type; + lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); + private_data->rat_type = rat_type; } /* Target RAT type */ static guint8 private_data_get_rat_target_type(asn1_ctx_t *actx) { - lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); - return private_data->target_rat_type; + lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); + return private_data->target_rat_type; } static void private_data_set_rat_target_type(asn1_ctx_t *actx, guint8 target_rat_type) { - lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); - private_data->target_rat_type = target_rat_type; + lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); + private_data->target_rat_type = target_rat_type; } /* si_or_psi_geran */ static guint8 private_data_get_si_or_psi_geran(asn1_ctx_t *actx) { - lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); - return private_data->si_or_psi_geran; + lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); + return private_data->si_or_psi_geran; } static void private_data_set_si_or_psi_geran(asn1_ctx_t *actx, guint8 si_or_psi_geran) { - lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); - private_data->si_or_psi_geran = si_or_psi_geran; + lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); + private_data->si_or_psi_geran = si_or_psi_geran; } /* Message identifier */ static guint16 private_data_get_message_identifier(asn1_ctx_t *actx) { - lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); - return private_data->message_identifier; + lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); + return private_data->message_identifier; } static void private_data_set_message_identifier(asn1_ctx_t *actx, guint16 message_identifier) { - lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); - private_data->message_identifier = message_identifier; + lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); + private_data->message_identifier = message_identifier; } /* Number of RA-preambles */ static guint8 private_data_get_ra_preambles(asn1_ctx_t *actx) { - lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); - return private_data->ra_preambles; + lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); + return private_data->ra_preambles; } static void private_data_set_ra_preambles(asn1_ctx_t *actx, guint8 ra_preambles) { - lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); - private_data->ra_preambles = ra_preambles; + lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); + private_data->ra_preambles = ra_preambles; } /* PDCP Security info */ static pdcp_security_info_t* private_data_pdcp_security_algorithms(asn1_ctx_t *actx) { - lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); - return &private_data->pdcp_security; + lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); + return &private_data->pdcp_security; } /* Measurement UE capabilities item -> band mappings */ static meas_capabilities_item_band_mappings_t* private_data_meas_capabilities_item_band_mappings(asn1_ctx_t *actx) { - lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); - return &private_data->meas_capabilities_item_band_mappings; + lte_rrc_private_data_t *private_data = (lte_rrc_private_data_t*)lte_rrc_get_private_data(actx); + return &private_data->meas_capabilities_item_band_mappings; } static void set_freq_band_indicator(guint32 value, asn1_ctx_t *actx) { - /* Store band mapping for this item in the next position */ - meas_capabilities_item_band_mappings_t *mappings = private_data_meas_capabilities_item_band_mappings(actx); - if (mappings->number_of_bands_set < 256) { - mappings->band_by_item[mappings->number_of_bands_set++] = (guint16)value; - } + /* Store band mapping for this item in the next position */ + meas_capabilities_item_band_mappings_t *mappings = private_data_meas_capabilities_item_band_mappings(actx); + if (mappings->number_of_bands_set < 256) { + mappings->band_by_item[mappings->number_of_bands_set++] = (guint16)value; + } } /*****************************************************************************/ @@ -2918,6 +3085,166 @@ void proto_register_lte_rrc(void) { { "Absolute time", "lte-rrc.absolute_time", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_lte_rrc_transmissionModeList_r12_tm1, + { "TM1", "lte-rrc.transmissionModeList_r12.tm1", + FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_transmissionModeList_r12_val), 0, + NULL, HFILL }}, + { &hf_lte_rrc_transmissionModeList_r12_tm2, + { "TM2", "lte-rrc.transmissionModeList_r12.tm2", + FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_transmissionModeList_r12_val), 0, + NULL, HFILL }}, + { &hf_lte_rrc_transmissionModeList_r12_tm3, + { "TM3", "lte-rrc.transmissionModeList_r12.tm3", + FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_transmissionModeList_r12_val), 0, + NULL, HFILL }}, + { &hf_lte_rrc_transmissionModeList_r12_tm4, + { "TM4", "lte-rrc.transmissionModeList_r12.tm4", + FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_transmissionModeList_r12_val), 0, + NULL, HFILL }}, + { &hf_lte_rrc_transmissionModeList_r12_tm6, + { "TM6", "lte-rrc.transmissionModeList_r12.tm6", + FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_transmissionModeList_r12_val), 0, + NULL, HFILL }}, + { &hf_lte_rrc_transmissionModeList_r12_tm8, + { "TM8", "lte-rrc.transmissionModeList_r12.tm8", + FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_transmissionModeList_r12_val), 0, + NULL, HFILL }}, + { &hf_lte_rrc_transmissionModeList_r12_tm9, + { "TM9", "lte-rrc.transmissionModeList_r12.tm9", + FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_transmissionModeList_r12_val), 0, + NULL, HFILL }}, + { &hf_lte_rrc_transmissionModeList_r12_tm10, + { "TM10", "lte-rrc.transmissionModeList_r12.tm10", + FT_BOOLEAN, BASE_NONE, TFS(<e_rrc_transmissionModeList_r12_val), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_0, + { "MPR/A-MPR behavior 0", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_0", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_1, + { "MPR/A-MPR behavior 1", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_1", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_2, + { "MPR/A-MPR behavior 2", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_2", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_3, + { "MPR/A-MPR behavior 3", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_3", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_4, + { "MPR/A-MPR behavior 4", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_4", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_5, + { "MPR/A-MPR behavior 5", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_5", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_6, + { "MPR/A-MPR behavior 6", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_6", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_7, + { "MPR/A-MPR behavior 7", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_7", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_8, + { "MPR/A-MPR behavior 8", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_8", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_9, + { "MPR/A-MPR behavior 9", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_9", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_10, + { "MPR/A-MPR behavior 10", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_10", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_11, + { "MPR/A-MPR behavior 11", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_11", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_12, + { "MPR/A-MPR behavior 12", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_12", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_13, + { "MPR/A-MPR behavior 13", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_13", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_14, + { "MPR/A-MPR behavior 14", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_14", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_15, + { "MPR/A-MPR behavior 15", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_15", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_16, + { "MPR/A-MPR behavior 16", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_16", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_17, + { "MPR/A-MPR behavior 17", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_17", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_18, + { "MPR/A-MPR behavior 18", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_18", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_19, + { "MPR/A-MPR behavior 19", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_19", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_20, + { "MPR/A-MPR behavior 20", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_20", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_21, + { "MPR/A-MPR behavior 21", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_21", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_22, + { "MPR/A-MPR behavior 22", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_22", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_23, + { "MPR/A-MPR behavior 23", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_23", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_24, + { "MPR/A-MPR behavior 24", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_24", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_25, + { "MPR/A-MPR behavior 25", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_25", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_26, + { "MPR/A-MPR behavior 26", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_26", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_27, + { "MPR/A-MPR behavior 27", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_27", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_28, + { "MPR/A-MPR behavior 28", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_28", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_29, + { "MPR/A-MPR behavior 29", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_29", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_30, + { "MPR/A-MPR behavior 30", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_30", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, + { &hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_31, + { "MPR/A-MPR behavior 31", "lte-rrc.modifiedMPR_Behavior_r10.mpr_ampr_31", + FT_BOOLEAN, BASE_NONE, TFS(&tfs_supported_not_supported), 0, + NULL, HFILL }}, }; /* List of subtrees */ @@ -2940,7 +3267,9 @@ void proto_register_lte_rrc(void) { &ett_lte_rrc_warningMessageSegment, &ett_lte_rrc_interBandTDD_CA_WithDifferentConfig, &ett_lte_rrc_tdd_FDD_CA_PCellDuplex_r12, - &ett_lte_rrc_sr_ConfigIndex + &ett_lte_rrc_sr_ConfigIndex, + &ett_lte_rrc_transmissionModeList_r12, + &ett_lte_rrc_modifiedMPR_Behavior_r10 }; static ei_register_info ei[] = { |