diff options
Diffstat (limited to '')
| -rw-r--r-- | epan/dissectors/asn1/nr-rrc/NR-InterNodeDefinitions.asn | 153 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nr-rrc/NR-RRC-Definitions.asn | 6229 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nr-rrc/NR-Sidelink-DiscoveryMessage.asn | 10 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nr-rrc/NR-Sidelink-Preconf.asn | 21 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nr-rrc/NR-UE-Variables.asn | 158 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nr-rrc/PC5-RRC-Definitions.asn | 227 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nr-rrc/nr-rrc.cnf | 604 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c | 491 | ||||
| -rw-r--r-- | epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.h | 2 |
9 files changed, 7165 insertions, 730 deletions
diff --git a/epan/dissectors/asn1/nr-rrc/NR-InterNodeDefinitions.asn b/epan/dissectors/asn1/nr-rrc/NR-InterNodeDefinitions.asn index 6d6cfeec..c6c6213a 100644 --- a/epan/dissectors/asn1/nr-rrc/NR-InterNodeDefinitions.asn +++ b/epan/dissectors/asn1/nr-rrc/NR-InterNodeDefinitions.asn @@ -1,12 +1,16 @@ --- 3GPP TS 38.331 V17.5.0 (2023-06) +-- 3GPP TS 38.331 V18.2.0 (2024-06) NR-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::= BEGIN IMPORTS + AffectedCarrierFreqCombList-r16, + AffectedCarrierFreqRangeCombList-r18, ARFCN-ValueNR, ARFCN-ValueEUTRA, + CandidateServingFreqListNR-r16, + CandidateServingFreqRangeListNR-r18, CellIdentity, CGI-InfoEUTRA, CGI-InfoNR, @@ -17,11 +21,14 @@ IMPORTS EUTRA-PhysCellId, FeatureSetDownlinkPerCC-Id, FeatureSetUplinkPerCC-Id, + FlightPathInfoReport-r18, FreqBandIndicatorNR, GapConfig, + IDC-TDM-Assistance-r18, maxBandComb, maxBands, maxBandsEUTRA, + maxCandidateBandIndex-r18, maxCellSFTD, maxFeatureSetsPerBand, maxFreq, @@ -35,6 +42,7 @@ IMPORTS maxNrofServingCells-1, maxNrofServingCellsEUTRA, maxNrofIndexesToReport, + maxNrofLTM-Configs-r18, maxSimultaneousBands, MBSInterestIndication-r17, MeasQuantityResults, @@ -43,15 +51,21 @@ IMPORTS MeasResultList2NR, MeasResultSCG-Failure, MeasResultServFreqListEUTRA-SCG, + MUSIM-CandidateBandList-r18, + MUSIM-CapRestriction-r18, + MUSIM-GapConfig-r17, NeedForGapsInfoNR-r16, NeedForGapNCSG-InfoNR-r17, NeedForGapNCSG-InfoEUTRA-r17, + NeedForInterruptionInfoNR-r18, OverheatingAssistance, OverheatingAssistance-r17, P-Max, PhysCellId, RadioBearerConfig, RAN-NotificationAreaInfo, + ReferenceConfiguration-r18, + ReportConfigNR, RRCReconfiguration, ServCellIndex, SetupRelease, @@ -68,7 +82,10 @@ IMPORTS RSSI-ResourceId-r16, SDT-Config-r17, SidelinkUEInformationNR-r16, + SRS-PosRRC-InactiveValidityAreaPreConfigList-r18, SRS-ResourceId, + SuccessPSCell-Config-r18, + SupportedAggBandwidth-r17, UE-RadioPagingInfo-r17 FROM NR-RRC-Definitions; @@ -104,19 +121,29 @@ CG-CandidateInfoId-r17::= SEQUENCE { -- TAG-CG-CANDIDATELIST-STOP -- TAG-HANDOVER-COMMAND-START -HandoverCommand ::= SEQUENCE { - criticalExtensions CHOICE { - c1 CHOICE{ - handoverCommand HandoverCommand-IEs, +HandoverCommand ::= SEQUENCE { + criticalExtensions CHOICE { + c1 CHOICE{ + handoverCommand HandoverCommand-IEs, spare3 NULL, spare2 NULL, spare1 NULL }, - criticalExtensionsFuture SEQUENCE {} + criticalExtensionsFuture SEQUENCE {} } } -HandoverCommand-IEs ::= SEQUENCE { - handoverCommandMessage OCTET STRING (CONTAINING RRCReconfiguration), - nonCriticalExtension SEQUENCE {} OPTIONAL +HandoverCommand-IEs ::= SEQUENCE { + handoverCommandMessage OCTET STRING (CONTAINING RRCReconfiguration), + nonCriticalExtension HandoverCommand-v1800-IEs OPTIONAL +} + +HandoverCommand-v1800-IEs ::= SEQUENCE { + candPSCellExecutionConditionInfo-r18 CandPSCellExecutionConditionInfo-r18 OPTIONAL, + nonCriticalExtension SEQUENCE {} OPTIONAL +} + +CandPSCellExecutionConditionInfo-r18 ::= SEQUENCE { + candPSCellExecCondReportConfigNR-r18 SEQUENCE (SIZE (1..2)) OF ReportConfigNR, + ... } -- TAG-HANDOVER-COMMAND-STOP @@ -153,6 +180,9 @@ AS-Config ::= SEQUENCE { ]], [[ sdt-Config-r17 SDT-Config-r17 OPTIONAL + ]], + [[ + srs-PosRRC-InactiveValidityAreaPreConfigList-r18 SRS-PosRRC-InactiveValidityAreaPreConfigList-r18 OPTIONAL ]] } @@ -182,6 +212,10 @@ AS-Context ::= SEQUENCE { needForGapNCSG-InfoNR-r17 NeedForGapNCSG-InfoNR-r17 OPTIONAL, needForGapNCSG-InfoEUTRA-r17 NeedForGapNCSG-InfoEUTRA-r17 OPTIONAL, mbsInterestIndication-r17 OCTET STRING (CONTAINING MBSInterestIndication-r17) OPTIONAL + ]], + [[ + needForInterruptionInfoNR-r18 NeedForInterruptionInfoNR-r18 OPTIONAL, + flightPathInfoReport-r18 FlightPathInfoReport-r18 OPTIONAL ]] } @@ -320,9 +354,19 @@ CG-Config-v1700-IEs ::= SEQUENCE { CG-Config-v1730-IEs ::= SEQUENCE { fr1-Carriers-SCG-r17 INTEGER (1..32) OPTIONAL, fr2-Carriers-SCG-r17 INTEGER (1..32) OPTIONAL, - nonCriticalExtension SEQUENCE {} OPTIONAL + nonCriticalExtension CG-Config-v1800-IEs OPTIONAL } +CG-Config-v1800-IEs ::= SEQUENCE { + candidateServingFreqRangeListNR-r18 CandidateServingFreqRangeListNR-r18 OPTIONAL, + candidateServingFreqListNR-r16 CandidateServingFreqListNR-r16 OPTIONAL, + idc-TDM-AssistanceConfig-r18 ENUMERATED {enabled} OPTIONAL, + candidateCellInfoListSubsequentCPC-r18 CandidateCellInfoListCPC-r17 OPTIONAL, + scpac-ReferenceConfigurationSCG-r18 ReferenceConfiguration-r18 OPTIONAL, + subsequentCPAC-Information-r18 CandidateCellInfoListCPC-r17 OPTIONAL, + successPSCell-Config-r18 SuccessPSCell-Config-r18 OPTIONAL, + nonCriticalExtension SEQUENCE {} OPTIONAL +} ServCellInfoListSCG-NR-r16 ::= SEQUENCE (SIZE (1.. maxNrofServingCells)) OF ServCellInfoXCG-NR-r16 ServCellInfoXCG-NR-r16 ::= SEQUENCE { @@ -358,6 +402,9 @@ PH-InfoSCG ::= SEQUENCE { ..., [[ twoSRS-PUSCH-Repetition-r17 ENUMERATED{enabled} OPTIONAL + ]], + [[ + twoSRS-MultipanelScheme-r18 ENUMERATED{enabled} OPTIONAL ]] } @@ -389,6 +436,15 @@ ConfigRestrictModReqSCG ::= SEQUENCE { requestedMaxInterFreqMeasIdSCG-r16 INTEGER(1..maxMeasIdentitiesMN) OPTIONAL, requestedMaxIntraFreqMeasIdSCG-r16 INTEGER(1..maxMeasIdentitiesMN) OPTIONAL, requestedToffset-r16 T-Offset-r16 OPTIONAL + ]], + [[ + reservedResourceConfigNRDC-r17 ResourceConfigNRDC-r17 OPTIONAL + ]], + [[ + aggregatedBandwidthSN-r17 AggregatedBandwidthSN-r17 OPTIONAL + ]], + [[ + requestedMaxLTM-CandidateIdSCG-r18 INTEGER(0..maxNrofLTM-Configs-r18) OPTIONAL ]] } @@ -424,6 +480,15 @@ CandidateCell-r17 ::= SEQUENCE { condExecutionCondSCG-r17 OCTET STRING (CONTAINING CondReconfigExecCondSCG-r17) OPTIONAL } +AggregatedBandwidthSN-r17 ::= SEQUENCE { + aggBW-FDD-DL-r17 SupportedAggBandwidth-r17 OPTIONAL, + aggBW-FDD-UL-r17 SupportedAggBandwidth-r17 OPTIONAL, + aggBW-TDD-DL-r17 SupportedAggBandwidth-r17 OPTIONAL, + aggBW-TDD-UL-r17 SupportedAggBandwidth-r17 OPTIONAL, + aggBW-TotalDL-r17 SupportedAggBandwidth-r17 OPTIONAL, + aggBW-TotalUL-r17 SupportedAggBandwidth-r17 OPTIONAL +} + -- TAG-CG-CONFIG-STOP -- TAG-CG-CONFIG-INFO-START @@ -541,6 +606,17 @@ CG-ConfigInfo-v1700-IEs ::= SEQUENCE { CG-ConfigInfo-v1730-IEs ::= SEQUENCE { fr1-Carriers-MCG-r17 INTEGER (1..32) OPTIONAL, fr2-Carriers-MCG-r17 INTEGER (1..32) OPTIONAL, + nonCriticalExtension CG-ConfigInfo-v1800-IEs OPTIONAL +} + +CG-ConfigInfo-v1800-IEs ::= SEQUENCE { + musim-GapConfigInfo-r18 MUSIM-GapConfig-r17 OPTIONAL, + musim-CapRestrictionInfo-r18 SEQUENCE { + musim-CapRestriction-r18 MUSIM-CapRestriction-r18 OPTIONAL, + musim-CandidateBandList-r18 MUSIM-CandidateBandList-r18 OPTIONAL + } OPTIONAL, + scpac-ReferenceConfiguration-r18 ReferenceConfiguration-r18 OPTIONAL, + subsequentCPAC-Candidates-r18 CandidateCellListCPC-r17 OPTIONAL, nonCriticalExtension SEQUENCE {} OPTIONAL } @@ -594,6 +670,15 @@ ConfigRestrictInfoSCG ::= SEQUENCE { allowedReducedConfigForOverheating-r17 OverheatingAssistance-r17 OPTIONAL, maxNumberUDC-DRB-r17 INTEGER(0..2) OPTIONAL, maxNumberCPCCandidates-r17 INTEGER(0..maxNrofCondCells-1-r17) OPTIONAL + ]], + [[ + allowedResourceConfigNRDC-r17 ResourceConfigNRDC-r17 OPTIONAL + ]], + [[ + allowedAggregatedBandwidthSNList-r17 AllowedAggregatedBandwidthSNList-r17 OPTIONAL + ]], + [[ + maxNumberLTM-CandidatesSCG-r18 INTEGER(0..maxNrofLTM-Configs-r18) OPTIONAL ]] } @@ -610,6 +695,9 @@ PH-InfoMCG ::= SEQUENCE { ..., [[ twoSRS-PUSCH-Repetition-r17 ENUMERATED{enabled} OPTIONAL + ]], + [[ + twoSRS-MultipanelScheme-r18 ENUMERATED{enabled} OPTIONAL ]] } @@ -690,6 +778,11 @@ MRDC-AssistanceInfo ::= SEQUENCE { ]], [[ overheatingAssistanceSCG-FR2-2-r17 OCTET STRING (CONTAINING OverheatingAssistance-r17) OPTIONAL + ]], + [[ + affectedCarrierFreqRangeCombList-r18 AffectedCarrierFreqRangeCombList-r18 OPTIONAL, + affectedCarrierFreqCombList-r18 AffectedCarrierFreqCombList-r16 OPTIONAL, + idc-TDM-Assistance-r18 IDC-TDM-Assistance-r18 OPTIONAL ]] } @@ -722,6 +815,18 @@ CandidateCellCPC-r17 ::= SEQUENCE { candidateCellList-r17 SEQUENCE (SIZE (1..maxNrofCondCells-r16)) OF PhysCellId } +AllowedAggregatedBandwidthSNList-r17 ::= SEQUENCE (SIZE (1..maxBandComb)) OF AllowedAggregatedBandwidth-r17 + +AllowedAggregatedBandwidth-r17 ::= SEQUENCE { + bandCombinationIndex-r17 BandCombinationIndex, + allowedAggBW-FDD-DL-r17 SupportedAggBandwidth-r17 OPTIONAL, + allowedAggBW-FDD-UL-r17 SupportedAggBandwidth-r17 OPTIONAL, + allowedAggBW-TDD-DL-r17 SupportedAggBandwidth-r17 OPTIONAL, + allowedAggBW-TDD-UL-r17 SupportedAggBandwidth-r17 OPTIONAL, + allowedAggBW-TotalDL-r17 SupportedAggBandwidth-r17 OPTIONAL, + allowedAggBW-TotalUL-r17 SupportedAggBandwidth-r17 OPTIONAL +} + -- TAG-CG-CONFIG-INFO-STOP -- TAG-MEASUREMENT-TIMING-CONFIGURATION-START @@ -806,6 +911,12 @@ UERadioPagingInformation-v1700-IEs ::= SEQUENCE { inactiveStatePO-Determination-r17 ENUMERATED {supported} OPTIONAL, numberOfRxRedCap-r17 ENUMERATED {one, two} OPTIONAL, halfDuplexFDD-TypeA-RedCap-r17 SEQUENCE (SIZE (1..maxBands)) OF FreqBandIndicatorNR OPTIONAL, + nonCriticalExtension UERadioPagingInformation-v1800-IEs OPTIONAL +} + +UERadioPagingInformation-v1800-IEs ::= SEQUENCE { + numberOfRxERedCap-r18 ENUMERATED {one, two} OPTIONAL, + supportOf2RxXR-r18 ENUMERATED {supported} OPTIONAL, nonCriticalExtension SEQUENCE {} OPTIONAL } @@ -830,6 +941,28 @@ UERadioAccessCapabilityInformation-IEs ::= SEQUENCE { } -- TAG-UE-RADIO-ACCESS-CAPABILITY-INFORMATION-STOP +-- TAG-RESOURCECONFIGNRDC-START + +ResourceConfigNRDC-r17 ::= SEQUENCE { + fr1-ResourceConfig-r17 ResourceConfigPerFR-r17 OPTIONAL, + fr2-ResourceConfig-r17 ResourceConfigPerFR-r17 OPTIONAL, + maxNumberResAcrossCC-AcrossFR-r17 INTEGER (0..256) OPTIONAL, + ... +} + +ResourceConfigPerFR-r17 ::= SEQUENCE { + bm-MaxNumberCSI-RS-Resource-r17 INTEGER (0..64) OPTIONAL, + bm-MaxNumberAperiodicCSI-RS-Resource-r17 INTEGER (0..64) OPTIONAL, + cg-MaxNumberConfigsAllCC-r17 INTEGER (0..32) OPTIONAL, + maxNumberCSI-RS-BFD-r17 INTEGER (0..64) OPTIONAL, + maxNumberCSI-RS-SSB-CBD-r17 INTEGER (0..256) OPTIONAL, + maxNumberSSB-BFD-r17 INTEGER (0..64) OPTIONAL, + sps-MaxNumberConfigsAllCC-r17 INTEGER (0..32) OPTIONAL, + trs-MaxConfResourceSetsAllCC-r17 INTEGER (0..256) OPTIONAL, + ... +} + +-- TAG-RESOURCECONFIGNRDC-STOP -- TAG-NR-MULTIPLICITY-AND-CONSTRAINTS-START maxMeasFreqsMN INTEGER ::= 32 -- Maximum number of MN-configured measurement frequencies diff --git a/epan/dissectors/asn1/nr-rrc/NR-RRC-Definitions.asn b/epan/dissectors/asn1/nr-rrc/NR-RRC-Definitions.asn index 2b9daa4f..f3b8266d 100644 --- a/epan/dissectors/asn1/nr-rrc/NR-RRC-Definitions.asn +++ b/epan/dissectors/asn1/nr-rrc/NR-RRC-Definitions.asn @@ -1,4 +1,4 @@ --- 3GPP TS 38.331 V17.5.0 (2023-06) +-- 3GPP TS 38.331 V18.2.0 (2024-06) NR-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::= @@ -91,6 +91,21 @@ MCCH-MessageType-r17 ::= CHOICE { } -- TAG-MCCH-MESSAGE-STOP +-- TAG-MULTICASTMCCH-MESSAGE-START + +MulticastMCCH-Message-r18 ::= SEQUENCE { + message MulticastMCCH-MessageType-r18 +} + +MulticastMCCH-MessageType-r18 ::= CHOICE { + c1 CHOICE { + mbsMulticastConfiguration-r18 MBSMulticastConfiguration-r18, + spare1 NULL + }, + messageClassExtension SEQUENCE {} +} + +-- TAG-MULTICASTMCCH-MESSAGE-STOP -- TAG-PCCH-PCH-MESSAGE-START PCCH-Message ::= SEQUENCE { @@ -180,7 +195,7 @@ UL-DCCH-MessageType ::= CHOICE { mbsInterestIndication-r17 MBSInterestIndication-r17, uePositioningAssistanceInfo-r17 UEPositioningAssistanceInfo-r17, measurementReportAppLayer-r17 MeasurementReportAppLayer-r17, - spare6 NULL, spare5 NULL, spare4 NULL, spare3 NULL, spare2 NULL, spare1 NULL + indirectPathFailureInformation-r18 IndirectPathFailureInformation-r18, spare5 NULL, spare4 NULL, spare3 NULL, spare2 NULL, spare1 NULL }, messageClassExtensionFuture-r16 SEQUENCE {} } @@ -258,7 +273,7 @@ DedicatedSIBRequest-r16-IEs ::= SEQUENCE { nonCriticalExtension SEQUENCE {} OPTIONAL } -SIB-ReqInfo-r16 ::= ENUMERATED { sib12, sib13, sib14, sib20-v1700, sib21-v1700, spare3, spare2, spare1 } +SIB-ReqInfo-r16 ::= ENUMERATED { sib12, sib13, sib14, sib20-v1700, sib21-v1700, sib23-v1810, spare2, spare1 } PosSIB-ReqInfo-r16 ::= SEQUENCE { gnss-id-r16 GNSS-ID-r16 OPTIONAL, @@ -271,7 +286,10 @@ PosSIB-ReqInfo-r16 ::= SEQUENCE { posSibType2-21, posSibType2-22, posSibType2-23, posSibType3-1, posSibType4-1, posSibType5-1, posSibType6-1, posSibType6-2, posSibType6-3,..., posSibType1-9-v1710, posSibType1-10-v1710, posSibType2-24-v1710, posSibType2-25-v1710, - posSibType6-4-v1710, posSibType6-5-v1710, posSibType6-6-v1710 } + posSibType6-4-v1710, posSibType6-5-v1710, posSibType6-6-v1710, posSibType2-17a-v1770, + posSibType2-18a-v1770, posSibType2-20a-v1770, posSibType1-11-v1800, posSibType1-12-v1800, + posSibType2-26-v1800, posSibType2-27-v1800, posSibType6-7-v1800, posSibType7-1-v1800, + posSibType7-2-v1800, posSibType7-3-v1800, posSibType7-4-v1800 } } -- TAG-DEDICATEDSIBREQUEST-STOP @@ -320,6 +338,15 @@ DLInformationTransfer-v1700-IEs ::= SEQUENCE { rxTxTimeDiff-gNB-r17 RxTxTimeDiff-r17 OPTIONAL, -- Need N ta-PDC-r17 ENUMERATED {activate,deactivate} OPTIONAL, -- Need N sib9Fallback-r17 ENUMERATED {true} OPTIONAL, -- Need N + nonCriticalExtension DLInformationTransfer-v1800-IEs OPTIONAL +} + +DLInformationTransfer-v1800-IEs ::= SEQUENCE { + eventID-TSS-r18 INTEGER(0..63) OPTIONAL, -- Cond ClockQualityDetailsLevel + clockQualityDetailsLevel-r18 CHOICE { + clockQualityMetrics-r18 ClockQualityMetrics-r18, + clockQualityAcceptanceStatus-r18 ENUMERATED {acceptable, notAcceptable} + } OPTIONAL, -- Need N nonCriticalExtension SEQUENCE {} OPTIONAL } @@ -378,7 +405,7 @@ FailureInfoDAPS-r16 ::= SEQUENCE { -- TAG-IABOTHERINFORMATION-START IABOtherInformation-r16 ::= SEQUENCE { - rrc-TransactionIdentifier RRC-TransactionIdentifier, + dummy RRC-TransactionIdentifier, criticalExtensions CHOICE { iabOtherInformation-r16 IABOtherInformation-r16-IEs, criticalExtensionsFuture SEQUENCE {} @@ -440,6 +467,33 @@ IAB-IP-PrefixAndTraffic-r16 ::= SEQUENCE { } -- TAG-IABOTHERINFORMATION-STOP +-- TAG-INDIRECTPATHFAILUREINFORMATION-START + +IndirectPathFailureInformation-r18 ::= SEQUENCE { + criticalExtensions CHOICE { + indirectPathFailureInformation-r18 IndirectPathFailureInformation-r18-IEs, + criticalExtensionsFuture SEQUENCE {} + } +} + +IndirectPathFailureInformation-r18-IEs ::= SEQUENCE { + failureReportIndirectPath-r18 FailureReportIndirectPath-r18 OPTIONAL, + lateNonCriticalExtension OCTET STRING OPTIONAL, + nonCriticalExtension SEQUENCE {} OPTIONAL +} + +FailureReportIndirectPath-r18 ::= SEQUENCE { + failureTypeIndirectPath-r18 ENUMERATED {t421-Expiry,sl-Failure,n3c-Failure, relayUE-Uu-RLF, + relayUE-Uu-RRC-Failure, + indirectPathAddChangeFailure, sl-PC5-Release, spare1} OPTIONAL, + sl-MeasResultServingRelay-r18 OCTET STRING OPTIONAL, + -- Contains PC5 SL-MeasResultRelay-r17 + sl-MeasResultsCandRelay-r18 OCTET STRING OPTIONAL, + n3c-RelayUE-InfoList-r18 SEQUENCE (SIZE (0..8)) OF N3C-RelayUE-Info-r18 OPTIONAL, + ... +} + +-- TAG-INDIRECTPATHFAILUREINFORMATION-STOP -- TAG-LOCATIONMEASUREMENTINDICATION-START LocationMeasurementIndication ::= SEQUENCE { @@ -488,7 +542,12 @@ LoggedMeasurementConfiguration-r16-IEs ::= SEQUENCE { LoggedMeasurementConfiguration-v1700-IEs ::= SEQUENCE { sigLoggedMeasType-r17 ENUMERATED {true} OPTIONAL, -- Need R earlyMeasIndication-r17 ENUMERATED {true} OPTIONAL, -- Need R - areaConfiguration-v1700 AreaConfiguration-v1700 OPTIONAL, --Need R + areaConfiguration-r17 AreaConfiguration-r17 OPTIONAL, --Need R + nonCriticalExtension LoggedMeasurementConfiguration-v1800-IEs OPTIONAL +} + +LoggedMeasurementConfiguration-v1800-IEs ::= SEQUENCE { + areaConfiguration-v1800 AreaConfiguration-v1800 OPTIONAL, --Need R nonCriticalExtension SEQUENCE {} OPTIONAL } @@ -548,10 +607,46 @@ MBSInterestIndication-r17-IEs ::= SEQUENCE { mbs-Priority-r17 ENUMERATED {true} OPTIONAL, mbs-ServiceList-r17 MBS-ServiceList-r17 OPTIONAL, lateNonCriticalExtension OCTET STRING OPTIONAL, + nonCriticalExtension MBSInterestIndication-v1800 OPTIONAL +} + +MBSInterestIndication-v1800 ::= SEQUENCE { + mbs-NonServingInfoList-r18 MBS-NonServingInfoList-r18 OPTIONAL, nonCriticalExtension SEQUENCE {} OPTIONAL } -- TAG-MBSINTERESTINDICATION-STOP +-- TAG-MBSMULTICASTCONFIGURATION-START + +MBSMulticastConfiguration-r18 ::= SEQUENCE { + criticalExtensions CHOICE { + mbsMulticastConfiguration-r18 MBSMulticastConfiguration-r18-IEs, + criticalExtensionsFuture SEQUENCE {} + } +} + +-- WS modification: define a dedicated type +ThresholdMBS-List-r18 ::= SEQUENCE (SIZE (1..maxNrofThresholdMBS-r18)) OF ThresholdMBS-r18 + +MBSMulticastConfiguration-r18-IEs ::= SEQUENCE { + mbs-SessionInfoListMulticast-r18 MBS-SessionInfoListMulticast-r18 OPTIONAL, -- Need R + mbs-NeighbourCellList-r18 MBS-NeighbourCellList-r17 OPTIONAL, -- Need S + drx-ConfigPTM-List-r18 SEQUENCE (SIZE (1..maxNrofDRX-ConfigPTM-r17)) OF DRX-ConfigPTM-r17 OPTIONAL, -- Need R + pdsch-ConfigMTCH-r18 PDSCH-ConfigBroadcast-r17 OPTIONAL, -- Need S + mtch-SSB-MappingWindowList-r18 MTCH-SSB-MappingWindowList-r17 OPTIONAL, -- Need R +-- WS modification: define a dedicated type +-- thresholdMBS-List-r18 SEQUENCE (SIZE (1..maxNrofThresholdMBS-r18)) OF ThresholdMBS-r18 OPTIONAL, Need R + thresholdMBS-List-r18 ThresholdMBS-List-r18 OPTIONAL, -- Need R + lateNonCriticalExtension OCTET STRING OPTIONAL, + nonCriticalExtension SEQUENCE {} OPTIONAL +} + +ThresholdMBS-r18 ::= SEQUENCE { + rsrp-r18 RSRP-Range OPTIONAL, -- Need R + rsrq-r18 RSRQ-Range OPTIONAL -- Need R +} + +-- TAG-MBSMULTICASTCONFIGURATION-STOP -- TAG-MCGFAILUREINFORMATION-START MCGFailureInformation-r16 ::= SEQUENCE { @@ -618,27 +713,45 @@ MeasurementReportAppLayer-r17 ::= SEQUENCE { MeasurementReportAppLayer-r17-IEs ::= SEQUENCE { measurementReportAppLayerList-r17 MeasurementReportAppLayerList-r17, lateNonCriticalExtension OCTET STRING OPTIONAL, + nonCriticalExtension MeasurementReportAppLayer-v1800-IEs OPTIONAL +} + +MeasurementReportAppLayer-v1800-IEs ::= SEQUENCE { + measurementReportAppLayerList-v1800 MeasurementReportAppLayerList-v1800 OPTIONAL, nonCriticalExtension SEQUENCE{} OPTIONAL } MeasurementReportAppLayerList-r17 ::= SEQUENCE (SIZE (1..maxNrofAppLayerMeas-r17)) OF MeasReportAppLayer-r17 -MeasReportAppLayer-r17 ::= SEQUENCE { +MeasurementReportAppLayerList-v1800 ::= SEQUENCE (SIZE (1..maxNrofAppLayerMeas-r17)) OF MeasReportAppLayer-v1800 + +MeasReportAppLayer-r17 ::= SEQUENCE { measConfigAppLayerId-r17 MeasConfigAppLayerId-r17, measReportAppLayerContainer-r17 OCTET STRING OPTIONAL, appLayerSessionStatus-r17 ENUMERATED {start, stop} OPTIONAL, ran-VisibleMeasurements-r17 RAN-VisibleMeasurements-r17 OPTIONAL } +MeasReportAppLayer-v1800 ::= SEQUENCE { + appLayerIdleInactiveConfig-r18 AppLayerIdleInactiveConfig-r18 OPTIONAL, + measReportAppLayerContainerList-r18 SEQUENCE (SIZE (1..maxNrofAppLayerReports-r18)) OF OCTET STRING OPTIONAL, + ... +} + RAN-VisibleMeasurements-r17 ::= SEQUENCE { appLayerBufferLevelList-r17 SEQUENCE (SIZE (1..8)) OF AppLayerBufferLevel-r17 OPTIONAL, playoutDelayForMediaStartup-r17 INTEGER (0..30000) OPTIONAL, pdu-SessionIdList-r17 SEQUENCE (SIZE (1..maxNrofPDU-Sessions-r17)) OF PDU-SessionID OPTIONAL, - ... + ..., + [[ + pdu-SessionIdListExt-v1800 SEQUENCE (SIZE (1..maxNrofPDU-Sessions-r17)) OF QFI-List-r18 OPTIONAL + ]] } AppLayerBufferLevel-r17 ::= INTEGER (0..30000) +QFI-List-r18 ::= SEQUENCE (SIZE (1..maxNrofQFIs)) OF QFI + -- TAG-MEASUREMENTREPORTAPPLAYER-STOP -- TAG-MIB-START @@ -689,6 +802,12 @@ Paging ::= SEQUENCE { Paging-v1700-IEs ::= SEQUENCE { pagingRecordList-v1700 PagingRecordList-v1700 OPTIONAL, -- Need N pagingGroupList-r17 PagingGroupList-r17 OPTIONAL, -- Need N + nonCriticalExtension Paging-v1800-IEs OPTIONAL +} + +Paging-v1800-IEs ::= SEQUENCE { + pagingRecordList-v1800 PagingRecordList-v1800 OPTIONAL, -- Need N + pagingGroupList-v1800 PagingGroupList-v1800 OPTIONAL, -- Need N nonCriticalExtension SEQUENCE {} OPTIONAL } @@ -698,6 +817,10 @@ PagingRecordList-v1700 ::= SEQUENCE (SIZE(1..maxNrofPageRec)) OF Paging PagingGroupList-r17 ::= SEQUENCE (SIZE(1..maxNrofPageGroup-r17)) OF TMGI-r17 +PagingRecordList-v1800 ::= SEQUENCE (SIZE(1..maxNrofPageRec)) OF PagingRecord-v1800 + +PagingGroupList-v1800 ::= SEQUENCE (SIZE(1..maxNrofPageGroup-r17)) OF GroupPaging-r18 + PagingRecord ::= SEQUENCE { ue-Identity PagingUE-Identity, accessType ENUMERATED {non3GPP} OPTIONAL, -- Need N @@ -708,12 +831,20 @@ PagingRecord-v1700 ::= SEQUENCE { pagingCause-r17 ENUMERATED {voice} OPTIONAL -- Need N } +PagingRecord-v1800 ::= SEQUENCE { + mt-SDT ENUMERATED {true} OPTIONAL -- Need N +} + PagingUE-Identity ::= CHOICE { ng-5G-S-TMSI NG-5G-S-TMSI, fullI-RNTI I-RNTI-Value, ... } +GroupPaging-r18 ::= SEQUENCE { + inactiveReceptionAllowed-r18 ENUMERATED {true} OPTIONAL -- Need N +} + -- TAG-PAGING-STOP -- TAG-RRCREESTABLISHMENT-START @@ -753,8 +884,15 @@ RRCReestablishmentComplete-IEs ::= SEQUENCE { } RRCReestablishmentComplete-v1610-IEs ::= SEQUENCE { - ue-MeasurementsAvailable-r16 UE-MeasurementsAvailable-r16 OPTIONAL, - nonCriticalExtension SEQUENCE {} OPTIONAL + ue-MeasurementsAvailable-r16 UE-MeasurementsAvailable-r16 OPTIONAL, + nonCriticalExtension RRCReestablishmentComplete-v1800-IEs OPTIONAL +} + +RRCReestablishmentComplete-v1800-IEs ::= SEQUENCE { + flightPathInfoAvailable-r18 ENUMERATED {true} OPTIONAL, + measConfigReportAppLayerAvailable-r18 ENUMERATED {true} OPTIONAL, + musim-CapRestrictionInd-r18 ENUMERATED {true} OPTIONAL, + nonCriticalExtension SEQUENCE {} OPTIONAL } -- TAG-RRCREESTABLISHMENTCOMPLETE-STOP @@ -847,8 +985,20 @@ RRCReconfiguration-v1700-IEs ::= SEQUENCE { ul-GapFR2-Config-r17 CHOICE {release NULL, setup UL-GapFR2-Config-r17 } OPTIONAL, -- Need M scg-State-r17 ENUMERATED { deactivated } OPTIONAL, -- Need N appLayerMeasConfig-r17 AppLayerMeasConfig-r17 OPTIONAL, -- Need M - ue-TxTEG-RequestUL-TDOA-Config-r17 CHOICE {release NULL, setup UE-TxTEG-RequestUL-TDOA-Config-r17} OPTIONAL, -- Need M - nonCriticalExtension SEQUENCE {} OPTIONAL + ue-TxTEG-RequestUL-TDOA-Config-r17 CHOICE {release NULL, setup UE-TxTEG-RequestUL-TDOA-Config-r17} OPTIONAL, -- Need M + nonCriticalExtension RRCReconfiguration-v1800-IEs OPTIONAL +} + +RRCReconfiguration-v1800-IEs ::= SEQUENCE { + needForInterruptionConfigNR-r18 ENUMERATED { disabled, enabled } OPTIONAL, -- Need M + aerial-Config-r18 CHOICE {release NULL, setup Aerial-Config-r18 } OPTIONAL, -- Need M + sl-IndirectPathAddChange-r18 CHOICE {release NULL, setup SL-IndirectPathAddChange-r18 } OPTIONAL, -- Need M + n3c-IndirectPathAddChange-r18 CHOICE {release NULL, setup N3C-IndirectPathAddChange-r18 } OPTIONAL, -- Need M + n3c-IndirectPathConfigRelay-r18 CHOICE {release NULL, setup N3C-IndirectPathConfigRelay-r18 } OPTIONAL, -- Need M + otherConfig-v1800 OtherConfig-v1800 OPTIONAL, -- Need M + srs-PosResourceSetAggBW-CombinationList-r18 CHOICE {release NULL, setup SRS-PosResourceSetAggBW-CombinationList-r18 } OPTIONAL, -- Need M + ltm-Config-r18 CHOICE {release NULL, setup LTM-Config-r18} OPTIONAL, -- Need M + nonCriticalExtension SEQUENCE {} OPTIONAL } MRDC-SecondaryCellGroupConfig ::= SEQUENCE { @@ -906,6 +1056,11 @@ UE-TxTEG-RequestUL-TDOA-Config-r17 ::= CHOICE { oneShot-r17 NULL, periodicReporting-r17 ENUMERATED { ms160, ms320, ms1280, ms2560, ms61440, ms81920, ms368640, ms737280 } } + +SRS-PosResourceSetAggBW-CombinationList-r18 ::= SEQUENCE (SIZE(1.. maxNrOfLinkedSRS-PosResSetComb-r18)) OF SRS-PosResourceSetLinkedForAggBW-List-r18 + +SRS-PosResourceSetLinkedForAggBW-List-r18 ::= SEQUENCE (SIZE(2..maxNrOfLinkedSRS-PosResourceSet-r18)) OF SRS-PosResourceSetLinkedForAggBW-r18 + -- TAG-RRCRECONFIGURATION-STOP -- TAG-RRCRECONFIGURATIONCOMPLETE-START @@ -955,6 +1110,16 @@ RRCReconfigurationComplete-v1700-IEs ::= SEQUENCE { RRCReconfigurationComplete-v1720-IEs ::= SEQUENCE { uplinkTxDirectCurrentMoreCarrierList-r17 UplinkTxDirectCurrentMoreCarrierList-r17 OPTIONAL, + nonCriticalExtension RRCReconfigurationComplete-v1800-IEs OPTIONAL +} + +RRCReconfigurationComplete-v1800-IEs ::= SEQUENCE { + needForInterruptionInfoNR-r18 NeedForInterruptionInfoNR-r18 OPTIONAL, + flightPathInfoAvailable-r18 ENUMERATED {true} OPTIONAL, + selectedPSCellForCHO-WithSCG-r18 SelectedPSCellForCHO-WithSCG-r18 OPTIONAL, + selectedSK-Counter-r18 SK-Counter OPTIONAL, + measConfigReportAppLayerAvailable-r18 ENUMERATED {true} OPTIONAL, + appliedLTM-CandidateId-r18 LTM-CandidateId-r18 OPTIONAL, nonCriticalExtension SEQUENCE {} OPTIONAL } @@ -1052,6 +1217,12 @@ SuspendConfig ::= SEQUENCE { ]], [[ ncd-SSB-RedCapInitialBWP-SDT-r17 CHOICE {release NULL, setup NonCellDefiningSSB-r17} OPTIONAL -- Need M + ]], + [[ + resumeIndication-r18 ENUMERATED {true} OPTIONAL, -- Need N + srs-PosRRC-InactiveEnhanced-r18 CHOICE {release NULL, setup SRS-PosRRC-InactiveEnhanced-r18 } OPTIONAL, -- Need M + ran-ExtendedPagingCycleConfig-r18 ExtendedPagingCycleConfig-r18 OPTIONAL, -- Cond RANPaging + multicastConfigInactive-r18 CHOICE {release NULL, setup MulticastConfigInactive-r18 } OPTIONAL -- Need M ]] } @@ -1069,8 +1240,6 @@ CellReselectionPriorities ::= SEQUENCE { PagingCycle ::= ENUMERATED {rf32, rf64, rf128, rf256} -ExtendedPagingCycle-r17 ::= ENUMERATED {rf256, rf512, rf1024, spare1} - FreqPriorityListEUTRA ::= SEQUENCE (SIZE (1..maxFreq)) OF FreqPriorityEUTRA FreqPriorityListNR ::= SEQUENCE (SIZE (1..maxFreq)) OF FreqPriorityNR @@ -1128,11 +1297,19 @@ SDT-MAC-PHY-CG-Config-r17 ::= SEQUENCE { cg-SDT-ConfigInitialBWP-NUL-r17 CHOICE {release NULL, setup BWP-UplinkDedicatedSDT-r17} OPTIONAL, -- Need M cg-SDT-ConfigInitialBWP-SUL-r17 CHOICE {release NULL, setup BWP-UplinkDedicatedSDT-r17} OPTIONAL, -- Need M cg-SDT-ConfigInitialBWP-DL-r17 BWP-DownlinkDedicatedSDT-r17 OPTIONAL, -- Need M - cg-SDT-TimeAlignmentTimer-r17 TimeAlignmentTimer OPTIONAL, -- Need M - cg-SDT-RSRP-ThresholdSSB-r17 RSRP-Range OPTIONAL, -- Need M - cg-SDT-TA-ValidationConfig-r17 CHOICE {release NULL, setup CG-SDT-TA-ValidationConfig-r17 } OPTIONAL, -- Need M - cg-SDT-CS-RNTI-r17 RNTI-Value OPTIONAL, -- Need M - ... + cg-SDT-TimeAlignmentTimer-r17 TimeAlignmentTimer OPTIONAL, -- Need M + cg-SDT-RSRP-ThresholdSSB-r17 RSRP-Range OPTIONAL, -- Need M + cg-SDT-TA-ValidationConfig-r17 CHOICE {release NULL, setup CG-SDT-TA-ValidationConfig-r17 } OPTIONAL, -- Need M + cg-SDT-CS-RNTI-r17 RNTI-Value OPTIONAL, -- Need M + ..., + [[ + cg-SDT-ConfigLCH-RestrictionToAddModListExt-v1800 SEQUENCE (SIZE(1..maxLC-ID)) OF CG-SDT-ConfigLCH-Restriction-v1800 + OPTIONAL, -- Need N + cg-MT-SDT-MaxDurationToNextCG-Occasion-r18 ENUMERATED { + ms10, ms100, sec1, sec10, sec60, sec100, sec300, sec600, + sec1200, sec1800, sec3600, + spare5, spare4, spare3, spare2, spare1} OPTIONAL -- Need R + ]] } CG-SDT-TA-ValidationConfig-r17 ::= SEQUENCE { @@ -1160,6 +1337,13 @@ CG-SDT-ConfigLCH-Restriction-r17 ::= SEQUENCE { OPTIONAL -- Need R } +CG-SDT-ConfigLCH-Restriction-v1800 ::= SEQUENCE { + cg-SDT-MaxDurationToNextCG-Occasion-r18 ENUMERATED { + ms10, ms100, sec1, sec10, sec60, sec100, sec300, sec600, + sec1200, sec1800, sec3600, + spare5, spare4, spare3, spare2, spare1} OPTIONAL -- Need R +} + SRS-PosRRC-Inactive-r17 ::= OCTET STRING (CONTAINING SRS-PosRRC-InactiveConfig-r17) SRS-PosRRC-InactiveConfig-r17 ::= SEQUENCE { @@ -1180,6 +1364,56 @@ SRS-PosConfig-r17 ::= SEQUENCE { srs-PosResourceToAddModList-r17 SEQUENCE (SIZE(1..maxNrofSRS-PosResources-r16)) OF SRS-PosResource-r16 OPTIONAL -- Need N } +SRS-PosRRC-InactiveEnhanced-r18 ::= OCTET STRING (CONTAINING SRS-PosRRC-InactiveEnhancedConfig-r18) + +SRS-PosRRC-InactiveEnhancedConfig-r18 ::= SEQUENCE { + srs-PosRRC-AggBW-InactiveConfigList-r18 CHOICE {release NULL, setup SRS-PosRRC-AggBW-InactiveConfigList-r18 } OPTIONAL, -- Need M + srs-PosTx-Hopping-r18 CHOICE {release NULL, setup SRS-PosTx-Hopping-r18 } OPTIONAL, -- Need M + srs-PosRRC-InactiveValidityAreaPreConfigList-r18 CHOICE {release NULL, setup SRS-PosRRC-InactiveValidityAreaPreConfigList-r18 } OPTIONAL, -- Need M + srs-PosRRC-InactiveValidityAreaNonPreConfig-r18 CHOICE {release NULL, setup SRS-PosRRC-InactiveValidityAreaConfig-r18 } OPTIONAL, -- Need M + ... +} + +SRS-PosRRC-InactiveValidityAreaPreConfigList-r18 ::= SEQUENCE (SIZE(1..maxNrOfVA-r18)) OF SRS-PosRRC-InactiveValidityAreaConfig-r18 + +SRS-PosRRC-InactiveValidityAreaConfig-r18 ::= SEQUENCE { + srs-PosConfigValidityArea-r18 SEQUENCE (SIZE(1..maxNrOfCellsInVA-r18)) OF CellIdentity, + srs-PosConfigNUL-r18 SRS-PosConfig-r17 OPTIONAL, -- Need R + srs-PosConfigSUL-r18 SRS-PosConfig-r17 OPTIONAL, -- Need R + bwp-NUL-r18 BWP OPTIONAL, -- Need S + bwp-SUL-r18 BWP OPTIONAL, -- Need S + areaValidityTA-Config-r18 AreaValidityTA-Config-r18 OPTIONAL, -- Need R + ... +} + +AreaValidityTA-Config-r18 ::= SEQUENCE { + inactivePosSRS-ValidityAreaTAT-r18 ENUMERATED {ms1280, ms1920, ms2560, ms5120, ms10240, ms20480, ms40960, infinity}, + inactivePosSRS-ValidityAreaRSRP-r18 RSRP-ChangeThreshold-r17 OPTIONAL, -- Need R + autonomousTA-AdjustmentEnabled-r18 ENUMERATED {true} OPTIONAL -- Need R +} + +SRS-PosRRC-AggBW-InactiveConfigList-r18 ::= SEQUENCE (SIZE(1..maxNrOfLinkedSRS-PosResSetCombInactive-r18)) OF + SRS-InactivePosResourceSetLinkedForAggBW-List-r18 + +SRS-InactivePosResourceSetLinkedForAggBW-List-r18 ::= SEQUENCE (SIZE (2..maxNrOfLinkedSRS-PosResourceSet-r18)) OF + SRS-PosResourceSetLinkedForAggBW-r18 + +ExtendedPagingCycle-r17 ::= ENUMERATED {rf256, rf512, rf1024, spare1} + +ExtendedPagingCycleConfig-r18 ::= SEQUENCE { + extendedPagingCycle-r18 ENUMERATED {hf2, hf4, hf8, hf16, hf32, hf64, hf128,hf256, hf512, hf1024, + spare6, spare5, spare4, spare3, spare2, spare1}, + pagingPTWLength-r18 ENUMERATED {ms1280, ms2560, ms3840, ms5120, ms6400, ms7680, ms8960, ms10240, ms11520, + ms12800, ms14080, ms15360, ms16640, ms17920, ms19200, ms20480, ms21760, + ms23040, ms24320, ms25600, ms26880, ms28160, ms29440, ms30720, ms32000, + ms33280, ms34560, ms35840, ms37120, ms38400, ms39680, ms40960} +} + +MulticastConfigInactive-r18::= SEQUENCE { + inactivePTM-Config-r18 OCTET STRING (CONTAINING MBSMulticastConfiguration-r18) OPTIONAL, -- Need S + inactiveMCCH-Config-r18 OCTET STRING (CONTAINING SystemInformation) OPTIONAL -- Need N +} + -- TAG-RRCRELEASE-STOP -- TAG-RRCRESUME-START @@ -1225,6 +1459,13 @@ RRCResume-v1700-IEs ::= SEQUENCE { needForGapNCSG-ConfigEUTRA-r17 CHOICE {release NULL, setup NeedForGapNCSG-ConfigEUTRA-r17} OPTIONAL, -- Need M scg-State-r17 ENUMERATED {deactivated} OPTIONAL, -- Need N appLayerMeasConfig-r17 AppLayerMeasConfig-r17 OPTIONAL, -- Need M + nonCriticalExtension RRCResume-v1800-IEs OPTIONAL +} + +RRCResume-v1800-IEs ::= SEQUENCE { + needForInterruptionConfigNR-r18 ENUMERATED { disabled, enabled } OPTIONAL, -- Need M + reselectionMeasurementReq-r18 ENUMERATED { true } OPTIONAL, -- Need N + validatedMeasurementsReq-r18 ENUMERATED { true } OPTIONAL, -- Need N nonCriticalExtension SEQUENCE {} OPTIONAL } @@ -1275,7 +1516,17 @@ RRCResumeComplete-v1700-IEs ::= SEQUENCE { RRCResumeComplete-v1720-IEs ::= SEQUENCE { uplinkTxDirectCurrentMoreCarrierList-r17 UplinkTxDirectCurrentMoreCarrierList-r17 OPTIONAL, - nonCriticalExtension SEQUENCE {} OPTIONAL + nonCriticalExtension RRCResumeComplete-v1800-IEs OPTIONAL +} + +RRCResumeComplete-v1800-IEs ::= SEQUENCE { + needForInterruptionInfoNR-r18 NeedForInterruptionInfoNR-r18 OPTIONAL, + musim-CapRestrictionInd-r18 ENUMERATED {true} OPTIONAL, + flightPathInfoAvailable-r18 ENUMERATED {true} OPTIONAL, + measConfigReportAppLayerAvailable-r18 ENUMERATED {true} OPTIONAL, + measResultReselectionNR-r18 MeasResultIdleNR-r16 OPTIONAL, + reselectionMeasAvailable-r18 ENUMERATED {true} OPTIONAL, + nonCriticalExtension SEQUENCE {} OPTIONAL } -- TAG-RRCRESUMECOMPLETE-STOP @@ -1371,6 +1622,16 @@ RRCSetupComplete-v1690-IEs ::= SEQUENCE { RRCSetupComplete-v1700-IEs ::= SEQUENCE { onboardingRequest-r17 ENUMERATED {true} OPTIONAL, + nonCriticalExtension RRCSetupComplete-v1800-IEs OPTIONAL +} + +RRCSetupComplete-v1800-IEs ::= SEQUENCE { + ncr-NodeIndication-r18 ENUMERATED {true} OPTIONAL, + musim-CapRestrictionInd-r18 ENUMERATED {true} OPTIONAL, + flightPathInfoAvailable-r18 ENUMERATED {true} OPTIONAL, + measConfigReportAppLayerAvailable-r18 ENUMERATED {true} OPTIONAL, + mobileIAB-NodeIndication-r18 ENUMERATED {true} OPTIONAL, + reselectionMeasAvailable-r18 ENUMERATED {true} OPTIONAL, nonCriticalExtension SEQUENCE{} OPTIONAL } @@ -1636,6 +1897,34 @@ SIB1-v1700-IEs ::= SEQUENCE { SIB1-v1740-IEs ::= SEQUENCE { si-SchedulingInfo-v1740 SI-SchedulingInfo-v1740 OPTIONAL, -- Need R + nonCriticalExtension SIB1-v1800-IEs OPTIONAL +} + +SIB1-v1800-IEs ::= SEQUENCE { + ncr-Support-r18 ENUMERATED {true} OPTIONAL, -- Need S + mt-SDT-ConfigCommonSIB-r18 MT-SDT-ConfigCommonSIB-r18 OPTIONAL, -- Need R + musim-CapRestrictionAllowed-r18 ENUMERATED {true} OPTIONAL, -- Need R + featurePriorities-v1800 SEQUENCE { + msg1-Repetitions-Priority-r18 FeaturePriority-r17 OPTIONAL, -- Need R + eRedCapPriority-r18 FeaturePriority-r17 OPTIONAL -- Need R + } OPTIONAL, -- Need R + si-SchedulingInfo-v1800 SI-SchedulingInfo-v1800 OPTIONAL, -- Need R + cellBarredATG-r18 ENUMERATED {barred, notBarred} OPTIONAL, -- Need S + cellBarredNES-r18 ENUMERATED {notBarred} OPTIONAL, -- Need R + mobileIAB-Cell-r18 ENUMERATED {true} OPTIONAL, -- Need R + eDRX-AllowedInactive-r18 ENUMERATED {true} OPTIONAL, -- Cond EDRX-RC + intraFreqReselection-eRedCap-r18 ENUMERATED {allowed, notAllowed} OPTIONAL, -- Need S + nonServingCellMII-r18 ENUMERATED {true} OPTIONAL, -- Need R + sdt-BeamFailureRecoveryProhibitTimer-r18 ENUMERATED {ms50, ms100, ms200, ms500, ms1000, ms1500, ms2000, ms3000} + OPTIONAL, -- Need R + eRedCap-ConfigCommon-r18 ERedCap-ConfigCommonSIB-r18 OPTIONAL, -- Need R + cellBarredFixedVSAT-r18 ENUMERATED {barred, notBarred} OPTIONAL, -- Cond NTN + cellBarredMobileVSAT-r18 ENUMERATED {barred, notBarred} OPTIONAL, -- Cond NTN + reselectionMeasurementsNR-r18 ENUMERATED{true} OPTIONAL, -- Need R + cellBarred2RxXR-r18 ENUMERATED {barred} OPTIONAL, -- Need R + intraFreqReselection2RxXR-r18 ENUMERATED {allowed, notAllowed} OPTIONAL, -- Need R + barringExemptEmergencyCall-r18 ENUMERATED {true} OPTIONAL, -- Cond EM-Barring + n3c-Support-r18 ENUMERATED {true} OPTIONAL, -- Need R nonCriticalExtension SEQUENCE {} OPTIONAL } @@ -1661,8 +1950,23 @@ RedCap-ConfigCommonSIB-r17 ::= SEQUENCE { ... } +ERedCap-ConfigCommonSIB-r18 ::= SEQUENCE { + cellBarredeRedCap-r18 SEQUENCE { + cellBarredeRedCap1Rx-r18 ENUMERATED {barred, notBarred}, + cellBarredeRedCap2Rx-r18 ENUMERATED {barred, notBarred} + } +} + FeaturePriority-r17 ::= INTEGER (0..7) +MT-SDT-ConfigCommonSIB-r18 ::= SEQUENCE { + mt-SDT-RSRP-Threshold-r18 RSRP-Range OPTIONAL, -- Need S + sdt-LogicalChannelSR-DelayTimer-r18 ENUMERATED { sf20, sf40, sf64, sf128, sf512, sf1024, sf2560, spare1} OPTIONAL, -- Cond MT-SDT1 + t319a-r18 ENUMERATED { ms100, ms200, ms300, ms400, ms600, ms1000, ms2000, + ms3000, ms4000, spare7, spare6, spare5, spare4, + spare3, spare2, spare1} OPTIONAL -- Cond MT-SDT2 +} + -- TAG-SIB1-STOP -- TAG-SIDELINKUEINFORMATIONNR-START @@ -1690,6 +1994,14 @@ SidelinkUEInformationNR-v1700-IEs ::= SEQUENCE { sl-TxResourceReqListCommRelay-r17 SL-TxResourceReqListCommRelay-r17 OPTIONAL, ue-Type-r17 ENUMERATED {relayUE, remoteUE} OPTIONAL, sl-SourceIdentityRemoteUE-r17 SL-SourceIdentity-r17 OPTIONAL, + nonCriticalExtension SidelinkUEInformationNR-v1800-IEs OPTIONAL +} + +SidelinkUEInformationNR-v1800-IEs ::= SEQUENCE { + sl-CarrierFailureList-r18 SL-CarrierFailureList-r18 OPTIONAL, + sl-TxResourceReqListL2-U2U-r18 SEQUENCE (SIZE (1..maxNrofSL-Dest-r16)) OF SL-TxResourceReqL2-U2U-r18 OPTIONAL, + sl-PosRxInterestedFreqList-r18 SL-InterestedFreqList-r16 OPTIONAL, + sl-PosTxResourceReqList-r18 SL-PosTxResourceReqList-r18 OPTIONAL, nonCriticalExtension SEQUENCE {} OPTIONAL } @@ -1697,6 +2009,8 @@ SL-InterestedFreqList-r16 ::= SEQUENCE (SIZE (1..maxNrofFreqSL-r16)) OF SL-TxResourceReqList-r16 ::= SEQUENCE (SIZE (1..maxNrofSL-Dest-r16)) OF SL-TxResourceReq-r16 +SL-PosTxResourceReqList-r18 ::= SEQUENCE (SIZE (1..maxNrofSL-Dest-r16)) OF SL-PosTxResourceReq-r18 + SL-TxResourceReq-r16 ::= SEQUENCE { sl-DestinationIdentity-r16 SL-DestinationIdentity-r16, sl-CastType-r16 ENUMERATED {broadcast, groupcast, unicast, spare1}, @@ -1714,12 +2028,16 @@ SL-RxDRX-ReportList-v1700 ::= SEQUENCE (SIZE (1..maxNrofSL-Dest-r16)) O SL-TxResourceReq-v1700 ::= SEQUENCE { sl-DRX-InfoFromRxList-r17 SEQUENCE (SIZE (1..maxNrofSL-RxInfoSet-r17)) OF SL-DRX-ConfigUC-SemiStatic-r17 OPTIONAL, sl-DRX-Indication-r17 ENUMERATED {on, off} OPTIONAL, - ... + ..., + [[ + sl-QoS-InfoList-v1800 SEQUENCE (SIZE (1..maxNrofSL-QFIsPerDest-r16)) OF SL-QoS-Info-v1800 OPTIONAL + ]] } SL-RxDRX-Report-v1700 ::= SEQUENCE { sl-DRX-ConfigFromTx-r17 SL-DRX-ConfigUC-SemiStatic-r17, - ...} + ... +} SL-RxInterestedGC-BC-DestList-r17 ::= SEQUENCE (SIZE (1..maxNrofSL-Dest-r16)) OF SL-RxInterestedGC-BC-Dest-r17 @@ -1737,7 +2055,10 @@ SL-TxResourceReqDisc-r17 ::= SEQUENCE { sl-TxInterestedFreqListDisc-r17 SL-TxInterestedFreqList-r16, sl-TypeTxSyncListDisc-r17 SEQUENCE (SIZE (1..maxNrofFreqSL-r16)) OF SL-TypeTxSync-r16, sl-DiscoveryType-r17 ENUMERATED {relay, non-Relay}, - ... + ..., + [[ + ue-TypeU2U-r18 ENUMERATED {relayUE, remoteUE} OPTIONAL + ]] } SL-TxResourceReqListCommRelay-r17 ::= SEQUENCE (SIZE (1..maxNrofSL-Dest-r16)) OF SL-TxResourceReqCommRelayInfo-r17 @@ -1762,6 +2083,37 @@ SL-TxResourceReqL2U2N-Relay-r17 ::= SEQUENCE { ... } +SL-TxResourceReqL2-U2U-r18 ::= SEQUENCE { + sl-DestinationIdentityL2-U2U-r18 SL-DestinationIdentity-r16 OPTIONAL, + sl-TxInterestedFreqListL2-U2U-r18 SL-TxInterestedFreqList-r16, + sl-TypeTxSyncListL2-U2U-r18 SEQUENCE (SIZE (1..maxNrofFreqSL-r16)) OF SL-TypeTxSync-r16, + sl-CapabilityInformationSidelink-r18 OCTET STRING OPTIONAL, + sl-U2U-InfoList-r18 SEQUENCE (SIZE (1.. maxNrofRemoteUE-r17)) OF SL-U2U-Info-r18 OPTIONAL, + sl-RLC-ModeIndicationListL2-U2U-r18 SEQUENCE (SIZE (1.. maxNrofSLRB-r16)) OF SL-RLC-Mode-r18 OPTIONAL, + ... +} + +SL-U2U-Info-r18 ::= SEQUENCE { + sl-U2U-Identity-r18 CHOICE { + sl-TargetUE-Identity-r18 SL-DestinationIdentity-r16, + sl-SourceUE-Identity-r18 SL-SourceIdentity-r17 + }, + sl-E2E-QoS-InfoList-r18 SEQUENCE (SIZE (1.. maxNrofSL-QFIsPerDest-r16)) OF SL-QoS-Info-r16 OPTIONAL, + sl-PerHop-QoS-InfoList-r18 SEQUENCE (SIZE (1.. maxNrofSL-QFIsPerDest-r16)) OF SL-SplitQoS-Info-r18 OPTIONAL, + sl-PerSLRB-QoS-InfoList-r18 SEQUENCE (SIZE (1.. maxNrofSLRB-r16)) OF SL-PerSLRB-QoS-Info-r18 OPTIONAL, + sl-CapabilityInformationTargetRemoteUE-r18 OCTET STRING OPTIONAL +} + +SL-PosTxResourceReq-r18 ::= SEQUENCE { + sl-PosDestinationIdentity-r18 SL-DestinationIdentity-r16, + sl-PosCastType-r18 ENUMERATED {broadcast, groupcast, unicast, spare1}, + sl-PosTxInterestedFreqList-r18 SL-TxInterestedFreqList-r16 OPTIONAL, + sl-PosTypeTxSyncList-r18 SEQUENCE (SIZE (1..maxNrofFreqSL-r16)) OF SL-TypeTxSync-r16 OPTIONAL, + sl-PosQoS-InfoList-r18 SEQUENCE (SIZE (1..maxNrofSL-PRS-PerDest-r18)) OF SL-PRS-QoS-Info-r18 OPTIONAL, + sl-CapabilityInformationSidelink-r18 OCTET STRING OPTIONAL, + ... +} + SL-TxInterestedFreqList-r16 ::= SEQUENCE (SIZE (1..maxNrofFreqSL-r16)) OF INTEGER (1..maxNrofFreqSL-r16) SL-QoS-Info-r16 ::= SEQUENCE { @@ -1769,6 +2121,14 @@ SL-QoS-Info-r16 ::= SEQUENCE { sl-QoS-Profile-r16 SL-QoS-Profile-r16 OPTIONAL } +SL-QoS-Info-v1800 ::= SEQUENCE { + sl-TxInterestedFreqList-r18 SL-TxInterestedFreqList-r16, + sl-TxProfile-r18 SL-TxProfile-r18 OPTIONAL, + ... +} + +SL-TxProfile-r18 ::= ENUMERATED {backwardsCompatible, backwardsIncompatible} + SL-RLC-ModeIndication-r16 ::= SEQUENCE { sl-Mode-r16 CHOICE { sl-AM-Mode-r16 NULL, @@ -1784,6 +2144,39 @@ SL-Failure-r16 ::= SEQUENCE { sl-Failure-r16 ENUMERATED {rlf,configFailure, drxReject-v1710, spare5, spare4, spare3, spare2, spare1} } +SL-CarrierFailureList-r18 ::= SEQUENCE (SIZE (1..maxNrofSL-Dest-r16)) OF SL-CarrierFailure-r18 + +SL-CarrierFailure-r18 ::= SEQUENCE { + sl-DestinationIdentity-r18 SL-DestinationIdentity-r16, + sl-CarrierFailure-r18 SEQUENCE (SIZE (1..maxNrofFreqSL-r16)) OF INTEGER (1..maxNrofFreqSL-r16) +} + +SL-SplitQoS-Info-r18 ::= SEQUENCE { + sl-QoS-FlowIdentity-r18 SL-QoS-FlowIdentity-r16, + sl-SplitPacketDelayBudget-r18 INTEGER (0..1023) OPTIONAL, + ... +} + +SL-PerSLRB-QoS-Info-r18 ::= SEQUENCE { + sl-RemoteUE-SLRB-Identity-r18 SLRB-Uu-ConfigIndex-r16, + sl-QoS-ProfilePerSLRB-r18 SL-QoS-Profile-r16 OPTIONAL +} + +SL-PRS-QoS-Info-r18 ::= SEQUENCE { + sl-PRS-Priority-r18 INTEGER (1..8) OPTIONAL, + sl-PRS-DelayBudget-r18 INTEGER (0..1023) OPTIONAL, + sl-PRS-Bandwidth-r18 ENUMERATED {mhz5, mhz10, mhz15, mhz20, mhz25, mhz30, mhz35, mhz40, + mhz45, mhz50, mhz60, mhz70, mhz80, mhz90, mhz100, mhz200, mhz400, + spare15, spare14, spare13, spare12, spare11, spare10, spare9, spare8, + spare7, spare6, spare5, spare4, spare3, spare2, spare1} OPTIONAL, + ... +} + +SL-RLC-Mode-r18 ::= CHOICE { + sl-AM-Mode-r18 NULL, + sl-UM-Mode-r18 NULL +} + -- TAG-SIDELINKUEINFORMATIONNR-STOP -- TAG-SYSTEMINFORMATION-START @@ -1819,7 +2212,13 @@ SystemInformation-IEs ::= SEQUENCE { sib18-v1700 SIB18-r17, sib19-v1700 SIB19-r17, sib20-v1700 SIB20-r17, - sib21-v1700 SIB21-r17 + sib21-v1700 SIB21-r17, + sib22-v1800 SIB22-r18, + sib23-v1800 SIB23-r18, + sib24-v1800 SIB24-r18, + sib25-v1800 SIB25-r18, + sib17bis-v1820 SIB17bis-r18 + }, lateNonCriticalExtension OCTET STRING OPTIONAL, nonCriticalExtension SEQUENCE {} OPTIONAL @@ -1906,11 +2305,23 @@ UEAssistanceInformation-v1700-IEs ::= SEQUENCE { nonSDT-DataIndication-r17 SEQUENCE { resumeCause-r17 ResumeCause OPTIONAL } OPTIONAL, - scg-DeactivationPreference-r17 ENUMERATED { scgDeactivationPreferred, noPreference } OPTIONAL, + scg-DeactivationPreference-r17 ENUMERATED { scg-DeactivationPreferred, noPreference } OPTIONAL, uplinkData-r17 ENUMERATED { true } OPTIONAL, rrm-MeasRelaxationFulfilment-r17 BOOLEAN OPTIONAL, propagationDelayDifference-r17 PropagationDelayDifference-r17 OPTIONAL, - nonCriticalExtension SEQUENCE {} OPTIONAL + nonCriticalExtension UEAssistanceInformation-v1800-IEs OPTIONAL +} + +UEAssistanceInformation-v1800-IEs ::= SEQUENCE { + idc-FDM-Assistance-r18 IDC-FDM-Assistance-r18 OPTIONAL, + idc-TDM-Assistance-r18 IDC-TDM-Assistance-r18 OPTIONAL, + multiRx-PreferenceFR2-r18 ENUMERATED {single, multiple } OPTIONAL, + musim-Assistance-v1800 MUSIM-Assistance-v1800 OPTIONAL, + flightPathInfoAvailable-r18 ENUMERATED {true} OPTIONAL, + ul-TrafficInfo-r18 UL-TrafficInfo-r18 OPTIONAL, + n3c-RelayUE-InfoList-r18 SEQUENCE (SIZE (0..8)) OF N3C-RelayUE-Info-r18 OPTIONAL, + sl-PRS-UE-AssistanceInformationNR-r18 SL-PRS-UE-AssistanceInformationNR-r18 OPTIONAL, + nonCriticalExtension SEQUENCE {} OPTIONAL } IDC-Assistance-r16 ::= SEQUENCE { @@ -1941,7 +2352,10 @@ VictimSystemType-r16 ::= SEQUENCE { navIC-r16 ENUMERATED {true} OPTIONAL, wlan-r16 ENUMERATED {true} OPTIONAL, bluetooth-r16 ENUMERATED {true} OPTIONAL, - ... + ..., + [[ + uwb-r18 ENUMERATED {true} OPTIONAL + ]] } DRX-Preference-r16 ::= SEQUENCE { @@ -2027,6 +2441,73 @@ MUSIM-Assistance-r17 ::= SEQUENCE { MUSIM-GapPreferenceList-r17 ::= SEQUENCE (SIZE (1..4)) OF MUSIM-GapInfo-r17 + +MUSIM-Assistance-v1800 ::= SEQUENCE { + musim-GapPriorityPreferenceList-r18 MUSIM-GapPriorityPreferenceList-r18 OPTIONAL, + musim-GapKeepPreference-r18 ENUMERATED {true} OPTIONAL, + musim-CapRestriction-r18 MUSIM-CapRestriction-r18 OPTIONAL, + musim-NeedForGapsInfoNR-r18 NeedForGapsInfoNR-r16 OPTIONAL, + ... +} + +MUSIM-GapPriorityPreferenceList-r18 ::= SEQUENCE (SIZE (1..3)) OF GapPriority-r17 + +MUSIM-CapRestriction-r18 ::= SEQUENCE { + musim-Cell-SCG-ToRelease-r18 MUSIM-Cell-SCG-ToRelease-r18 OPTIONAL, + musim-CellToAffectList-r18 MUSIM-CellToAffectList-r18 OPTIONAL, + musim-AffectedBandsList-r18 MUSIM-AffectedBandsList-r18 OPTIONAL, + musim-AvoidedBandsList-r18 MUSIM-AvoidedBandsList-r18 OPTIONAL, + musim-MaxCC-r18 MUSIM-MaxCC-r18 OPTIONAL +} + +MUSIM-Cell-SCG-ToRelease-r18 ::= SEQUENCE { + musim-CellToRelease-r18 MUSIM-CellToRelease-r18 OPTIONAL, + scg-ReleasePreference-r18 ENUMERATED {true} OPTIONAL +} + +MUSIM-CellToRelease-r18 ::= SEQUENCE (SIZE (1..maxNrofServingCells)) OF ServCellIndex + +MUSIM-CellToAffectList-r18::= SEQUENCE (SIZE (1..maxNrofServingCells)) OF MUSIM-CellToAffect-r18 + +MUSIM-CellToAffect-r18 ::= SEQUENCE { + musim-ServCellIndex-r18 ServCellIndex, + musim-MIMO-Layers-DL-r18 INTEGER (1..8) OPTIONAL, + musim-MIMO-Layers-UL-r18 INTEGER (1..4) OPTIONAL, + musim-SupportedBandwidth-DL-r18 SupportedBandwidth-v1700 OPTIONAL, + musim-SupportedBandwidth-UL-r18 SupportedBandwidth-v1700 OPTIONAL +} + +MUSIM-AffectedBandsList-r18 ::= SEQUENCE (SIZE (1..maxBandComb-MUSIM-r18)) OF MUSIM-AffectedBands-r18 + +MUSIM-AffectedBands-r18 ::= SEQUENCE (SIZE (1..maxCandidateBandIndex-r18)) OF MUSIM-CapabilityRestrictedBandParameters-r18 + +MUSIM-CapabilityRestrictedBandParameters-r18 ::= SEQUENCE { + musim-bandEntryIndex-r18 MUSIM-BandEntryIndex-r18, + musim-CapabilityRestricted-r18 SEQUENCE { + musim-MIMO-Layers-DL-r18 INTEGER (1..8) OPTIONAL, + musim-MIMO-Layers-UL-r18 INTEGER (1..4) OPTIONAL, + musim-SupportedBandwidth-DL-r18 SupportedBandwidth-v1700 OPTIONAL, + musim-SupportedBandwidth-UL-r18 SupportedBandwidth-v1700 OPTIONAL + } +} + +MUSIM-AvoidedBandsList-r18 ::= SEQUENCE (SIZE (1..maxBandComb-MUSIM-r18)) OF MUSIM-AvoidedBands-r18 + +MUSIM-AvoidedBands-r18 ::= SEQUENCE (SIZE (1..maxCandidateBandIndex-r18)) OF MUSIM-BandEntryIndex-r18 + +MUSIM-BandEntryIndex-r18 ::= INTEGER(1.. maxCandidateBandIndex-r18) + +MUSIM-MaxCC-r18 ::= SEQUENCE { + musim-MaxCC-TotalDL-r18 INTEGER (1..32) OPTIONAL, + musim-MaxCC-TotalUL-r18 INTEGER (1..32) OPTIONAL, + musim-MaxCC-FR1-DL-r18 INTEGER (1..32) OPTIONAL, + musim-MaxCC-FR1-UL-r18 INTEGER (1..32) OPTIONAL, + musim-MaxCC-FR2-1-DL-r18 INTEGER (1..32) OPTIONAL, + musim-MaxCC-FR2-1-UL-r18 INTEGER (1..32) OPTIONAL, + musim-MaxCC-FR2-2-DL-r18 INTEGER (1..32) OPTIONAL, + musim-MaxCC-FR2-2-UL-r18 INTEGER (1..32) OPTIONAL +} + ReleasePreference-r16 ::= SEQUENCE { preferredRRC-State-r16 ENUMERATED {idle, inactive, connected, outOfConnected} } @@ -2056,6 +2537,96 @@ UL-GapFR2-Preference-r17::= SEQUENCE { PropagationDelayDifference-r17 ::= SEQUENCE (SIZE (1..4)) OF INTEGER (-270..270) +IDC-FDM-Assistance-r18 ::= SEQUENCE { + affectedCarrierFreqRangeList-r18 AffectedCarrierFreqRangeList-r18 OPTIONAL, + affectedCarrierFreqRangeCombList-r18 AffectedCarrierFreqRangeCombList-r18 OPTIONAL, + ... +} + +IDC-TDM-Assistance-r18 ::= SEQUENCE { + cycleLength-r18 ENUMERATED {ms2, ms3, ms4, ms5, ms6, ms7, ms8, ms10, ms14, ms16, ms20, ms30, + ms32, ms35, ms40, ms60, ms64, ms70, ms80, ms96, ms100, ms128, ms160, + ms256, ms320, ms512, ms640, ms1024, ms1280, ms2048, ms2560, ms5120, ms10240}, + startOffset-r18 INTEGER (0..10239), + slotOffset-r18 INTEGER (0..31), + activeDuration-r18 CHOICE { + subMilliSeconds INTEGER (1..31), + milliSeconds ENUMERATED { + ms1, ms2, ms3, ms4, ms5, ms6, ms8, ms10, ms20, ms30, ms40, ms50, ms60, + ms80, ms100, ms200, ms300, ms400, ms500, ms600, ms800, ms1000, ms1200, + ms1600, spare8, spare7, spare6, spare5, spare4, spare3, spare2, spare1 } + }, + ... +} + +AffectedCarrierFreqRangeList-r18 ::= SEQUENCE (SIZE (1..maxFreqIDC-r16)) OF AffectedCarrierFreqRange-r18 + +AffectedCarrierFreqRange-r18 ::= SEQUENCE { + affectedFreqRange-r18 AffectedFreqRange-r18,interferenceDirection-r18 ENUMERATED {nr, other, both, spare}, + victimSystemType-r18 VictimSystemType-r16 OPTIONAL +} + +AffectedCarrierFreqRangeCombList-r18 ::= SEQUENCE (SIZE (1..maxCombIDC-r16)) OF AffectedCarrierFreqRangeComb-r18 + +AffectedCarrierFreqRangeComb-r18 ::= SEQUENCE { + affectedCarrierFreqRangeComb-r18 SEQUENCE (SIZE (2..maxNrofServingCells)) OF AffectedFreqRange-r18, + interferenceDirection-r18 ENUMERATED {nr, other, both, spare}, + victimSystemType-r18 VictimSystemType-r16 OPTIONAL +} + +AffectedFreqRange-r18 ::= SEQUENCE { + centerFreq-r18 ARFCN-ValueNR, + affectedBandwidth-r18 ENUMERATED {khz200, khz400, khz600, khz800, mhz1, mhz2, mhz3, mhz4, mhz5, mhz6, + mhz8, mhz10, mhz20, mhz30, mhz40, mhz50, mhz60, mhz80, mhz100, mhz200, + mhz300, mhz400, spare10, spare9, spare8, spare7, spare6, spare5, spare4, + spare3, spare2, spare1} +} + +UL-TrafficInfo-r18 ::= SEQUENCE (SIZE (1..maxNrofPDU-Sessions-r17)) OF PDU-SessionUL-TrafficInfo-r18 + +PDU-SessionUL-TrafficInfo-r18 ::= SEQUENCE { + pdu-SessionID-r18 PDU-SessionID, + qos-FlowUL-TrafficInfoList-r18 SEQUENCE (SIZE (1..maxNrofQFIs)) OF QOS-FlowUL-TrafficInfo-r18 +} + +QOS-FlowUL-TrafficInfo-r18 ::= SEQUENCE { + qfi-r18 QFI, + jitterRange-r18 SEQUENCE { + lowerBound-r18 JitterBound-r18, + upperBound-r18 JitterBound-r18 + } OPTIONAL, + burstArrivalTime-r18 CHOICE { + referenceTime ReferenceTime-r16, + referenceSFN-AndSlot ReferenceSFN-AndSlot-r18 + } OPTIONAL, + trafficPeriodicity-r18 INTEGER (1..640000) OPTIONAL, + pduSetIdentification-r18 BOOLEAN OPTIONAL, + psiIdentification-r18 BOOLEAN OPTIONAL, + ... +} + +ReferenceSFN-AndSlot-r18 ::= SEQUENCE { + referenceSFN-r18 INTEGER (0..1023), + referenceSlot-r18 INTEGER (0..639) +} + +JitterBound-r18 ::= ENUMERATED {ms0, ms0dot5, ms1, ms1dot5, ms2, ms2dot5, ms3, ms3dot5, ms4, ms4dot5, ms5, ms5dot5, ms6, ms6dot5, ms7, beyondMs7} + +SL-PRS-UE-AssistanceInformationNR-r18 ::= SEQUENCE (SIZE (1..maxNrofSL-PRS-TxConfig-r18)) OF SL-PRS-TxInfo-r18 + +SL-PRS-TxInfo-r18 ::= SEQUENCE { + sl-PRS-Periodicity-r18 ENUMERATED {ms100, ms200, ms300, ms400, ms500, ms600, ms700, ms800, ms900, ms1000, spare6, + spare5, spare4, spare3, spare2, spare1}, + sl-PRS-Priority-r18 INTEGER (1..8) OPTIONAL, + sl-PRS-DelayBudget-r18 INTEGER (0..1023) OPTIONAL, + sl-PRS-Bandwidth-r18 ENUMERATED {mhz5, mhz10, mhz15, mhz20, mhz25, mhz30, mhz35, mhz40, + mhz45, mhz50, mhz60, mhz70, mhz80, mhz90, mhz100, mhz200, mhz400, + spare15, spare14, spare13, spare12, spare11, spare10, spare9, spare8, + spare7, spare6, spare5, spare4, spare3, spare2, spare1} OPTIONAL, + ... + +} + -- TAG-UEASSISTANCEINFORMATION-STOP -- TAG-UECAPABILITYENQUIRY-START @@ -2125,9 +2696,22 @@ UEInformationRequest-r16-IEs ::= SEQUENCE { UEInformationRequest-v1700-IEs ::= SEQUENCE { successHO-ReportReq-r17 ENUMERATED {true} OPTIONAL, -- Need N coarseLocationRequest-r17 ENUMERATED {true} OPTIONAL, -- Need N + nonCriticalExtension UEInformationRequest-v1800-IEs OPTIONAL +} + +UEInformationRequest-v1800-IEs ::= SEQUENCE { + flightPathInfoReq-r18 FlightPathInfoReportConfig-r18 OPTIONAL, -- Need N + successPSCell-ReportReq-r18 ENUMERATED {true} OPTIONAL, -- Need N + reselectionMeasurementReq-r18 ENUMERATED {true} OPTIONAL, -- Need N + validatedMeasurementsReq-r18 ENUMERATED {true} OPTIONAL, -- Need N nonCriticalExtension SEQUENCE {} OPTIONAL } +FlightPathInfoReportConfig-r18 ::= SEQUENCE { + maxWayPointNumber-r18 INTEGER (1..maxWayPoint-r18), + includeTimeStamp-r18 ENUMERATED {true} OPTIONAL -- Need N +} + -- TAG-UEINFORMATIONREQUEST-STOP -- TAG-UEINFORMATIONRESPONSE-START @@ -2151,13 +2735,27 @@ UEInformationResponse-r16-IEs ::= SEQUENCE { nonCriticalExtension UEInformationResponse-v1700-IEs OPTIONAL } -UEInformationResponse-v1700-IEs ::= SEQUENCE { +UEInformationResponse-v1700-IEs ::= SEQUENCE { successHO-Report-r17 SuccessHO-Report-r17 OPTIONAL, connEstFailReportList-r17 ConnEstFailReportList-r17 OPTIONAL, coarseLocationInfo-r17 OCTET STRING OPTIONAL, + nonCriticalExtension UEInformationResponse-v1800-IEs OPTIONAL +} + +UEInformationResponse-v1800-IEs ::= SEQUENCE { + flightPathInfoReport-r18 FlightPathInfoReport-r18 OPTIONAL, + successPSCell-Report-r18 SuccessPSCell-Report-r18 OPTIONAL, + measResultReselectionNR-r18 MeasResultIdleNR-r16 OPTIONAL, nonCriticalExtension SEQUENCE {} OPTIONAL } +FlightPathInfoReport-r18 ::= SEQUENCE (SIZE (0..maxWayPoint-r18)) OF WayPoint-r18 + +WayPoint-r18 ::= SEQUENCE { + wayPointLocation-r18 OCTET STRING, + timeStamp-r18 AbsoluteTimeInfo-r16 OPTIONAL +} + LogMeasReport-r16 ::= SEQUENCE { absoluteTimeStamp-r16 AbsoluteTimeInfo-r16, traceReference-r16 TraceReference-r16, @@ -2234,11 +2832,14 @@ RA-Report-r16 ::= SEQUENCE { ra-InformationCommon-r16 RA-InformationCommon-r16 OPTIONAL, raPurpose-r16 ENUMERATED {accessRelated, beamFailureRecovery, reconfigurationWithSync, ulUnSynchronized, schedulingRequestFailure, noPUCCHResourceAvailable, requestForOtherSI, - msg3RequestForOtherSI-r17, spare8, spare7, spare6, spare5, spare4, spare3, + msg3RequestForOtherSI-r17, lbt-Failure-r18, spare7, spare6, spare5, spare4, spare3, spare2, spare1}, ..., [[ spCellID-r17 CGI-Info-Logging-r16 OPTIONAL + ]], + [[ + sdt-Failed-r18 ENUMERATED {true} OPTIONAL ]] } @@ -2255,7 +2856,7 @@ RA-InformationCommon-r16 ::= SEQUENCE { perRAInfoList-r16 PerRAInfoList-r16, ..., [[ - perRAInfoList-v1660 PerRAInfoList-v1660 OPTIONAL + perRAInfoList-v1660 PerRAInfoList-v1660 OPTIONAL ]], [[ msg1-SCS-From-prach-ConfigurationIndex-r16 ENUMERATED {kHz1dot25, kHz5, spare2, spare1} OPTIONAL @@ -2281,9 +2882,34 @@ RA-InformationCommon-r16 ::= SEQUENCE { ssbsForSI-Acquisition-r17 SEQUENCE (SIZE (1..maxNrofSSBs-r16)) OF SSB-Index OPTIONAL, msgA-PUSCH-PayloadSize-r17 BIT STRING (SIZE (5)) OPTIONAL, onDemandSISuccess-r17 ENUMERATED {true} OPTIONAL + ]], + [[ + usedFeatureCombination-r18 ReportedFeatureCombination-r18 OPTIONAL, + triggeredFeatureCombination-r18 ReportedFeatureCombination-r18 OPTIONAL, + startPreambleForThisPartition-r18 INTEGER (0..63) OPTIONAL, + numberOfPreamblesPerSSB-ForThisPartition-r18 INTEGER (1..64) OPTIONAL, + attemptedBWP-InfoList-r18 SEQUENCE (SIZE (1..maxNrofBWPs)) OF AttemptedBWP-Info-r18 OPTIONAL, + numberOfLBT-Failures-r18 INTEGER (1..128) OPTIONAL, + perRAInfoList-v1800 PerRAInfoList-v1800 OPTIONAL, + intendedSIBs-r18 SEQUENCE (SIZE (1..maxSIB)) OF SIB-Type-r18 OPTIONAL ]] } +AttemptedBWP-Info-r18 ::= SEQUENCE { + locationAndBandwidth-r18 INTEGER (0..37949), + subcarrierSpacing-r18 SubcarrierSpacing +} + +ReportedFeatureCombination-r18 ::= SEQUENCE { + redCap-r18 ENUMERATED {true} OPTIONAL, + smallData-r18 ENUMERATED {true} OPTIONAL, + nsag-r18 NSAG-List-r17 OPTIONAL, + msg3-Repetitions-r18 ENUMERATED {true} OPTIONAL, + msg1-Repetitions-r18 ENUMERATED {true} OPTIONAL, + eRedCap-r18 ENUMERATED {true} OPTIONAL, + triggered-S-NSSAI-List-r18 SEQUENCE (SIZE (1..maxNrofS-NSSAI)) OF S-NSSAI OPTIONAL +} + PerRAInfoList-r16 ::= SEQUENCE (SIZE (1..200)) OF PerRAInfo-r16 PerRAInfoList-v1660 ::= SEQUENCE (SIZE (1..200)) OF PerRACSI-RSInfo-v1660 @@ -2293,19 +2919,38 @@ PerRAInfo-r16 ::= CHOICE { perRACSI-RSInfoList-r16 PerRACSI-RSInfo-r16 } +PerRAInfoList-v1800 ::= SEQUENCE (SIZE (1..200)) OF PerRAInfo-v1800 + +PerRAInfo-v1800 ::= CHOICE { + perRASSBInfoList-v1800 PerRASSBInfo-v1800, + perRACSI-RSInfoList-v1800 PerRACSI-RSInfo-v1800 +} + PerRASSBInfo-r16 ::= SEQUENCE { ssb-Index-r16 SSB-Index, numberOfPreamblesSentOnSSB-r16 INTEGER (1..200), perRAAttemptInfoList-r16 PerRAAttemptInfoList-r16 } +PerRASSBInfo-v1800 ::= SEQUENCE { + allPreamblesBlocked ENUMERATED {true} OPTIONAL, + lbt-Detected-r18 ENUMERATED {true} OPTIONAL, + ... +} + PerRACSI-RSInfo-r16 ::= SEQUENCE { csi-RS-Index-r16 CSI-RS-Index, numberOfPreamblesSentOnCSI-RS-r16 INTEGER (1..200) } -PerRACSI-RSInfo-v1660 ::= SEQUENCE { - csi-RS-Index-v1660 INTEGER (1..96) OPTIONAL +PerRACSI-RSInfo-v1660 ::= SEQUENCE { + csi-RS-Index-v1660 INTEGER (1..96) OPTIONAL +} + +PerRACSI-RSInfo-v1800 ::= SEQUENCE { + allPreamblesBlocked ENUMERATED {true} OPTIONAL, + lbt-Detected-r18 ENUMERATED {true} OPTIONAL, + ... } PerRAAttemptInfoList-r16 ::= SEQUENCE (SIZE (1..200)) OF PerRAAttemptInfo-r16 @@ -2319,8 +2964,12 @@ PerRAAttemptInfo-r16 ::= SEQUENCE { ]] } -SIB-Type-r17 ::= ENUMERATED {sibType2, sibType3, sibType4, sibType5, sibType9, sibType10-v1610, sibType11-v1610, sibType12-v1610, - sibType13-v1610, sibType14-v1610, spare6, spare5, spare4, spare3, spare2, spare1} +SIB-Type-r17 ::= ENUMERATED {sibType2, sibType3, sibType4, sibType5, sibType9, sibType10, sibType11, sibType12, + sibType13, sibType14, posSIB-v1810, spare5, spare4, spare3, spare2, spare1} + +SIB-Type-r18 ::= ENUMERATED {sibType15, sibType16, sibType17, sibType18, sibType19, sibType20, + sibType21, sibType22, sibType23, sibType24, sibType25, spare5, spare4, + spare3, spare2, spare1} RLF-Report-r16 ::= CHOICE { nr-RLF-Report-r16 SEQUENCE { @@ -2372,6 +3021,25 @@ RLF-Report-r16 ::= CHOICE { pci-arfcn-r17 PCI-ARFCN-NR-r16 } OPTIONAL, choCandidateCellList-r17 ChoCandidateCellList-r17 OPTIONAL + ]], + [[ + pSCellId-r18 CHOICE { + cellGlobalId-r18 CGI-Info-Logging-r16, + pci-arfcn-r18 PCI-ARFCN-NR-r16 + } OPTIONAL, + mcg-RecoveryFailureCause-r18 ENUMERATED {t316-Expiry, scg-Deactivated, spare2, spare1} OPTIONAL, + scg-FailureCause-r18 ENUMERATED {t310-Expiry, randomAccessProblem, rlc-MaxNumRetx, + synchReconfigFailureSCG, scg-ReconfigFailure, + srb3-IntegrityFailure, scg-lbtFailure, beamFailureRecoveryFailure, + t312-Expiry, bh-RLF, beamFailure, spare5, spare4, spare3, spare2, spare1 } + OPTIONAL, + elapsedTimeSCG-Failure-r18 ElapsedTimeSCG-Failure-r18 OPTIONAL, + voiceFallbackHO-r18 ENUMERATED {true} OPTIONAL, + measResultLastServCellRSSI-r18 RSSI-Range-r16 OPTIONAL, + measResultNeighFreqListRSSI-r18 MeasResultNeighFreqListRSSI-r18 OPTIONAL, + bwp-Info-r18 AttemptedBWP-Info-r18 OPTIONAL, + elapsedTimeT316-r18 ElapsedTimeT316-r18 OPTIONAL, + scg-FailedAfterMCG-r18 ENUMERATED {true} OPTIONAL ]] }, eutra-RLF-Report-r16 SEQUENCE { @@ -2404,7 +3072,60 @@ SuccessHO-Report-r17 ::= SEQUENCE { ra-InformationCommon-r17 RA-InformationCommon-r16 OPTIONAL, upInterruptionTimeAtHO-r17 UPInterruptionTimeAtHO-r17 OPTIONAL, c-RNTI-r17 RNTI-Value OPTIONAL, - ... + ..., + [[ + targetCell-PCI-ARFCN-r17 PCI-ARFCN-NR-r16 OPTIONAL + ]], + [[ + eutra-TargetCellInfo-r18 SEQUENCE { + targetPCellId-r18 CHOICE { + cellGlobalId-r18 CGI-Info-Logging-r16, + pci-arfcn-r18 PCI-ARFCN-EUTRA-r16 + }, + targetCellMeas-r18 MeasQuantityResultsEUTRA OPTIONAL + } OPTIONAL, + measResultServCellRSSI-r18 RSSI-Range-r16 OPTIONAL, + measResultNeighFreqListRSSI-r18 MeasResultNeighFreqListRSSI-r18 OPTIONAL, + eutra-C-RNTI-r18 EUTRA-C-RNTI OPTIONAL, + timeSinceSHR-r18 TimeSinceSHR-r18 OPTIONAL + ]] +} + +SuccessPSCell-Report-r18 ::= SEQUENCE { + pCellId-r18 CGI-Info-Logging-r16, + sourcePSCellInfo-r18 SEQUENCE { + sourcePSCellId-r18 CHOICE { + cellGlobalId-r18 CGI-Info-Logging-r16, + pci-arfcn-r18 PCI-ARFCN-EUTRA-r16 + }, + sourcePSCellMeas-r18 MeasResultSuccessHONR-r17 OPTIONAL + } OPTIONAL, + targetPSCellInfo-r18 SEQUENCE { + targetPSCellId-r18 CHOICE { + cellGlobalId-r18 CGI-Info-Logging-r16, + pci-arfcn-r18 PCI-ARFCN-NR-r16 + }, + targetPSCellMeas-r18 MeasResultSuccessHONR-r17 OPTIONAL + }, + measResultNeighCells-r18 SEQUENCE { + measResultListNR-r18 MeasResultList2NR-r16 OPTIONAL, + measResultListEUTRA-r18 MeasResultList2EUTRA-r16 OPTIONAL + } OPTIONAL, + spr-Cause-r18 SPR-Cause-r18 OPTIONAL, + timeSinceCPAC-Reconfig-r18 TimeSinceCPAC-Reconfig-r18 OPTIONAL, + locationInfo-r18 LocationInfo-r16 OPTIONAL, + ra-InformationCommon-r18 RA-InformationCommon-r16 OPTIONAL, + sn-InitiatedPSCellChange-r18 ENUMERATED {true} OPTIONAL, +... +} + +MeasResultNeighFreqListRSSI-r18 ::= SEQUENCE(SIZE (1..maxFreq)) OF MeasResultNeighFreqRSSI-r18 + +MeasResultNeighFreqRSSI-r18 ::= SEQUENCE { + ssbFrequency-r18 ARFCN-ValueNR OPTIONAL, + ssbSubcarrierSpacing-r18 SubcarrierSpacing OPTIONAL, + refFreqCSI-RS-r18 ARFCN-ValueNR OPTIONAL, + measResult-RSSI-r18 RSSI-Range-r16 OPTIONAL } MeasResultList2NR-r16 ::= SEQUENCE(SIZE (1..maxFreq)) OF MeasResult2NR-r16 @@ -2479,6 +3200,13 @@ SHR-Cause-r17 ::= SEQUENCE { ... } +SPR-Cause-r18 ::= SEQUENCE { + t304-cause-r18 ENUMERATED {true} OPTIONAL, + t310-cause-r18 ENUMERATED {true} OPTIONAL, + t312-cause-r18 ENUMERATED {true} OPTIONAL, + ... +} + TimeSinceFailure-r16 ::= INTEGER (0..172800) MobilityHistoryReport-r16 ::= VisitedCellInfoList-r16 @@ -2487,10 +3215,18 @@ TimeUntilReconnection-r16 ::= INTEGER (0..172800) TimeSinceCHO-Reconfig-r17 ::= INTEGER (0..1023) +TimeSinceCPAC-Reconfig-r18 ::= INTEGER (0.. 1023) + TimeConnSourceDAPS-Failure-r17 ::= INTEGER (0..1023) UPInterruptionTimeAtHO-r17 ::= INTEGER (0..1023) +ElapsedTimeT316-r18 ::= INTEGER (0..2000) + +ElapsedTimeSCG-Failure-r18 ::= INTEGER (0..1023) + +TimeSinceSHR-r18 ::= INTEGER (0..172800) + -- TAG-UEINFORMATIONRESPONSE-STOP -- TAG-UEPOSITIONINGASSISTANCEINFO-START @@ -2676,6 +3412,13 @@ SIB2 ::= SEQUENCE { ]], [[ smtc4list-r17 SSB-MTC4List-r17 OPTIONAL -- Need R + ]], + [[ + frequencyBandList-v1760 MultiFrequencyBandListNR-SIB-v1760 OPTIONAL, -- Need R + frequencyBandListSUL-v1760 MultiFrequencyBandListNR-SIB-v1760 OPTIONAL -- Need R + ]], + [[ + frequencyBandListAerial-r18 MultiFrequencyBandListNR-Aerial-SIB-r18 OPTIONAL -- Need S ]] }, ..., @@ -2791,6 +3534,12 @@ SIB4 ::= SEQUENCE { ]], [[ interFreqCarrierFreqList-v1730 InterFreqCarrierFreqList-v1730 OPTIONAL -- Need R + ]], + [[ + interFreqCarrierFreqList-v1760 InterFreqCarrierFreqList-v1760 OPTIONAL -- Need R + ]], + [[ + interFreqCarrierFreqList-v1800 InterFreqCarrierFreqList-v1800 OPTIONAL -- Need R ]] } @@ -2804,6 +3553,10 @@ InterFreqCarrierFreqList-v1720 ::= SEQUENCE (SIZE (1..maxFreq)) OF InterFreqCar InterFreqCarrierFreqList-v1730 ::= SEQUENCE (SIZE (1..maxFreq)) OF InterFreqCarrierFreqInfo-v1730 +InterFreqCarrierFreqList-v1760 ::= SEQUENCE (SIZE (1..maxFreq)) OF InterFreqCarrierFreqInfo-v1760 + +InterFreqCarrierFreqList-v1800 ::= SEQUENCE (SIZE (1..maxFreq)) OF InterFreqCarrierFreqInfo-v1800 + InterFreqCarrierFreqInfo ::= SEQUENCE { dl-CarrierFreq ARFCN-ValueNR, frequencyBandList MultiFrequencyBandListNR-SIB OPTIONAL, -- Cond Mandatory @@ -2833,6 +3586,7 @@ InterFreqCarrierFreqInfo ::= SEQUENCE { interFreqNeighCellList InterFreqNeighCellList OPTIONAL, -- Need R interFreqExcludedCellList InterFreqExcludedCellList OPTIONAL, -- Need R ... + } InterFreqCarrierFreqInfo-v1610 ::= SEQUENCE { @@ -2859,6 +3613,22 @@ InterFreqCarrierFreqInfo-v1730 ::= SEQUENCE { channelAccessMode2-r17 ENUMERATED {enabled} OPTIONAL -- Need R } +InterFreqCarrierFreqInfo-v1760 ::= SEQUENCE { + frequencyBandList-v1760 MultiFrequencyBandListNR-SIB-v1760 OPTIONAL, -- Need R + frequencyBandListSUL-v1760 MultiFrequencyBandListNR-SIB-v1760 OPTIONAL -- Need R +} + +InterFreqCarrierFreqInfo-v1800 ::= SEQUENCE { + dl-CarrierFreq-r18 ARFCN-ValueNR OPTIONAL, -- Cond LessThan5MHz + frequencyBandList-r18 MultiFrequencyBandListNR-SIB OPTIONAL, -- Cond LessThan5MHz + frequencyBandListAerial-r18 MultiFrequencyBandListNR-Aerial-SIB-r18 OPTIONAL, -- Need S + mobileIAB-CellList-r18 PCI-Range OPTIONAL, -- Need R + mobileIAB-Freq-r18 ENUMERATED {true} OPTIONAL, -- Need R + eRedCapAccessAllowed-r18 ENUMERATED {true} OPTIONAL, -- Need R + tn-AreaIdList-r18 SEQUENCE (SIZE (1..maxTN-AreaInfo-r18)) OF TN-AreaId-r18 OPTIONAL, -- Need R + accessAllowed2RxXR-r18 ENUMERATED {true} OPTIONAL -- Need R +} + InterFreqNeighHSDN-CellList-r17 ::= SEQUENCE (SIZE (1..maxCellInter)) OF PCI-Range InterFreqNeighCellList ::= SEQUENCE (SIZE (1..maxCellInter)) OF InterFreqNeighCellInfo @@ -2908,6 +3678,9 @@ SIB5 ::= SEQUENCE { [[ carrierFreqListEUTRA-v1700 CarrierFreqListEUTRA-v1700 OPTIONAL, -- Need R idleModeMeasVoiceFallback-r17 ENUMERATED{true} OPTIONAL -- Need R + ]], + [[ + carrierFreqListEUTRA-v1800 CarrierFreqListEUTRA-v1800 OPTIONAL -- Need R ]] } @@ -2917,6 +3690,8 @@ CarrierFreqListEUTRA-v1610 ::= SEQUENCE (SIZE (1..maxEUTRA-Carrier)) OF Car CarrierFreqListEUTRA-v1700 ::= SEQUENCE (SIZE (1..maxEUTRA-Carrier)) OF CarrierFreqEUTRA-v1700 +CarrierFreqListEUTRA-v1800 ::= SEQUENCE (SIZE (1..maxEUTRA-Carrier)) OF CarrierFreqEUTRA-v1800 + CarrierFreqEUTRA ::= SEQUENCE { carrierFreq ARFCN-ValueEUTRA, eutra-multiBandInfoList EUTRA-MultiBandInfoList OPTIONAL, -- Need R @@ -2945,6 +3720,11 @@ CarrierFreqEUTRA-v1700 ::= SEQUENCE { eutra-FreqNeighHSDN-CellList-r17 EUTRA-FreqNeighHSDN-CellList-r17 OPTIONAL -- Need R } +CarrierFreqEUTRA-v1800 ::= SEQUENCE { + eutra-MultiBandInfoListAerial-r18 EUTRA-MultiBandInfoListAerial-r18 OPTIONAL, -- Need R + tn-AreaIdList-r18 SEQUENCE (SIZE (1..maxTN-AreaInfo-r18)) OF TN-AreaId-r18 OPTIONAL -- Need R +} + EUTRA-FreqNeighHSDN-CellList-r17 ::= SEQUENCE (SIZE (1..maxCellEUTRA)) OF EUTRA-PhysCellIdRange EUTRA-FreqExcludedCellList ::= SEQUENCE (SIZE (1..maxEUTRA-CellExcluded)) OF EUTRA-PhysCellIdRange @@ -3010,8 +3790,11 @@ SIB9 ::= SEQUENCE { } OPTIONAL, -- Need R lateNonCriticalExtension OCTET STRING OPTIONAL, ..., - [[ - referenceTimeInfo-r16 ReferenceTimeInfo-r16 OPTIONAL -- Need R + [[ + referenceTimeInfo-r16 ReferenceTimeInfo-r16 OPTIONAL -- Need R + ]], + [[ + eventID-TSS-r18 INTEGER (0..63) OPTIONAL -- Need R ]] } @@ -3059,6 +3842,17 @@ SIB12-IEs-r16 ::= SEQUENCE { sl-NonRelayDiscovery-r17 ENUMERATED {enabled} OPTIONAL, -- Need R sl-L3U2N-RelayDiscovery-r17 ENUMERATED {enabled} OPTIONAL, -- Need R sl-TimersAndConstantsRemoteUE-r17 UE-TimersAndConstantsRemoteUE-r17 OPTIONAL -- Need R + ]], + [[ + sl-FreqInfoListSizeExt-v1800 SEQUENCE (SIZE (1..maxNrofFreqSL-1-r18)) OF SL-FreqConfigCommon-r16 OPTIONAL, -- Need R + sl-RLC-BearerConfigListSizeExt-v1800 SEQUENCE (SIZE (1..maxSL-LCID-r16)) OF SL-RLC-BearerConfig-r16 OPTIONAL, -- Need R + sl-SyncFreqList-r18 SEQUENCE (SIZE (1..maxNrofFreqSL-r16)) OF SL-Freq-Id-r16 OPTIONAL, -- Need R + sl-SyncTxMultiFreq-r18 ENUMERATED {true} OPTIONAL, -- Need S + sl-MaxTransPowerCA-r18 P-Max OPTIONAL, -- Need R + sl-DiscConfigCommon-v1800 SL-DiscConfigCommon-v1800 OPTIONAL, -- Need R + sl-L2-U2U-Relay-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + sl-L3-U2U-RelayDiscovery-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + t400-U2U-r18 ENUMERATED {ms200, ms400, ms600, ms800, ms1200, ms2000, ms3000, ms4000} OPTIONAL -- Need R ]] } @@ -3086,6 +3880,11 @@ SL-DiscConfigCommon-r17 ::= SEQUENCE { sl-RemoteUE-ConfigCommon-r17 SL-RemoteUE-Config-r17 } +SL-DiscConfigCommon-v1800 ::= SEQUENCE { + sl-RelayUE-ConfigCommonU2U-r18 SL-RelayUE-ConfigU2U-r18, + sl-RemoteUE-ConfigCommonU2U-r18 SL-RemoteUE-ConfigU2U-r18 +} + -- TAG-SIB12-STOP -- TAG-SIB13-START @@ -3173,6 +3972,49 @@ TRS-ResourceSet-r17 ::= SEQUENCE { } -- TAG-SIB17-STOP +-- TAG-SIB17bis-START + +SIB17bis-r18 ::= SEQUENCE { + segmentNumber-r18 INTEGER (0..63), + segmentType-r18 ENUMERATED {notLastSegment, lastSegment}, + segmentContainer-r18 OCTET STRING +} + +SIB17bis-IEs-r18 ::= SEQUENCE { + trs-ResourceSetConfig-r18 SEQUENCE (SIZE (1..maxNrofTRS-ResourceSets-r17)) OF TRS-ResourceSet-r18 OPTIONAL, -- Need R + validityDuration-r18 ENUMERATED {t1, t2, t4, t8, t16, t32, t64, t128, t256, t512, infinity, spare5, spare4, spare3, spare2, + spare1} OPTIONAL, -- Need S + lateNonCriticalExtension OCTET STRING OPTIONAL, + ... +} + +TRS-ResourceSet-r18 ::= SEQUENCE { + powerControlOffsetSS-r18 ENUMERATED {db-3, db0, db3, db6}, + scramblingID-Info-r18 CHOICE { + scramblingIDforCommon-r18 ScramblingId, + scramblingIDperResourceListWith2-r18 SEQUENCE (SIZE (2)) OF ScramblingId, + scramblingIDperResourceListWith4-r18 SEQUENCE (SIZE (4)) OF ScramblingId, + ... + }, + firstOFDMSymbolInTimeDomain-r18 INTEGER (0..9), + startingRB-r18 INTEGER (0..maxNrofPhysicalResourceBlocks-1), + nrofRBs-r18 INTEGER (24..maxNrofPhysicalResourceBlocksPlus1), + ssb-Index-r18 SSB-Index, + periodicityAndOffset-r18 CHOICE { + slots10 INTEGER (0..9), + slots20 INTEGER (0..19), + slots40 INTEGER (0..39), + slots80 INTEGER (0..79), + slots160 INTEGER (0..159), + slots320 INTEGER (0..319), + slots640 INTEGER (0..639) + }, + frequencyDomainAllocation-r18 BIT STRING (SIZE (4)), + indBitID-r18 INTEGER (0..5), + nrofResources-r18 ENUMERATED {n2, n4} +} + +-- TAG-SIB17bis-STOP -- TAG-SIB18-START SIB18-r17 ::= SEQUENCE { @@ -3203,6 +4045,11 @@ SIB19-r17 ::= SEQUENCE { ..., [[ ntn-NeighCellConfigListExt-v1720 NTN-NeighCellConfigList-r17 OPTIONAL -- Need R + ]], + [[ + movingReferenceLocation-r18 ReferenceLocation-r17 OPTIONAL, -- Need R + ntnCovEnh-r18 NTN-CovEnh-r18 OPTIONAL, -- Need R + satSwitchWithReSync-r18 SatSwitchWithReSync-r18 OPTIONAL -- Need R ]] } @@ -3214,6 +4061,17 @@ NTN-NeighCellConfig-r17 ::= SEQUENCE { physCellId-r17 PhysCellId OPTIONAL -- Need R } +NTN-CovEnh-r18 ::= SEQUENCE { + numberOfMsg4HARQ-ACK-Repetitions-r18 BIT STRING (SIZE(4)), + rsrp-ThresholdMsg4HARQ-ACK-r18 RSRP-Range OPTIONAL -- Need R +} + +SatSwitchWithReSync-r18 ::= SEQUENCE { + ntn-Config-r18 NTN-Config-r17, + t-ServiceStart-r18 INTEGER (0..549755813887) OPTIONAL, -- Need R + ssb-TimeOffset-r18 INTEGER (0..159) OPTIONAL -- Need R +} + -- TAG-SIB19-STOP -- TAG-SIB20-START @@ -3221,7 +4079,11 @@ SIB20-r17 ::= SEQUENCE { mcch-Config-r17 MCCH-Config-r17, cfr-ConfigMCCH-MTCH-r17 CFR-ConfigMCCH-MTCH-r17 OPTIONAL, -- Need S lateNonCriticalExtension OCTET STRING OPTIONAL, - ... + ..., + [[ + cfr-ConfigMCCH-MTCH-RedCap-r18 CFR-ConfigMCCH-MTCH-r17 OPTIONAL, -- Need S + mcch-ConfigRedCap-r18 MCCH-Config-r17 OPTIONAL -- Need S + ]] } MCCH-Config-r17 ::= SEQUENCE { @@ -3266,6 +4128,78 @@ MBS-FSAI-InterFreq-r17 ::= SEQUENCE { MBS-FSAI-r17 ::= OCTET STRING (SIZE (3)) -- TAG-SIB21-STOP +-- TAG-SIB22-START + +SIB22-r18 ::= SEQUENCE { + atg-Config-r18 ATG-Config-r18 OPTIONAL, -- Need R + hs-ATG-cellReselectionSet-r18 ENUMERATED {true} OPTIONAL, -- Need R + atg-NeighCellConfigList-r18 ATG-NeighCellConfigList-r18 OPTIONAL, -- Need R + lateNonCriticalExtension OCTET STRING OPTIONAL, + ... + } + +ATG-NeighCellConfigList-r18 ::= SEQUENCE (SIZE(1..maxCellATG-r18)) OF ATG-NeighCellConfig-r18 + +ATG-NeighCellConfig-r18 ::= SEQUENCE { + atg-gNB-Location-r18 ReferenceLocation-r17 OPTIONAL, -- Need R + heightgNB-r18 INTEGER (-16384..16383) OPTIONAL, -- Need R + carrierFreq-r18 ARFCN-ValueNR OPTIONAL, -- Need R + physCellId-r18 PhysCellId OPTIONAL -- Need R +} + +-- TAG-SIB22-STOP +-- TAG-SIB23-START + +SIB23-r18 ::= SEQUENCE { + segmentNumber-r18 INTEGER (0..63), + segmentType-r18 ENUMERATED {notLastSegment, lastSegment}, + segmentContainer-r18 OCTET STRING +} + +SIB23-IEs-r18 ::= SEQUENCE { + sl-PosConfigCommonNR-r18 SL-PosConfigCommonNR-r18, + lateNonCriticalExtension OCTET STRING OPTIONAL, + ... +} + +SL-PosConfigCommonNR-r18 ::= SEQUENCE { + sl-PosFreqInfoList-r18 SEQUENCE (SIZE (1..maxNrofFreqSL-r16)) OF SL-FreqConfigCommon-r16 OPTIONAL, -- Need R + sl-PosUE-SelectedConfig-r18 SL-UE-SelectedConfig-r16 OPTIONAL, -- Need R + sl-PosNR-AnchorCarrierFreqList-r18 SL-NR-AnchorCarrierFreqList-r16 OPTIONAL, -- Need R + sl-PosMeasConfigCommon-r18 SL-MeasConfigCommon-r16 OPTIONAL, -- Need R + sl-PosOffsetDFN-r18 INTEGER (1..1000) OPTIONAL, -- Need R + sl-PosSSB-PriorityNR-r18 INTEGER (1..8) OPTIONAL, -- Need R + ... +} + +-- TAG-SIB23-STOP +-- TAG-SIB24-START + +SIB24-r18 ::= SEQUENCE { + multicastMCCH-Config-r18 MCCH-Config-r17 OPTIONAL, -- Need S + cfr-ConfigMCCH-MTCH-r18 CFR-ConfigMCCH-MTCH-r17 OPTIONAL, -- Need S + lateNonCriticalExtension OCTET STRING OPTIONAL, + ... +} + +-- TAG-SIB24-STOP +-- TAG-SIB25-START + +SIB25-r18 ::= SEQUENCE { + coverageAreaInfoList-r18 CoverageAreaInfoList-r18 OPTIONAL, -- Need R + lateNonCriticalExtension OCTET STRING OPTIONAL, + ... +} + +CoverageAreaInfoList-r18 ::= SEQUENCE (SIZE (1..maxTN-AreaInfo-r18)) OF CoverageAreaInfo-r18 + +CoverageAreaInfo-r18 ::= SEQUENCE { + tn-AreaId-r18 TN-AreaId-r18, + tn-ReferenceLocation-r18 ReferenceLocation-r17, + tn-DistanceRadius-r18 INTEGER(0..65535) +} + +-- TAG-SIB25-STOP -- TAG-POSSYSTEMINFORMATION-R16-IES-START PosSystemInformation-r16-IEs ::= SEQUENCE { @@ -3314,7 +4248,20 @@ PosSystemInformation-r16-IEs ::= SEQUENCE { posSib2-25-v1700 SIBpos-r16, posSib6-4-v1700 SIBpos-r16, posSib6-5-v1700 SIBpos-r16, - posSib6-6-v1700 SIBpos-r16 + posSib6-6-v1700 SIBpos-r16, + posSib2-17a-v1770 SIBpos-r16, + posSib2-18a-v1770 SIBpos-r16, + posSib2-20a-v1770 SIBpos-r16, + posSib1-11-v1800 SIBpos-r16, + posSib1-12-v1800 SIBpos-r16, + posSib2-26-v1800 SIBpos-r16, + posSib2-27-v1800 SIBpos-r16, + posSib6-7-v1800 SIBpos-r16, + posSib7-1-v1800 SIBpos-r16, + posSib7-2-v1800 SIBpos-r16, + posSib7-3-v1800 SIBpos-r16, + posSib7-4-v1800 SIBpos-r16 + }, lateNonCriticalExtension OCTET STRING OPTIONAL, nonCriticalExtension SEQUENCE {} OPTIONAL @@ -3330,6 +4277,11 @@ PosSI-SchedulingInfo-r16 ::= SEQUENCE { ..., [[ posSI-RequestConfigRedCap-r17 SI-RequestConfig OPTIONAL -- Cond REDCAP-MSG-1 + ]], + [[ + posSI-RequestConfigMSG1-Repetition-r18 SI-RequestConfigRepetition-r18 OPTIONAL, -- Cond MSG-1 + posSI-RequestConfigSUL-MSG1-Repetition-r18 SI-RequestConfigRepetition-r18 OPTIONAL, -- Cond SUL-MSG-1 + posSI-RequestConfigRedCap-MSG1-Repetition-r18 SI-RequestConfigRepetition-r18 OPTIONAL -- Cond REDCAP-MSG-1 ]] } @@ -3358,7 +4310,7 @@ PosSIB-Type-r16 ::= SEQUENCE { } GNSS-ID-r16 ::= SEQUENCE { - gnss-id-r16 ENUMERATED{gps, sbas, qzss, galileo, glonass, bds, ...}, + gnss-id-r16 ENUMERATED{gps, sbas, qzss, galileo, glonass, bds, ..., navic-v1760}, ... } @@ -3381,12 +4333,47 @@ SIBpos-r16 ::= SEQUENCE { AdditionalSpectrumEmission ::= INTEGER (0..7) +AdditionalSpectrumEmission-v1760 ::= INTEGER (8..39) + +AdditionalSpectrumEmission-r18 ::= INTEGER (0..39) + -- TAG-ADDITIONALSPECTRUMEMISSION-STOP +-- TAG-ADVANCEDRECEIVER-MU-MIMO-START + +AdvancedReceiver-MU-MIMO-r18 ::= SEQUENCE { + precodingAndResourceAllocation-r18 BOOLEAN OPTIONAL, -- Need M + pdsch-TimeDomainAllocation-r18 BOOLEAN OPTIONAL, -- Need M + mcs-Table-r18 ENUMERATED {qam1024, qam256, qam64, spare1} OPTIONAL, -- Need R + advReceiver-MU-MIMO-DCI-1-1-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + ... +} + +-- TAG-ADVANCEDRECEIVER-MU-MIMO-STOP +-- TAG-AERIAL-CONFIG-START + +Aerial-Config-r18 ::= SEQUENCE { + flightPathUpdateThrConfig-r18 SEQUENCE { + flightPathUpdateDistanceThr-r18 CHOICE {release NULL, setup FlightPathUpdateDistanceThr-r18 } OPTIONAL, -- Need M + flightPathUpdateTimeThr-r18 CHOICE {release NULL, setup FlightPathUpdateTimeThr-r18 } OPTIONAL -- Need M + } OPTIONAL, -- Need M + ... +} + +FlightPathUpdateDistanceThr-r18 ::= INTEGER (0..1023) + +FlightPathUpdateTimeThr-r18 ::= INTEGER (0..16383) + +-- TAG-AERIAL-CONFIG-STOP -- TAG-ALPHA-START Alpha ::= ENUMERATED {alpha0, alpha04, alpha05, alpha06, alpha07, alpha08, alpha09, alpha1} -- TAG-ALPHA-STOP +-- TAG-ALTITUDE-START + +Altitude-r18 ::= INTEGER (minAltitude-r18..maxAltitude-r18) + +-- TAG-ALTITUDE-STOP -- TAG-AMF-IDENTIFIER-START AMF-Identifier ::= BIT STRING (SIZE (24)) @@ -3407,6 +4394,16 @@ ARFCN-ValueNR ::= INTEGER (0..maxNARFCN) ARFCN-ValueUTRA-FDD-r16 ::= INTEGER (0..16383) -- TAG-ARFCN-ValueUTRA-FDD-STOP +-- TAG-ATG-CONFIG-START + +ATG-Config-r18 ::= SEQUENCE { + atg-gNB-Location-r18 ReferenceLocation-r17 OPTIONAL, -- Need R + heightgNB-r18 INTEGER (-16384..16383) OPTIONAL, -- Need R + cellSpecificKoffset-r18 INTEGER(1..3) OPTIONAL, -- Need R + ta-ReportATG-r18 ENUMERATED {enabled} OPTIONAL -- Need R +} + +-- TAG-ATG-CONFIG-STOP -- TAG-AVAILABILITYCOMBINATIONSPERCELL-START AvailabilityCombinationsPerCell-r16 ::= SEQUENCE { @@ -3416,7 +4413,8 @@ AvailabilityCombinationsPerCell-r16 ::= SEQUENCE { availabilityCombinations-r16 SEQUENCE (SIZE (1..maxNrofAvailabilityCombinationsPerSet-r16)) OF AvailabilityCombination-r16, ..., [[ - availabilityCombinationsRB-Groups-r17 SEQUENCE (SIZE (1..maxNrofAvailabilityCombinationsPerSet-r16)) OF AvailabilityCombinationRB-Groups-r17 OPTIONAL -- Need M + availabilityCombinationsRB-Groups-r17 SEQUENCE (SIZE (1..maxNrofAvailabilityCombinationsPerSet-r16)) OF + AvailabilityCombinationRB-Groups-r17 OPTIONAL -- Need M ]], [[ positionInDCI-AI-RBGroups-v1720 INTEGER(0..maxAI-DCI-PayloadSize-1-r16) OPTIONAL -- Need M @@ -3638,6 +4636,9 @@ BWP-DownlinkDedicated ::= SEQUENCE { dl-PPW-PreConfigToReleaseList-r17 DL-PPW-PreConfigToReleaseList-r17 OPTIONAL, -- Need N nonCellDefiningSSB-r17 NonCellDefiningSSB-r17 OPTIONAL, -- Need R servingCellMO-r17 MeasObjectId OPTIONAL -- Cond MeasObject-NCD-SSB + ]], + [[ + tci-InDCI-r18 CHOICE {release NULL, setup TCI-InDCI-r18} OPTIONAL -- Need M ]] } @@ -3653,6 +4654,11 @@ DL-PPW-PreConfigToAddModList-r17 ::= SEQUENCE (SIZE (1..maxNrofPPW-Config-r17 DL-PPW-PreConfigToReleaseList-r17 ::= SEQUENCE (SIZE (1..maxNrofPPW-Config-r17)) OF DL-PPW-ID-r17 +TCI-InDCI-r18 ::= SEQUENCE { + tci-SelectionPresentInDCI-r18 ENUMERATED { enabled } OPTIONAL, -- Need R + applyIndicatedTCI-StateDCI-1-0-r18 ENUMERATED {first, second, both, spare1} OPTIONAL -- Need R +} + -- TAG-BWP-DOWNLINKDEDICATED-STOP -- TAG-BWP-ID-START @@ -3688,6 +4694,16 @@ BWP-UplinkCommon ::= SEQUENCE { rsrp-ThresholdMsg3-r17 RSRP-Range OPTIONAL, -- Need R numberOfMsg3-RepetitionsList-r17 SEQUENCE (SIZE (4)) OF NumberOfMsg3-Repetitions-r17 OPTIONAL, -- Cond Msg3Rep mcs-Msg3-Repetitions-r17 SEQUENCE (SIZE (8)) OF INTEGER (0..31) OPTIONAL -- Cond Msg3Rep + ]], + [[ + additionalRACH-perPCI-ToAddModList-r18 SEQUENCE (SIZE (1.. maxNrofAdditionalPRACHConfigs-r18)) OF RACH-ConfigTwoTA-r18 + OPTIONAL, -- Cond 2TA-Only + additionalRACH-perPCI-ToReleaseList-r18 SEQUENCE (SIZE (1.. maxNrofAdditionalPRACHConfigs-r18)) OF AdditionalPCIIndex-r17 + OPTIONAL, -- Need N + rsrp-ThresholdMsg1-RepetitionNum2-r18 RSRP-Range OPTIONAL, -- Need R + rsrp-ThresholdMsg1-RepetitionNum4-r18 RSRP-Range OPTIONAL, -- Need R + rsrp-ThresholdMsg1-RepetitionNum8-r18 RSRP-Range OPTIONAL, -- Need R + preambleTransMax-Msg1-Repetition-r18 ENUMERATED {n1, n2, n4, n6, n8, n10, n20, n50, n100, n200} OPTIONAL -- Cond Msg1Rep1 ]] } @@ -3768,6 +4784,43 @@ CandidateBeamRS-r16 ::= SEQUENCE { } -- TAG-CANDIDATEBEAMRS-STOP +-- TAG-CANDIDATETCI-STATE-START + +CandidateTCI-State-r18 ::= SEQUENCE { + tci-StateId-r18 TCI-StateId, + qcl-Type1-r18 LTM-QCL-Info-r18, + qcl-Type2-r18 LTM-QCL-Info-r18 OPTIONAL, -- Need R + pathlossReferenceRS-Id-r18 PathlossReferenceRS-Id-r17 OPTIONAL, -- Need R + tag-Id-ptr-r18 ENUMERATED {n0,n1} OPTIONAL, -- Cond 2TA + ul-powerControl-r18 Uplink-powerControlId-r17 OPTIONAL, -- Need R + ... +} + +LTM-QCL-Info-r18 ::= SEQUENCE { + referenceSignal-r18 CHOICE { + ssb-Index SSB-Index, + csi-RS-Index NZP-CSI-RS-ResourceId + }, + qcl-Type-r18 ENUMERATED {typeA, typeB, typeC, typeD}, + ... +} + +-- TAG-CANDIDATETCI-STATE-STOP +-- TAG-CANDIDATETCI-UL-STATE-START + +CandidateTCI-UL-State-r18 ::= SEQUENCE { + tci-UL-StateId-r18 TCI-UL-StateId-r17, + referenceSignal-r18 CHOICE { + ssb-Index SSB-Index, + csi-RS-Index NZP-CSI-RS-ResourceId + }, + pathlossReferenceRS-Id-r18 PathlossReferenceRS-Id-r17 OPTIONAL, -- Need R + tag-Id-ptr-r18 ENUMERATED {n0,n1} OPTIONAL, -- Cond 2TA + ul-powerControl-r18 Uplink-powerControlId-r17 OPTIONAL, -- Need R + ... +} + +-- TAG-CANDIDATETCI-UL-STATE-STOP -- TAG-CELLACCESSRELATEDINFO-START CellAccessRelatedInfo ::= SEQUENCE { @@ -3824,6 +4877,44 @@ CellAccessRelatedInfo-EUTRA-EPC ::= SEQUENCE { PLMN-IdentityList-EUTRA-EPC::= SEQUENCE (SIZE (1..maxPLMN)) OF PLMN-Identity -- TAG-CELLACCESSRELATEDINFOEUTRA-EPC-STOP +-- TAG-CELLDTX-DRX-CONFIG-START + +CellDTX-DRX-Config-r18 ::= SEQUENCE { + cellDTX-DRX-onDurationTimer-r18 CHOICE { + subMilliSeconds INTEGER (1..31), + milliSeconds ENUMERATED { + ms1, ms2, ms3, ms4, ms5, ms6, ms8, ms10, ms20, ms30, ms40, ms50, ms60, + ms80, ms100, ms200, ms300, ms400, ms500, ms600, ms800, ms1000, ms1200, + ms1600, spare8, spare7, spare6, spare5, spare4, spare3, spare2, spare1 } + }, + cellDTX-DRX-CycleStartOffset-r18 CHOICE { + ms10 INTEGER(0..9), + ms20 INTEGER(0..19), + ms32 INTEGER(0..31), + ms40 INTEGER(0..39), + ms60 INTEGER(0..59), + ms64 INTEGER(0..63), + ms70 INTEGER(0..69), + ms80 INTEGER(0..79), + ms128 INTEGER(0..127), + ms160 INTEGER(0..159), + ms256 INTEGER(0..255), + ms320 INTEGER(0..319), + ms512 INTEGER(0..511), + ms640 INTEGER(0..639), + ms1024 INTEGER(0..1023), + ms1280 INTEGER(0..1279), + ms2048 INTEGER(0..2047), + ms2560 INTEGER(0..2559), + ms5120 INTEGER(0..5119), + ms10240 INTEGER(0..10239) + }, + cellDTX-DRX-SlotOffset-r18 INTEGER (0..31), + cellDTX-DRX-ConfigType-r18 ENUMERATED {dtx, drx, dtxdrx}, + cellDTX-DRX-ActivationStatus-r18 ENUMERATED {activated, deactivated} OPTIONAL -- Need N +} + +-- TAG-CELLDTX-DRX-CONFIG-STOP -- TAG-CELLGROUPCONFIG-START -- Configuration of one Cell-Group: @@ -3873,6 +4964,16 @@ CellGroupConfig ::= SEQUENCE { ]], [[ reportUplinkTxDirectCurrentMoreCarrier-r17 ReportUplinkTxDirectCurrentMoreCarrier-r17 OPTIONAL -- Need N + ]], + [[ + prioSCellPRACH-OverSP-PeriodicSRS-r17 ENUMERATED {enabled} OPTIONAL -- Need R + ]], + [[ + ncr-FwdConfig-r18 CHOICE {release NULL, setup NCR-FwdConfig-r18 } OPTIONAL, -- Cond NCR + autonomousDenialParameters-r18 CHOICE {release NULL, setup AutonomousDenialParameters-r18} OPTIONAL, -- Need M + nonCollocatedTypeMRDC-r18 ENUMERATED { true } OPTIONAL, -- Need R + nonCollocatedTypeNR-CA-r18 ENUMERATED { true } OPTIONAL, -- Need R + uplinkTxSwitchingMoreBands-r18 CHOICE {release NULL, setup UplinkTxSwitchingMoreBands-r18 } OPTIONAL -- Need M ]] } @@ -3913,6 +5014,10 @@ ReconfigurationWithSync ::= SEQUENCE { ]], [[ sl-PathSwitchConfig-r17 SL-PathSwitchConfig-r17 OPTIONAL -- Cond DirectToIndirect-PathSwitch + ]], + [[ + rach-LessHO-r18 RACH-LessHO-r18 OPTIONAL, -- Need N + sl-IndirectPathMaintain-r18 ENUMERATED{true} OPTIONAL -- Cond MP ]] } @@ -3990,6 +5095,47 @@ CarrierState-r17::= CHOICE { activeBWP-r17 INTEGER (0..maxNrofBWPs) } +AutonomousDenialParameters-r18 ::= SEQUENCE { + autonomousDenialSlots-r18 ENUMERATED {n2, n5, n10, n15, n20, n30, spare2, spare1}, + autonomousDenialValidity-r18 ENUMERATED {n200, n500, n1000, n2000} +} + +RACH-LessHO-r18 ::= SEQUENCE { + targetNTA-r18 ENUMERATED {zero, source} OPTIONAL, -- Need N + beamIndication-r18 CHOICE { + tci-StateID-r18 TCI-StateId, + ssb-Index-r18 SSB-Index + } OPTIONAL, -- Need N + ... +} + +UplinkTxSwitchingMoreBands-r18::= SEQUENCE { + uplinkTxSwitchingBandList-r18 SEQUENCE (SIZE (1..maxSimultaneousBands)) OF FreqBandIndicatorNR OPTIONAL, -- Need M + uplinkTxSwitchingBandPairList-r18 UplinkTxSwitchingBandPairList-r18 OPTIONAL, -- Need M + uplinkTxSwitchingAssociatedBandDualUL-List-r18 UplinkTxSwitchingAssociatedBandDualUL-List-r18 OPTIONAL, -- Need M + ... +} + +UplinkTxSwitchingBandPairList-r18::= SEQUENCE (SIZE (1.. maxULTxSwitchingBandPairs)) OF UplinkTxSwitchingBandPairConfig-r18 + +UplinkTxSwitchingBandPairConfig-r18::= SEQUENCE { + bandInfoUL1-r18 UplinkTxSwitchingBandIndex-r18, + bandInfoUL2-r18 UplinkTxSwitchingBandIndex-r18, + switchingOptionConfigForBandPair-r18 ENUMERATED {switchedUL, dualUL}, + switching2T-Mode-r18 ENUMERATED {enabled} OPTIONAL, -- Need S + switchingPeriodConfigForBandPair-r18 ENUMERATED {n35us, n140us} OPTIONAL, -- Need S + ... +} + +UplinkTxSwitchingAssociatedBandDualUL-List-r18::= SEQUENCE (SIZE (0..maxSimultaneousBands)) OF UplinkTxSwitchingAssociatedBandDualUL-r18 + +UplinkTxSwitchingAssociatedBandDualUL-r18::= SEQUENCE { + transmitBand-r18 UplinkTxSwitchingBandIndex-r18, + associatedBand-r18 UplinkTxSwitchingBandIndex-r18 +} + +UplinkTxSwitchingBandIndex-r18::= INTEGER (1..maxSimultaneousBands) + -- TAG-CELLGROUPCONFIG-STOP -- TAG-CELLGROUPID-START @@ -4085,6 +5231,24 @@ CGI-Info-Logging-r16 ::= SEQUENCE { CLI-RSSI-Range-r16 ::= INTEGER(0..76) -- TAG-CLI-RSSI-RANGE-STOP +-- TAG-CLOCKQUALITYMETRICS-START + +ClockQualityMetrics-r18 ::= SEQUENCE { + synchronisationState-r18 ENUMERATED {locked, holdover, freerun, spare1} OPTIONAL, -- Need N + tracebilityToUTC-r18 BOOLEAN OPTIONAL, -- Need N + tracebilityToGNSS-r18 BOOLEAN OPTIONAL, -- Need N + clockFrequencyStability-r18 BIT STRING (SIZE(16)) OPTIONAL, -- Need N + clockAccuracy-r18 CHOICE { + value INTEGER (1..40000000), + index INTEGER (32..47) + } OPTIONAL, -- Need N + parentTimeSource-r18 ENUMERATED {syncE, pTP, gNSS,atomicClock, terrestialRadio, + serialTimeCode, nTP, handset, other, spare7, + spare6, spare5, spare4, spare3, spare2, spare1} OPTIONAL, -- Need N + ... +} + +-- TAG-CLOCKQUALITYMETRICS-STOP -- TAG-CODEBOOKCONFIG-START CodebookConfig ::= SEQUENCE { @@ -4272,6 +5436,86 @@ CodebookConfig-v1730 ::= SEQUENCE { } } +CodebookConfig-r18 ::= SEQUENCE { + codebookType CHOICE { + type2 CHOICE { + typeII-CJT-r18 SEQUENCE { + n1-n2-codebookSubsetRestrictionList-r18 N1-N2-CBSR-List-r18, + paramCombination-CJT-r18 INTEGER (1..7), + paramCombination-CJT-L-r18 SEQUENCE (SIZE (1..4)) OF INTEGER (1..5), + restrictedCMR-Selection-r18 ENUMERATED {enable}, + valueOfO3-r18 ENUMERATED {n1, n4} OPTIONAL, -- Need R + numberOfPMI-SubbandsPerCQI-Subband-r18 INTEGER(1..2), + typeII-RI-Restriction-r18 BIT STRING (SIZE (4)), + codebookMode-r18 INTEGER (1..2) + }, + typeII-CJT-PortSelection-r18 SEQUENCE { + paramCombination-CJT-PS-r18 INTEGER (1..5), + paramCombination-CJT-PS-alpha-r18 SEQUENCE (SIZE (1..4)) OF INTEGER (1..8), + restrictedCMR-Selection-r18 ENUMERATED {enable}, + valueOfO3-r18 ENUMERATED {n1, n4} OPTIONAL, -- Need R + valueOfN-CJT-r18 ENUMERATED {n2, n4} OPTIONAL, -- Need R + numberOfPMI-SubbandsPerCQI-Subband-r18 INTEGER(1..2), + typeII-PortSelectionRI-Restriction-r18 BIT STRING (SIZE (4)), + codebookMode-r18 INTEGER (1..2) + }, + typeII-Doppler-r18 SEQUENCE { + n1-n2-codebookSubsetRestriction-r18 N1-N2-CBSR-r18, + paramCombination-Doppler-r18 INTEGER (1..9), + td-dd-config-r18 TD-DD-Config-r18, + numberOfPMI-SubbandsPerCQI-Subband-r18 INTEGER(1..2), + predictionDelay-r18 ENUMERATED {m0,n0,n1,n2 }, + typeII-RI-Restriction-r18 BIT STRING (SIZE (4)) + }, + typeII-DopplerPortSelection-r18 SEQUENCE { + paramCombinationDoppler-PS-r18 INTEGER (1..8), + td-dd-config-r18 TD-DD-Config-r18, + valueOfN-Doppler-r18 ENUMERATED {n2, n4} OPTIONAL, -- Need R + numberOfPMI-SubbandsPerCQI-Subband-r18 INTEGER(1..2), + predictionDelay-r18 ENUMERATED {m0,n0,n1,n2 }, + typeII-PortSelectionRI-Restriction-r18 BIT STRING (SIZE (4)) + } + } + } +} + +N1-N2-CBSR-List-r18 ::= CHOICE { + two-one-r18 CHOICE {no-cbsr-r18 NULL, cbsr-list-r18 SEQUENCE (SIZE (1..4)) OF BIT STRING (SIZE (8))}, + two-two-r18 CHOICE {no-cbsr-r18 NULL, cbsr-list-r18 SEQUENCE (SIZE (1..4)) OF BIT STRING (SIZE (27))}, + four-one-r18 CHOICE {no-cbsr-r18 NULL, cbsr-list-r18 SEQUENCE (SIZE (1..4)) OF BIT STRING (SIZE (16))}, + three-two-r18 CHOICE {no-cbsr-r18 NULL, cbsr-list-r18 SEQUENCE (SIZE (1..4)) OF BIT STRING (SIZE (35))}, + six-one-r18 CHOICE {no-cbsr-r18 NULL, cbsr-list-r18 SEQUENCE (SIZE (1..4)) OF BIT STRING (SIZE (24))}, + four-two-r18 CHOICE {no-cbsr-r18 NULL, cbsr-list-r18 SEQUENCE (SIZE (1..4)) OF BIT STRING (SIZE (43))}, + eight-one-r18 CHOICE {no-cbsr-r18 NULL, cbsr-list-r18 SEQUENCE (SIZE (1..4)) OF BIT STRING (SIZE (32))}, + four-three-r18 CHOICE {no-cbsr-r18 NULL, cbsr-list-r18 SEQUENCE (SIZE (1..4)) OF BIT STRING (SIZE (59))}, + twelve-one-r18 CHOICE {no-cbsr-r18 NULL, cbsr-list-r18 SEQUENCE (SIZE (1..4)) OF BIT STRING (SIZE (48))}, + four-four-r18 CHOICE {no-cbsr-r18 NULL, cbsr-list-r18 SEQUENCE (SIZE (1..4)) OF BIT STRING (SIZE (75))}, + eight-two-r18 CHOICE {no-cbsr-r18 NULL, cbsr-list-r18 SEQUENCE (SIZE (1..4)) OF BIT STRING (SIZE (75))}, + sixteen-one-r18 CHOICE {no-cbsr-r18 NULL, cbsr-list-r18 SEQUENCE (SIZE (1..4)) OF BIT STRING (SIZE (64))} +} + +N1-N2-CBSR-r18 ::= CHOICE { + two-one-r18 CHOICE {no-cbsr-r18 NULL, cbsr-r18 BIT STRING (SIZE (8))}, + two-two-r18 CHOICE {no-cbsr-r18 NULL, cbsr-r18 BIT STRING (SIZE (27))}, + four-one-r18 CHOICE {no-cbsr-r18 NULL, cbsr-r18 BIT STRING (SIZE (16))}, + three-two-r18 CHOICE {no-cbsr-r18 NULL, cbsr-r18 BIT STRING (SIZE (35))}, + six-one-r18 CHOICE {no-cbsr-r18 NULL, cbsr-r18 BIT STRING (SIZE (24))}, + four-two-r18 CHOICE {no-cbsr-r18 NULL, cbsr-r18 BIT STRING (SIZE (43))}, + eight-one-r18 CHOICE {no-cbsr-r18 NULL, cbsr-r18 BIT STRING (SIZE (32))}, + four-three-r18 CHOICE {no-cbsr-r18 NULL, cbsr-r18 BIT STRING (SIZE (59))}, + twelve-one-r18 CHOICE {no-cbsr-r18 NULL, cbsr-r18 BIT STRING (SIZE (48))}, + four-four-r18 CHOICE {no-cbsr-r18 NULL, cbsr-r18 BIT STRING (SIZE (75))}, + eight-two-r18 CHOICE {no-cbsr-r18 NULL, cbsr-r18 BIT STRING (SIZE (75))}, + sixteen-one-r18 CHOICE {no-cbsr-r18 NULL, cbsr-r18 BIT STRING (SIZE (64))} +} + +TD-DD-Config-r18 ::= SEQUENCE { + vectorLengthDD-r18 ENUMERATED {n1,n2,n4,n8}, + unitDurationDD-r18 ENUMERATED {m1,m2} OPTIONAL, -- Need R + aperiodicResourceOffset-r18 INTEGER(1..2) OPTIONAL, -- Need R + tdCQI-r18 ENUMERATED {n11,n12,n2, spare1} OPTIONAL -- Need R +} + -- TAG-CODEBOOKCONFIG-STOP -- TAG-COMMONLOCATIONINFO-START @@ -4301,11 +5545,34 @@ CondReconfigToAddMod-r16 ::= SEQUENCE { ..., [[ condExecutionCondSCG-r17 OCTET STRING (CONTAINING CondReconfigExecCondSCG-r17) OPTIONAL -- Need M + ]], + [[ + condExecutionCondPSCell-r18 SEQUENCE (SIZE (1..2)) OF MeasId OPTIONAL, -- Cond condReconfigCHO-WithSCG + subsequentCondReconfig-r18 SubsequentCondReconfig-r18 OPTIONAL, -- Need M + securityCellSetId-r18 SecurityCellSetId-r18 OPTIONAL, -- Need M + scpac-ConfigComplete-r18 ENUMERATED {true} OPTIONAL -- Cond CPAC ]] } CondReconfigExecCondSCG-r17 ::= SEQUENCE (SIZE (1..2)) OF MeasId +SubsequentCondReconfig-r18 ::= SEQUENCE { + condExecutionCondToReleaseList-r18 CondExecutionCondToReleaseList-r18 OPTIONAL, -- Need N + condExecutionCondToAddModList-r18 CondExecutionCondToAddModList-r18 OPTIONAL, -- Need N + ... +} + +CondExecutionCondToAddModList-r18 ::= SEQUENCE (SIZE (1.. maxNrofCondCells-r16)) OF CondExecutionCondToAddMod-r18 + +CondExecutionCondToAddMod-r18 ::= SEQUENCE { + subsequentCondReconfigId-r18 CondReconfigId-r16, + subsequentCondExecutionCond-r18 SEQUENCE (SIZE (1..2)) OF MeasId OPTIONAL, -- Need M + subsequentCondExecutionCondSCG-r18 OCTET STRING (CONTAINING CondReconfigExecCondSCG-r17) OPTIONAL, -- Need M + ... +} + +CondExecutionCondToReleaseList-r18 ::= SEQUENCE (SIZE (1.. maxNrofCondCells-r16)) OF CondReconfigId-r16 + -- TAG-CONDRECONFIGTOADDMODLIST-STOP -- TAG-CONDITIONALRECONFIGURATION-START @@ -4313,11 +5580,28 @@ ConditionalReconfiguration-r16 ::= SEQUENCE { attemptCondReconfig-r16 ENUMERATED {true} OPTIONAL, -- Cond CHO condReconfigToRemoveList-r16 CondReconfigToRemoveList-r16 OPTIONAL, -- Need N condReconfigToAddModList-r16 CondReconfigToAddModList-r16 OPTIONAL, -- Need N - ... + ..., + [[ + scpac-ReferenceConfiguration-r18 CHOICE {release NULL, setup ReferenceConfiguration-r18} OPTIONAL, -- Need M + servingSecurityCellSetId-r18 SecurityCellSetId-r18 OPTIONAL, -- Need M + sk-CounterConfiguration-r18 SK-CounterConfiguration-r18 OPTIONAL -- Need M + ]] } CondReconfigToRemoveList-r16 ::= SEQUENCE (SIZE (1.. maxNrofCondCells-r16)) OF CondReconfigId-r16 +SK-CounterConfiguration-r18 ::= SEQUENCE { + sk-CounterConfigToReleaseList-r18 SEQUENCE (SIZE (1..maxSecurityCellSet-r18)) OF SecurityCellSetId-r18 OPTIONAL, -- Need N + sk-CounterConfigToAddModList-r18 SEQUENCE (SIZE (1..maxSecurityCellSet-r18)) OF SK-CounterConfig-r18 OPTIONAL -- Need N +} + +SK-CounterConfig-r18 ::= SEQUENCE { + securityCellSetId-r18 SecurityCellSetId-r18, + sk-CounterList-r18 SEQUENCE (SIZE (1..maxSK-Counter-r18)) OF SK-Counter +} + +SecurityCellSetId-r18 ::= INTEGER (1.. maxSecurityCellSet-r18) + -- TAG-CONDITIONALRECONFIGURATION-STOP -- TAG-CONFIGUREDGRANTCONFIG-START @@ -4362,55 +5646,86 @@ ConfiguredGrantConfig ::= SEQUENCE { timeReferenceSFN-r16 ENUMERATED {sfn512} OPTIONAL -- Need S ]], [[ - pathlossReferenceIndex2-r17 INTEGER (0..maxNrofPUSCH-PathlossReferenceRSs-1) OPTIONAL, -- Need R - srs-ResourceIndicator2-r17 INTEGER (0..15) OPTIONAL, -- Need R - precodingAndNumberOfLayers2-r17 INTEGER (0..63) OPTIONAL, -- Need R - timeDomainAllocation-v1710 INTEGER (16..63) OPTIONAL, -- Need M - timeDomainOffset-r17 INTEGER (0..40959) OPTIONAL, -- Need R - cg-SDT-Configuration-r17 CG-SDT-Configuration-r17 OPTIONAL -- Need M + pathlossReferenceIndex2-r17 INTEGER (0..maxNrofPUSCH-PathlossReferenceRSs-1) OPTIONAL, -- Need R + srs-ResourceIndicator2-r17 INTEGER (0..15) OPTIONAL, -- Need R + precodingAndNumberOfLayers2-r17 INTEGER (0..63) OPTIONAL, -- Need R + timeDomainAllocation-v1710 INTEGER (16..63) OPTIONAL, -- Need M + timeDomainOffset-r17 INTEGER (0..40959) OPTIONAL, -- Need R + cg-SDT-Configuration-r17 CG-SDT-Configuration-r17 OPTIONAL -- Need M + ]], + [[ + srs-ResourceSetId-r18 SRS-ResourceSetId OPTIONAL, -- Need R + cg-LTM-Configuration-r18 CG-RRC-Configuration-r18 OPTIONAL, -- Cond LTM + cg-SDT-PeriodicityExt-r18 ENUMERATED { + sym1x14x1280, sym2x14x1280, sym4x14x1280 , sym8x14x1280, sym16x14x1280, + sym32x14x1280, sym48x14x1280, sym64x14x1280, sym96x14x1280, sym128x14x1280, + sym192x14x1280, sym240x14x1280, sym256x14x1280, sym384x14x1280, sym472x14x1280, + sym480x14x1280, sym512x14x1280, sym768x14x1280, sym944x14x1280, sym960x14x1280, + sym1408x14x1280, sym1536x14x1280, sym1888x14x1280, sym1920x14x1280, + sym2816x14x1280, sym3072x14x1280, sym3776x14x1280, sym5632x14x1280, + sym6144x14x1280, sym7552x14x1280, sym7680x14x1280, sym11264x14x1280, + sym15104x14x1280, sym15360x14x1280, sym22528x14x1280, sym30208x14x1280, + sym45056x14x1280, sym60416x14x1280, sym90112x14x1280, sym180224x14x1280, + sym4x12x1280, sym8x12x1280, sym16x12x1280, sym32x12x1280, sym192x12x1280, + sym384x12x1280, sym960x12x1280, sym1888x12x1280, sym3776x12x1280, + sym5632x12x1280, sym11264x12x1280, spare13, spare12, spare11, spare10, spare9, + spare8, spare7, spare6, spare5, spare4, spare3, spare2, spare1 + } OPTIONAL, -- Need R + timeReferenceHyperSFN-r18 INTEGER (0..1023) OPTIONAL, -- Need R + cg-RRC-Configuration-r18 CG-RRC-Configuration-r18 OPTIONAL, -- Cond RACH-LessHO + applyIndicatedTCI-State-r18 ENUMERATED {first, second, both, spare1} OPTIONAL -- Need R ]] - } OPTIONAL, -- Need R + } OPTIONAL, -- Need R ..., [[ - cg-RetransmissionTimer-r16 INTEGER (1..64) OPTIONAL, -- Need R - cg-minDFI-Delay-r16 ENUMERATED + cg-RetransmissionTimer-r16 INTEGER (1..64) OPTIONAL, -- Need R + cg-minDFI-Delay-r16 ENUMERATED {sym7, sym1x14, sym2x14, sym3x14, sym4x14, sym5x14, sym6x14, sym7x14, sym8x14, sym9x14, sym10x14, sym11x14, sym12x14, sym13x14, sym14x14,sym15x14, sym16x14 - } OPTIONAL, -- Need R - cg-nrofPUSCH-InSlot-r16 INTEGER (1..7) OPTIONAL, -- Need R - cg-nrofSlots-r16 INTEGER (1..40) OPTIONAL, -- Need R - cg-StartingOffsets-r16 CG-StartingOffsets-r16 OPTIONAL, -- Need R - cg-UCI-Multiplexing-r16 ENUMERATED {enabled} OPTIONAL, -- Need R - cg-COT-SharingOffset-r16 INTEGER (1..39) OPTIONAL, -- Need R - betaOffsetCG-UCI-r16 INTEGER (0..31) OPTIONAL, -- Need R - cg-COT-SharingList-r16 SEQUENCE (SIZE (1..1709)) OF CG-COT-Sharing-r16 OPTIONAL, -- Need R - harq-ProcID-Offset-r16 INTEGER (0..15) OPTIONAL, -- Need M - harq-ProcID-Offset2-r16 INTEGER (0..15) OPTIONAL, -- Need M - configuredGrantConfigIndex-r16 ConfiguredGrantConfigIndex-r16 OPTIONAL, -- Cond CG-List - configuredGrantConfigIndexMAC-r16 ConfiguredGrantConfigIndexMAC-r16 OPTIONAL, -- Cond CG-IndexMAC - periodicityExt-r16 INTEGER (1..5120) OPTIONAL, -- Need R - startingFromRV0-r16 ENUMERATED {on, off} OPTIONAL, -- Need R - phy-PriorityIndex-r16 ENUMERATED {p0, p1} OPTIONAL, -- Need R - autonomousTx-r16 ENUMERATED {enabled} OPTIONAL -- Cond LCH-BasedPrioritization - ]], - [[ - cg-betaOffsetsCrossPri0-r17 CHOICE {release NULL, setup BetaOffsetsCrossPriSelCG-r17 } OPTIONAL, -- Need M - cg-betaOffsetsCrossPri1-r17 CHOICE {release NULL, setup BetaOffsetsCrossPriSelCG-r17 } OPTIONAL, -- Need M - mappingPattern-r17 ENUMERATED {cyclicMapping, sequentialMapping} OPTIONAL, -- Cond SRSsets - sequenceOffsetForRV-r17 INTEGER (0..3) OPTIONAL, -- Need R - p0-PUSCH-Alpha2-r17 P0-PUSCH-AlphaSetId OPTIONAL, -- Need R - powerControlLoopToUse2-r17 ENUMERATED {n0, n1} OPTIONAL, -- Need R - cg-COT-SharingList-r17 SEQUENCE (SIZE (1..50722)) OF CG-COT-Sharing-r17 OPTIONAL, -- Need R - periodicityExt-r17 INTEGER (1..40960) OPTIONAL, -- Need R - repK-v1710 ENUMERATED {n12, n16, n24, n32} OPTIONAL, -- Need R - nrofHARQ-Processes-v1700 INTEGER(17..32) OPTIONAL, -- Need M - harq-ProcID-Offset2-v1700 INTEGER (16..31) OPTIONAL, -- Need R - configuredGrantTimer-v1700 INTEGER(33..288) OPTIONAL, -- Need R - cg-minDFI-Delay-v1710 INTEGER (238..3584) OPTIONAL -- Need R - ]], - [[ - harq-ProcID-Offset-v1730 INTEGER (16..31) OPTIONAL, -- Need R - cg-nrofSlots-r17 INTEGER (1..320) OPTIONAL -- Need R + } OPTIONAL, -- Need R + cg-nrofPUSCH-InSlot-r16 INTEGER (1..7) OPTIONAL, -- Need R + cg-nrofSlots-r16 INTEGER (1..40) OPTIONAL, -- Need R + cg-StartingOffsets-r16 CG-StartingOffsets-r16 OPTIONAL, -- Need R + cg-UCI-Multiplexing-r16 ENUMERATED {enabled} OPTIONAL, -- Need R + cg-COT-SharingOffset-r16 INTEGER (1..39) OPTIONAL, -- Need R + betaOffsetCG-UCI-r16 INTEGER (0..31) OPTIONAL, -- Need R + cg-COT-SharingList-r16 SEQUENCE (SIZE (1..1709)) OF CG-COT-Sharing-r16 OPTIONAL, -- Need R + harq-ProcID-Offset-r16 INTEGER (0..15) OPTIONAL, -- Need M + harq-ProcID-Offset2-r16 INTEGER (0..15) OPTIONAL, -- Need M + configuredGrantConfigIndex-r16 ConfiguredGrantConfigIndex-r16 OPTIONAL, -- Cond CG-List + configuredGrantConfigIndexMAC-r16 ConfiguredGrantConfigIndexMAC-r16 OPTIONAL, -- Cond CG-IndexMAC + periodicityExt-r16 INTEGER (1..5120) OPTIONAL, -- Need R + startingFromRV0-r16 ENUMERATED {on, off} OPTIONAL, -- Need R + phy-PriorityIndex-r16 ENUMERATED {p0, p1} OPTIONAL, -- Need R + autonomousTx-r16 ENUMERATED {enabled} OPTIONAL -- Cond LCH-BasedPrioritization + ]], + [[ + cg-betaOffsetsCrossPri0-r17 CHOICE {release NULL, setup BetaOffsetsCrossPriSelCG-r17 } OPTIONAL, -- Need M + cg-betaOffsetsCrossPri1-r17 CHOICE {release NULL, setup BetaOffsetsCrossPriSelCG-r17 } OPTIONAL, -- Need M + mappingPattern-r17 ENUMERATED {cyclicMapping, sequentialMapping} OPTIONAL, -- Cond SRSsets + sequenceOffsetForRV-r17 INTEGER (0..3) OPTIONAL, -- Need R + p0-PUSCH-Alpha2-r17 P0-PUSCH-AlphaSetId OPTIONAL, -- Need R + powerControlLoopToUse2-r17 ENUMERATED {n0, n1} OPTIONAL, -- Need R + cg-COT-SharingList-r17 SEQUENCE (SIZE (1..50722)) OF CG-COT-Sharing-r17 OPTIONAL, -- Need R + periodicityExt-r17 INTEGER (1..40960) OPTIONAL, -- Need R + repK-v1710 ENUMERATED {n12, n16, n24, n32} OPTIONAL, -- Need R + nrofHARQ-Processes-v1700 INTEGER(17..32) OPTIONAL, -- Need M + harq-ProcID-Offset2-v1700 INTEGER (16..31) OPTIONAL, -- Need R + configuredGrantTimer-v1700 INTEGER(33..288) OPTIONAL, -- Need R + cg-minDFI-Delay-v1710 INTEGER (238..3584) OPTIONAL -- Need R + ]], + [[ + harq-ProcID-Offset-v1730 INTEGER (16..31) OPTIONAL, -- Need R + cg-nrofSlots-r17 INTEGER (1..320) OPTIONAL -- Need R + ]], + [[ + disableCG-RetransmissionMonitoring-r18 ENUMERATED {true} OPTIONAL, -- Need R + nrofSlotsInCG-Period-r18 INTEGER (2..32) OPTIONAL, -- Need R + uto-UCI-Config-r18 SEQUENCE { + nrofBitsInUTO-UCI-r18 INTEGER (3..8), + betaOffsetUTO-UCI-r18 INTEGER (0..31), + ... + } OPTIONAL -- Need R ]] } @@ -4465,6 +5780,24 @@ CG-SDT-Configuration-r17 ::= SEQUENCE { sdt-NrofDMRS-Sequences-r17 INTEGER (1..2) OPTIONAL -- Need M } +CG-RRC-Configuration-r18 ::= SEQUENCE { + cg-RRC-RetransmissionTimer-r18 INTEGER (1..288) OPTIONAL, -- Need R + cg-RRC-RSRP-ThresholdSSB-r18 RSRP-Range OPTIONAL, -- Need R + rrc-SSB-Subset-r18 CHOICE { + shortBitmap-r18 BIT STRING (SIZE (4)), + mediumBitmap-r18 BIT STRING (SIZE (8)), + longBitmap-r18 BIT STRING (SIZE (64)) + } OPTIONAL, -- Need S + rrc-SSB-PerCG-PUSCH-r18 ENUMERATED {oneEighth, oneFourth, half, one, two, four, eight, sixteen} OPTIONAL, -- Need M + rrc-P0-PUSCH-r18 INTEGER (-16..15) OPTIONAL, -- Need M + rrc-Alpha-r18 ENUMERATED {alpha0, alpha04, alpha05, alpha06, alpha07, alpha08, alpha09, alpha1} OPTIONAL, -- Need M + rrc-DMRS-Ports-r18 CHOICE { + dmrsType1-r18 BIT STRING (SIZE (8)), + dmrsType2-r18 BIT STRING (SIZE (12)) + } OPTIONAL, -- Need M + rrc-NrofDMRS-Sequences-r18 INTEGER (1..2) OPTIONAL, -- Need M + ... +} -- TAG-CONFIGUREDGRANTCONFIG-STOP -- TAG-CONFIGUREDGRANTCONFIGINDEX-START @@ -4512,7 +5845,10 @@ ControlResourceSet ::= SEQUENCE { controlResourceSetId-v1610 ControlResourceSetId-v1610 OPTIONAL -- Need S ]], [[ - followUnifiedTCI-State-r17 ENUMERATED {enabled} OPTIONAL -- Need R + followUnifiedTCI-State-r17 ENUMERATED {enabled} OPTIONAL -- Need R + ]], + [[ + applyIndicatedTCI-State-r18 ENUMERATED {first, second, both, none} OPTIONAL -- Cond FollowUTCI ]] } @@ -4567,6 +5903,9 @@ CSI-AperiodicTriggerState ::= SEQUENCE { ..., [[ ap-CSI-MultiplexingMode-r17 ENUMERATED {enabled} OPTIONAL -- Need R + ]], + [[ + ltm-AssociatedReportConfigInfo-r18 LTM-CSI-ReportConfigId-r18 OPTIONAL -- Need R ]] } @@ -4591,8 +5930,23 @@ CSI-AssociatedReportConfigInfo ::= SEQUENCE { OPTIONAL -- Cond Aperiodic }, csi-SSB-ResourceSet2-r17 INTEGER (1..maxNrofCSI-SSB-ResourceSetsPerConfigExt) - } OPTIONAL, -- Cond NoUnifiedTCI + } OPTIONAL, -- Need R csi-SSB-ResourceSetExt INTEGER (1..maxNrofCSI-SSB-ResourceSetsPerConfigExt) OPTIONAL -- Need R + ]], + [[ + resourcesForChannelTDCP-r18 SEQUENCE { + resourceSet2TDCP-r18 INTEGER (1..maxNrofNZP-CSI-RS-ResourceSetsPerConfig), + resourceSet3TDCP-r18 INTEGER (1..maxNrofNZP-CSI-RS-ResourceSetsPerConfig) OPTIONAL -- Need R + } OPTIONAL, -- Cond TDCP + applyIndicatedTCI-State-r18 CHOICE { + perSet-r18 ENUMERATED {first, second}, + perResource-r18 SEQUENCE (SIZE(1..maxNrofAP-CSI-RS-ResourcesPerSet)) OF ENUMERATED {first, second} + } OPTIONAL, -- Cond ApplyIndicatedTCI + applyIndicatedTCI-State2-r18 CHOICE { + perSet-r18 ENUMERATED {first, second}, + perResource-r18 SEQUENCE (SIZE(1..maxNrofAP-CSI-RS-ResourcesPerSet)) OF ENUMERATED {first, second} + } OPTIONAL, -- Cond SecondCSICMR + csi-ReportSubConfigTriggerList-r18 CSI-ReportSubConfigTriggerList-r18 OPTIONAL -- Need R ]] } @@ -4676,6 +6030,12 @@ CSI-MeasConfig ::= SEQUENCE { [[ sCellActivationRS-ConfigToAddModList-r17 SEQUENCE (SIZE (1..maxNrofSCellActRS-r17)) OF SCellActivationRS-Config-r17 OPTIONAL, -- Need N sCellActivationRS-ConfigToReleaseList-r17 SEQUENCE (SIZE (1..maxNrofSCellActRS-r17)) OF SCellActivationRS-ConfigId-r17 OPTIONAL -- Need N + ]], + [[ + ltm-CSI-ReportConfigToAddModList-r18 SEQUENCE (SIZE (1..maxNrofLTM-CSI-ReportConfigurations-r18)) OF LTM-CSI-ReportConfig-r18 + OPTIONAL, -- Need N + ltm-CSI-ReportConfigToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofLTM-CSI-ReportConfigurations-r18)) OF LTM-CSI-ReportConfigId-r18 + OPTIONAL -- Need N ]] } @@ -4807,6 +6167,17 @@ CSI-ReportConfig ::= SEQUENCE { ]], [[ codebookConfig-v1730 CodebookConfig-v1730 OPTIONAL -- Need R + ]], + [[ + groupBasedBeamReporting-v1800 SEQUENCE { + reportingMode-r18 ENUMERATED {jointULDL, onlyUL} + } OPTIONAL, -- Need R + reportQuantity-r18 TDCP-r18 OPTIONAL, -- Need R + codebookConfig-r18 CodebookConfig-r18 OPTIONAL, -- Need R + csi-ReportSubConfigToAddModList-r18 SEQUENCE (SIZE (1..maxNrofCSI-ReportSubconfigPerCSI-ReportConfig-r18)) OF CSI-ReportSubConfig-r18 + OPTIONAL, -- Need N + csi-ReportSubConfigToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofCSI-ReportSubconfigPerCSI-ReportConfig-r18)) OF CSI-ReportSubConfigId-r18 + OPTIONAL -- Need N ]] } @@ -4823,11 +6194,6 @@ CSI-ReportPeriodicityAndOffset ::= CHOICE { slots320 INTEGER(0..319) } -PUCCH-CSI-Resource ::= SEQUENCE { - uplinkBandwidthPartId BWP-Id, - pucch-Resource PUCCH-ResourceId -} - PortIndexFor8Ranks ::= CHOICE { portIndex8 SEQUENCE{ rank1-8 PortIndex8 OPTIONAL, -- Need R @@ -4856,12 +6222,55 @@ PortIndex8::= INTEGER (0..7) PortIndex4::= INTEGER (0..3) PortIndex2::= INTEGER (0..1) +TDCP-r18 ::= SEQUENCE { + delayDSetofLengthY-r18 SEQUENCE (SIZE (1.. maxNrofdelayD-r18)) OF DelayD, + phaseReporting-r18 ENUMERATED {enable} OPTIONAL -- Need R +} + +DelayD ::= ENUMERATED { symb4, slot1, slot2, slot3, slot4, slot5, slot6, slot10 } + +CSI-ReportSubConfig-r18 ::= SEQUENCE { + reportSubConfigId-r18 CSI-ReportSubConfigId-r18, + reportSubConfigParams-r18 CHOICE { + a1-parameters SEQUENCE { + codebookSubConfig-r18 CodebookConfig OPTIONAL, -- Need R + portSubsetIndicator-r18 CHOICE { + p2 BIT STRING (SIZE (2)), + p4 BIT STRING (SIZE (4)), + p8 BIT STRING (SIZE (8)), + p12 BIT STRING (SIZE (12)), + p16 BIT STRING (SIZE (16)), + p24 BIT STRING (SIZE (24)), + p32 BIT STRING (SIZE (32)) + } OPTIONAL, -- Need R + non-PMI-PortIndication-r18 SEQUENCE (SIZE (1..maxNrofNZP-CSI-RS-ResourcesPerConfig)) OF PortIndexFor8Ranks + OPTIONAL -- Need R + }, + a2-parameters SEQUENCE { + nzp-CSI-RS-ResourceList-r18 SEQUENCE (SIZE (1..maxNrofNZP-CSI-RS-ResourcesPerSet)) OF NZP-CSI-RS-ResourceIndex-r18 + } + } OPTIONAL, -- Need R + powerOffset-r18 INTEGER(0..23) OPTIONAL -- Need R +} + +NZP-CSI-RS-ResourceIndex-r18 ::= INTEGER (0..maxNrofNZP-CSI-RS-ResourcesPerSet-1-r18) + -- TAG-CSI-REPORTCONFIG-STOP -- TAG-CSI-REPORTCONFIGID-START CSI-ReportConfigId ::= INTEGER (0..maxNrofCSI-ReportConfigurations-1) -- TAG-CSI-REPORTCONFIGID-STOP +-- TAG-CSI-REPORTSUBCONFIGID-START + +CSI-ReportSubConfigId-r18 ::= INTEGER (0..maxNrofCSI-ReportSubconfigPerCSI-ReportConfig-1-r18) + +-- TAG-CSI-REPORTSUBCONFIGID-STOP +-- TAG-CSI-REPORTSUBCONFIGTRIGGERLIST-START + +CSI-ReportSubConfigTriggerList-r18 ::= SEQUENCE (SIZE(1..maxNrofCSI-ReportSubconfigPerCSI-ReportConfig-r18)) OF CSI-ReportSubConfigId-r18 + +-- TAG-CSI-REPORTSUBCONFIGTRIGGERLIST-STOP -- TAG-CSI-RESOURCECONFIG-START CSI-ResourceConfig ::= SEQUENCE { @@ -4997,7 +6406,11 @@ CSI-SemiPersistentOnPUSCH-TriggerState ::= SEQUENCE { associatedReportConfigInfo CSI-ReportConfigId, ..., [[ - sp-CSI-MultiplexingMode-r17 ENUMERATED {enabled} OPTIONAL -- Need R + sp-CSI-MultiplexingMode-r17 ENUMERATED {enabled} OPTIONAL -- Need R + ]], + [[ + csi-ReportSubConfigTriggerList-r18 CSI-ReportSubConfigTriggerList-r18 OPTIONAL, -- Need R + ltm-AssociatedReportConfigInfo-r18 LTM-CSI-ReportConfigId-r18 OPTIONAL -- Need R ]] } @@ -5157,8 +6570,10 @@ DMRS-DownlinkConfig ::= SEQUENCE { ..., [[ dmrs-Downlink-r16 ENUMERATED {enabled} OPTIONAL -- Need R + ]], + [[ + dmrs-TypeEnh-r18 ENUMERATED {enabled} OPTIONAL -- Need R ]] - } -- TAG-DMRS-DOWNLINKCONFIG-STOP @@ -5186,7 +6601,10 @@ DMRS-UplinkConfig ::= SEQUENCE { dmrs-UplinkTransformPrecoding-r16 CHOICE {release NULL, setup DMRS-UplinkTransformPrecoding-r16} OPTIONAL -- Need M ]] } OPTIONAL, -- Need R - ... + ..., + [[ + dmrs-TypeEnh-r18 ENUMERATED {enabled} OPTIONAL -- Need R + ]] } DMRS-UplinkTransformPrecoding-r16 ::= SEQUENCE { @@ -5219,9 +6637,15 @@ DownlinkConfigCommonSIB ::= SEQUENCE { [[ pei-Config-r17 PEI-Config-r17 OPTIONAL, -- Need R initialDownlinkBWP-RedCap-r17 BWP-DownlinkCommon OPTIONAL -- Need R + ]], + [[ + frequencyInfoDL-v1800 FrequencyInfoDL-SIB-v1800 OPTIONAL -- Need R ]] } +DownlinkConfigCommonSIB-v1760 ::= SEQUENCE { + frequencyInfoDL-v1760 FrequencyInfoDL-SIB-v1760 +} BCCH-Config ::= SEQUENCE { modificationPeriodCoeff ENUMERATED {n2, n4, n8, n16}, @@ -5361,6 +6785,44 @@ DRX-ConfigExt-v1700 ::= SEQUENCE { drx-HARQ-RTT-TimerUL-r17 INTEGER (0..448) } +DRX-ConfigExt2-v1800 ::= SEQUENCE { + drx-NonIntegerLongCycleStartOffset-r18 CHOICE { + ms1001over240 INTEGER(0..3), + ms25over6 INTEGER(0..3), + ms25over3 INTEGER(0..7), + ms1001over120 INTEGER(0..7), + ms100over9 INTEGER(0..10), + ms25over2 INTEGER(0..11), + ms40over3 INTEGER(0..12), + ms125over9 INTEGER(0..12), + ms50over3 INTEGER(0..15), + ms1001over60 INTEGER(0..15), + ms125over6 INTEGER(0..19), + ms200over9 INTEGER(0..21), + ms250over9 INTEGER(0..26), + ms100over3 INTEGER(0..32), + ms1001over30 INTEGER(0..32), + ms75over2 INTEGER(0..36), + ms125over3 INTEGER(0..40), + ms1001over24 INTEGER(0..40), + ms200over3 INTEGER(0..65), + ms1001over15 INTEGER(0..65), + ms250over3 INTEGER(0..82), + ms1001over12 INTEGER(0..82), + ms400over3 INTEGER(0..132), + ... + }, + shortDRX-r18 SEQUENCE { + drx-NonIntegerShortCycle-r18 ENUMERATED {ms1001over240, ms25over6, ms25over3, ms1001over120, ms100over9, ms25over2, + ms40over3, ms125over9, ms50over3, ms1001over60, ms125over6, ms200over9, + ms100over3, ms1001over30, ms125over3, ms1001over24, ms200over3, spare15, + spare14, spare13, spare12, spare11, spare10, spare9, spare8, spare7, spare6, + spare5, spare4, spare3, spare2, spare1}, + drx-ShortCycleTimer-r18 INTEGER (1..16) + } OPTIONAL, -- Need R + drx-TimeReferenceSFN-r18 ENUMERATED {sfn512} OPTIONAL -- Need N +} + -- TAG-DRX-CONFIG-STOP -- TAG-DRX-CONFIGSECONDARYGROUP-START @@ -5389,6 +6851,23 @@ DRX-ConfigSL-r17 ::= SEQUENCE { } -- TAG-DRX-CONFIGSL-STOP +-- TAG-EARLYUL-SYNCCONFIG-START + +EarlyUL-SyncConfig-r18 ::= SEQUENCE { + frequencyInfoUL-r18 FrequencyInfoUL, + rach-ConfigGeneric-r18 RACH-ConfigGeneric, + bwp-GenericParameters-r18 BWP, + ssb-PerRACH-Occasion-r18 ENUMERATED {oneEighth, oneFourth, oneHalf, one, two, four, eight, sixteen} OPTIONAL, -- Need R + prach-RootSequenceIndex-r18 CHOICE { + l839 INTEGER (0..837), + l139 INTEGER (0..137) + } OPTIONAL, -- Need R + ltm-PRACH-SubcarrierSpacing-r18 SubcarrierSpacing OPTIONAL, -- Need L139 + n-TimingAdvanceOffset-r18 ENUMERATED { n0, n25600, n39936, spare1 } OPTIONAL, -- Need R + ... +} + +-- TAG-EARLYUL-SYNCCONFIG-STOP -- TAG-EPHEMERISINFO-START EphemerisInfo-r17 ::= CHOICE { @@ -5419,6 +6898,19 @@ PositionStateVector-r17 ::= INTEGER (-33554432..33554431) VelocityStateVector-r17 ::= INTEGER (-131072..131071) -- TAG-EPHEMERISINFO-STOP +-- TAG-EPOCHTIME-START + +EpochTime-r17 ::= SEQUENCE { + sfn-r17 INTEGER(0..1023), + subFrameNR-r17 INTEGER(0..9) +} + +-- TAG-EPOCHTIME-STOP +-- TAG-EUTRACRNTI-START + +EUTRA-C-RNTI ::= BIT STRING (SIZE (16)) + +-- TAG-EUTRACRNTI-STOP -- TAG-FEATURECOMBINATION-START FeatureCombination-r17 ::= SEQUENCE { @@ -5426,8 +6918,8 @@ FeatureCombination-r17 ::= SEQUENCE { smallData-r17 ENUMERATED {true} OPTIONAL, -- Need R nsag-r17 NSAG-List-r17 OPTIONAL, -- Need R msg3-Repetitions-r17 ENUMERATED {true} OPTIONAL, -- Need R - spare4 ENUMERATED {true} OPTIONAL, -- Need R - spare3 ENUMERATED {true} OPTIONAL, -- Need R + msg1-Repetitions-r18 ENUMERATED {true} OPTIONAL, -- Need R + eRedCap-r18 ENUMERATED {true} OPTIONAL, -- Need R spare2 ENUMERATED {true} OPTIONAL, -- Need R spare1 ENUMERATED {true} OPTIONAL -- Need R } @@ -5452,7 +6944,11 @@ FeatureCombinationPreambles-r17 ::= SEQUENCE { msgA-RSRP-Threshold-r17 RSRP-Range OPTIONAL, -- Need R rsrp-ThresholdSSB-r17 RSRP-Range OPTIONAL, -- Need R deltaPreamble-r17 INTEGER (-1..6) OPTIONAL, -- Need R - ... + ..., + [[ + msg1-RepetitionNum-r18 ENUMERATED {n2, n4, n8, spare1} OPTIONAL, -- Cond Msg1Rep2 + msg1-RepetitionTimeOffsetROGroup-r18 ENUMERATED {n4, n8, n16, spare1} OPTIONAL -- Cond Msg1Rep3 + ]] } -- TAG-FEATURECOMBINATIONPREAMBLES-STOP @@ -5515,7 +7011,10 @@ FrequencyInfoDL ::= SEQUENCE { frequencyBandList MultiFrequencyBandListNR, absoluteFrequencyPointA ARFCN-ValueNR, scs-SpecificCarrierList SEQUENCE (SIZE (1..maxSCSs)) OF SCS-SpecificCarrier, - ... + ..., + [[ + referenceCell-r18 ServCellIndex OPTIONAL -- Cond SSBlessSCell + ]] } -- TAG-FREQUENCYINFODL-STOP @@ -5527,6 +7026,14 @@ FrequencyInfoDL-SIB ::= SEQUENCE { scs-SpecificCarrierList SEQUENCE (SIZE (1..maxSCSs)) OF SCS-SpecificCarrier } +FrequencyInfoDL-SIB-v1760 ::= SEQUENCE { + frequencyBandList-v1760 MultiFrequencyBandListNR-SIB-v1760 +} + +FrequencyInfoDL-SIB-v1800 ::= SEQUENCE { + frequencyBandListAerial-r18 MultiFrequencyBandListNR-Aerial-SIB-r18 +} + -- TAG-FREQUENCYINFODL-SIB-STOP -- TAG-FREQUENCYINFOUL-START @@ -5537,19 +7044,32 @@ FrequencyInfoUL ::= SEQUENCE { additionalSpectrumEmission AdditionalSpectrumEmission OPTIONAL, -- Need S p-Max P-Max OPTIONAL, -- Need S frequencyShift7p5khz ENUMERATED {true} OPTIONAL, -- Cond FDD-TDD-OrSUL-Optional - ... + ..., + [[ + additionalSpectrumEmission-v1760 AdditionalSpectrumEmission-v1760 OPTIONAL -- Need S + ]], + [[ + additionalSpectrumEmissionAerial-r18 AdditionalSpectrumEmission-r18 OPTIONAL -- Need S + ]] } -- TAG-FREQUENCYINFOUL-STOP -- TAG-FREQUENCYINFOUL-SIB-START -FrequencyInfoUL-SIB ::= SEQUENCE { +FrequencyInfoUL-SIB ::= SEQUENCE { frequencyBandList MultiFrequencyBandListNR-SIB OPTIONAL, -- Cond FDD-OrSUL absoluteFrequencyPointA ARFCN-ValueNR OPTIONAL, -- Cond FDD-OrSUL scs-SpecificCarrierList SEQUENCE (SIZE (1..maxSCSs)) OF SCS-SpecificCarrier, p-Max P-Max OPTIONAL, -- Need S frequencyShift7p5khz ENUMERATED {true} OPTIONAL, -- Cond FDD-TDD-OrSUL-Optional - ... + ..., + [[ + frequencyBandListAerial-r18 MultiFrequencyBandListNR-Aerial-SIB-r18 OPTIONAL -- Need S + ]] +} + +FrequencyInfoUL-SIB-v1760 ::= SEQUENCE { + frequencyBandList-v1760 MultiFrequencyBandListNR-SIB-v1760 } -- TAG-FREQUENCYINFOUL-SIB-STOP @@ -5586,6 +7106,11 @@ HighSpeedConfigFR2-r17 ::= SEQUENCE { Hysteresis ::= INTEGER (0..30) -- TAG-HYSTERESIS-STOP +-- TAG-HYSTERESISALTITUDE-START + +HysteresisAltitude-r18 ::= INTEGER (0..64) + +-- TAG-HYSTERESISALTITUDE-STOP -- TAG-HYSTERESISLOCATION-START HysteresisLocation-r17 ::= INTEGER (0..32768) @@ -5728,6 +7253,156 @@ LTE-NeighCellsCRS-AssistInfo-r17 ::= SEQUENCE { } -- TAG-LTE-NEIGHCELLSCRS-ASSISTINFOLIST-STOP +-- TAG-LTM-CANDIDATEID-START + +LTM-CandidateId-r18 ::= INTEGER (1..maxNrofLTM-Configs-r18) + +-- TAG-LTM-CANDIDATEID-STOP +-- TAG-LTM-CANDIDATE-START + +LTM-Candidate-r18 ::= SEQUENCE { + ltm-CandidateId-r18 LTM-CandidateId-r18, + ltm-CandidatePCI-r18 PhysCellId OPTIONAL, -- Need M + ltm-SSB-Config-r18 LTM-SSB-Config-r18 OPTIONAL, -- Need M + ltm-CandidateConfig-r18 OCTET STRING (CONTAINING RRCReconfiguration) OPTIONAL, -- Need M + ltm-ConfigComplete-r18 ENUMERATED {true} OPTIONAL, -- Need R + ltm-EarlyUL-SyncConfig-r18 OCTET STRING (CONTAINING EarlyUL-SyncConfig-r18) OPTIONAL, -- Need R + ltm-EarlyUL-SyncConfigSUL-r18 OCTET STRING (CONTAINING EarlyUL-SyncConfig-r18) OPTIONAL, -- Need R + ltm-TCI-Info-r18 LTM-TCI-Info-r18 OPTIONAL, -- Need M + ltm-NoResetID-r18 INTEGER (1..maxNrofLTM-Configs-plus1-r18) OPTIONAL, -- Need M + ltm-UE-MeasuredTA-ID-r18 INTEGER (1..maxNrofLTM-Configs-plus1-r18) OPTIONAL, -- Need M + ... +} + +LTM-SSB-Config-r18 ::= SEQUENCE { + ssb-Frequency-r18 ARFCN-ValueNR, + subcarrierSpacing-r18 SubcarrierSpacing, + ssb-Periodicity-r18 ENUMERATED {ms5, ms10, ms20, ms40, ms80, ms160, spare2, spare1} OPTIONAL, -- Need R + ssb-PositionsInBurst-r18 CHOICE { + shortBitmap BIT STRING (SIZE (4)), + mediumBitmap BIT STRING (SIZE (8)), + longBitmap BIT STRING (SIZE (64)) + } OPTIONAL, -- Need R + ss-PBCH-BlockPower-r18 INTEGER (-60..50) OPTIONAL, -- Need R + ... +} + +-- TAG-LTM-CANDIDATE-STOP +-- TAG-LTM-CONFIG-START + +-- WS modification: define a dedicated type +LTM-CSI-ResourceConfigToAddModList-r18 ::= SEQUENCE (SIZE (1..maxNrofLTM-CSI-ResourceConfigurations-r18)) OF LTM-CSI-ResourceConfig-r18 +LTM-CSI-ResourceConfigToReleaseList-r18 ::= SEQUENCE (SIZE (1..maxNrofLTM-CSI-ResourceConfigurations-r18)) OF LTM-CSI-ResourceConfigId-r18 + +LTM-Config-r18 ::= SEQUENCE { + ltm-ReferenceConfiguration-r18 CHOICE {release NULL, setup ReferenceConfiguration-r18} OPTIONAL, -- Need M + ltm-CandidateToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofLTM-Configs-r18)) OF LTM-CandidateId-r18 OPTIONAL, -- Need N + ltm-CandidateToAddModList-r18 SEQUENCE (SIZE (1..maxNrofLTM-Configs-r18)) OF LTM-Candidate-r18 OPTIONAL, -- Need N + ltm-ServingCellNoResetID-r18 INTEGER (1..maxNrofLTM-Configs-plus1-r18) OPTIONAL, -- Need N +-- WS modification: define a dedicated type +-- ltm-CSI-ResourceConfigToAddModList-r18 SEQUENCE (SIZE (1..maxNrofLTM-CSI-ResourceConfigurations-r18)) OF LTM-CSI-ResourceConfig-r18 +-- OPTIONAL, Need N +-- ltm-CSI-ResourceConfigToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofLTM-CSI-ResourceConfigurations-r18)) OF LTM-CSI-ResourceConfigId-r18 +-- OPTIONAL, Need N + ltm-CSI-ResourceConfigToAddModList-r18 LTM-CSI-ResourceConfigToAddModList-r18 OPTIONAL, -- Need N + ltm-CSI-ResourceConfigToReleaseList-r18 LTM-CSI-ResourceConfigToReleaseList-r18 OPTIONAL, -- Need N + attemptLTM-Switch-r18 ENUMERATED {true} OPTIONAL, -- Cond LTM-MCG + ltm-ServingCellUE-MeasuredTA-ID-r18 INTEGER (1..maxNrofLTM-Configs-plus1-r18) OPTIONAL, -- Need N + ... +} + +-- TAG-LTM-CONFIG-STOP +-- TAG-LTM-CSI-REPORTCONFIG-START + +LTM-CSI-ReportConfig-r18 ::= SEQUENCE { + ltm-CSI-ReportConfigId-r18 LTM-CSI-ReportConfigId-r18, + ltm-ResourcesForChannelMeasurement-r18 LTM-CSI-ResourceConfigId-r18, + ltm-ReportConfigType-r18 CHOICE { + periodic-r18 SEQUENCE { + reportSlotConfig-r18 CSI-ReportPeriodicityAndOffset, + pucch-CSI-ResourceList-r18 SEQUENCE (SIZE (1..maxNrofBWPs)) OF PUCCH-CSI-Resource + }, + semiPersistentOnPUCCH-r18 SEQUENCE { + reportSlotConfig-r18 CSI-ReportPeriodicityAndOffset, + pucch-CSI-ResourceList-r18 SEQUENCE (SIZE (1..maxNrofBWPs)) OF PUCCH-CSI-Resource + }, + semiPersistentOnPUSCH-r18 SEQUENCE { + reportSlotConfig-r18 CSI-ReportPeriodicityAndOffset, + reportSlotOffsetList-r18 SEQUENCE (SIZE (1.. maxNrofUL-Allocations-r16)) OF INTEGER (0..128), + reportSlotOffsetListDCI-0-2-r18 SEQUENCE (SIZE (1.. maxNrofUL-Allocations-r16)) OF INTEGER (0..128), + reportSlotOffsetListDCI-0-1-r18 SEQUENCE (SIZE (1.. maxNrofUL-Allocations-r16)) OF INTEGER (0..128), + p0alpha P0-PUSCH-AlphaSetId + }, + aperiodic-r18 SEQUENCE { + reportSlotOffsetList-r18 SEQUENCE (SIZE (1.. maxNrofUL-Allocations-r16)) OF INTEGER (0..128), + reportSlotOffsetListDCI-0-2-r18 SEQUENCE (SIZE (1.. maxNrofUL-Allocations-r16)) OF INTEGER (0..128), + reportSlotOffsetListDCI-0-1-r18 SEQUENCE (SIZE (1.. maxNrofUL-Allocations-r16)) OF INTEGER (0..128) + }, + ... + }, + ltm-ReportContent-r18 LTM-ReportContent-r18, + ... +} + +LTM-ReportContent-r18 ::= SEQUENCE { + nrOfReportedCells-r18 ENUMERATED {n1,n2,n3,n4}, + nrOfReportedRS-PerCell-r18 ENUMERATED {n1,n2,n3,n4}, + spCellInclusion-r18 ENUMERATED {true} OPTIONAL -- Need R +} + +-- TAG-LTM-CSI-REPORTCONFIG-STOP +-- TAG-LTM-CSI-REPORTCONFIGID-START + +LTM-CSI-ReportConfigId-r18 ::= INTEGER (0..maxNrofLTM-CSI-ReportConfigurations-1-r18) + +-- TAG-LTM-CSI-REPORTCONFIGID-STOP +-- TAG-LTM-CSI-RESOURCECONFIG-START + +LTM-CSI-ResourceConfig-r18 ::= SEQUENCE { + ltm-CSI-ResourceConfigId-r18 LTM-CSI-ResourceConfigId-r18, + ltm-CSI-SSB-ResourceSet-r18 LTM-CSI-SSB-ResourceSet-r18, + ... +} + +LTM-CSI-SSB-ResourceSet-r18 ::= SEQUENCE { + ltm-CSI-SSB-ResourceList-r18 SEQUENCE (SIZE (1..maxNrofLTM-CSI-SSB-ResourcesPerSet-r18)) OF SSB-Index, + ltm-CandidateIdList-r18 SEQUENCE (SIZE (1..maxNrofLTM-CSI-SSB-ResourcesPerSet-r18)) OF LTM-CandidateId-r18, + ... +} + +-- TAG-LTM-CSI-RESOURCECONFIG-STOP +-- TAG-LTM-CSI-RESOURCECONFIGID-START + +LTM-CSI-ResourceConfigId-r18 ::= INTEGER (0..maxNrofLTM-CSI-ResourceConfigurations-1-r18) + +-- TAG-LTM-CSI-RESOURCECONFIGID-STOP +-- TAG-LTM-TCI-INFO-START + +LTM-TCI-Info-r18 ::= SEQUENCE { + ltm-DL-OrJointTCI-StateToAddModList-r18 SEQUENCE (SIZE (1..maxNrofCandidateTCI-State-r18)) OF CandidateTCI-State-r18 + OPTIONAL, -- Need N + ltm-DL-OrJointTCI-StateToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofCandidateTCI-State-r18)) OF TCI-StateId + OPTIONAL, -- Need N + ltm-UL-TCI-StateToAddModList-r18 SEQUENCE (SIZE (1..maxNrofCandidateUL-TCI-r18)) OF CandidateTCI-UL-State-r18 + OPTIONAL, -- Need N + ltm-UL-TCI-StateToReleaseList-r18 SEQUENCE (SIZE (1.. maxNrofCandidateUL-TCI-r18)) OF TCI-UL-StateId-r17 + OPTIONAL, -- Need N + ltm-NZP-CSI-RS-ResourceToAddModList-r18 SEQUENCE (SIZE (1..maxNrofNZP-CSI-RS-Resources)) OF NZP-CSI-RS-Resource + OPTIONAL, -- Need N + ltm-NZP-CSI-RS-ResourceToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofNZP-CSI-RS-Resources)) OF NZP-CSI-RS-ResourceId + OPTIONAL, -- Need N + ltm-NZP-CSI-RS-ResourceSetToAddModList-r18 SEQUENCE (SIZE (1..maxNrofNZP-CSI-RS-ResourceSets)) OF NZP-CSI-RS-ResourceSet + OPTIONAL, -- Need N + ltm-NZP-CSI-RS-ResourceSetToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofNZP-CSI-RS-ResourceSets)) OF NZP-CSI-RS-ResourceSetId + OPTIONAL, -- Need N + pathlossReferenceRS-ToAddModList-r18 SEQUENCE (SIZE (1..maxNrofPathlossReferenceRSs-r17)) OF PathlossReferenceRS-r17 + OPTIONAL, -- Need N + pathlossReferenceRS-ToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofPathlossReferenceRSs-r17)) OF PathlossReferenceRS-Id-r17 + OPTIONAL, -- Need N + unifiedTCI-StateType-r18 ENUMERATED {separate, joint} OPTIONAL, -- Need R + ... +} +-- TAG-LTM-TCI-INFO-STOP -- TAG-MAC-CELLGROUPCONFIG-START MAC-CellGroupConfig ::= SEQUENCE { @@ -5773,6 +7448,13 @@ MAC-CellGroupConfig ::= SEQUENCE { ]], [[ posMG-Request-r17 ENUMERATED {enabled} OPTIONAL -- Need R + ]], + [[ + drx-ConfigExt2-v1800 CHOICE {release NULL, setup DRX-ConfigExt2-v1800 } OPTIONAL, -- Need M + additionalBS-TableAllowed-r18 BIT STRING (SIZE (maxNrofLCGs-r18)) OPTIONAL, -- Need R + dsr-ConfigToAddModList-r18 SEQUENCE (SIZE (1..maxNrofLCGs-r18)) OF LCG-DSR-Config-r18 OPTIONAL, -- Need N + dsr-ConfigToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofLCGs-r18)) OF LCG-Id-r18 OPTIONAL, -- Need N + tar-Config-r18 CHOICE {release NULL, setup TAR-Config-r18 } OPTIONAL -- Need M ]] } @@ -5792,6 +7474,14 @@ MBS-RNTI-SpecificConfig-r17 ::= SEQUENCE { MBS-RNTI-SpecificConfigId-r17 ::= INTEGER (0..maxG-RNTI-1-r17) +LCG-DSR-Config-r18 ::= SEQUENCE { + lcg-Id-r18 LCG-Id-r18, + remainingTimeThreshold-r18 INTEGER (1..64), + ... +} + +LCG-Id-r18 ::= INTEGER (0..maxLCG-ID) + -- TAG-MAC-CELLGROUPCONFIG-STOP -- TAG-MEASCONFIG-START @@ -5812,6 +7502,9 @@ MeasConfig ::= SEQUENCE { ..., [[ interFrequencyConfig-NoGap-r16 ENUMERATED {true} OPTIONAL -- Need R + ]], + [[ + effectiveMeasWindowConfig-r18 CHOICE {release NULL, setup MeasWindowConfig-r18} OPTIONAL -- Need M ]] } @@ -5918,7 +7611,14 @@ MeasId ::= INTEGER (1..maxNrofMeasId) MeasIdleConfigSIB-r16 ::= SEQUENCE { measIdleCarrierListNR-r16 SEQUENCE (SIZE (1..maxFreqIdle-r16)) OF MeasIdleCarrierNR-r16 OPTIONAL, -- Need S measIdleCarrierListEUTRA-r16 SEQUENCE (SIZE (1..maxFreqIdle-r16)) OF MeasIdleCarrierEUTRA-r16 OPTIONAL, -- Need S - ... + ..., + [[ + measIdleCarrierListNR-LessThan5MHz-r18 SEQUENCE (SIZE (1..maxFreqIdle-r16)) OF MeasIdleCarrierNR-r16 OPTIONAL, -- Cond LessThan5MHz + measReselectionCarrierListNR-r18 SEQUENCE (SIZE (1..maxFreqIdle-r16)) OF MeasReselectionCarrierNR-r18 OPTIONAL, -- Need S + measReselectionCarrierListNR-LessThan5MHz-r18 SEQUENCE (SIZE (1..maxFreqIdle-r16)) OF MeasReselectionCarrierNR-r18 OPTIONAL, -- Cond LessThan5MHz + measIdleValidityDuration-r18 MeasurementValidityDuration-r18 OPTIONAL, -- Need S + measReselectionValidityDuration-r18 MeasurementValidityDuration-r18 OPTIONAL -- Need S + ]] } MeasIdleConfigDedicated-r16 ::= SEQUENCE { @@ -5926,7 +7626,12 @@ MeasIdleConfigDedicated-r16 ::= SEQUENCE { measIdleCarrierListEUTRA-r16 SEQUENCE (SIZE (1..maxFreqIdle-r16)) OF MeasIdleCarrierEUTRA-r16 OPTIONAL, -- Need N measIdleDuration-r16 ENUMERATED{sec10, sec30, sec60, sec120, sec180, sec240, sec300, spare}, validityAreaList-r16 ValidityAreaList-r16 OPTIONAL, -- Need N - ... + ..., + [[ + measReselectionCarrierListNR-r18 SEQUENCE (SIZE (1..maxFreqIdle-r16)) OF MeasReselectionCarrierNR-r18 OPTIONAL, -- Need S + measIdleValidityDuration-r18 MeasurementValidityDuration-r18 OPTIONAL, -- Need S + measReselectionValidityDuration-r18 MeasurementValidityDuration-r18 OPTIONAL -- Need S + ]] } ValidityAreaList-r16 ::= SEQUENCE (SIZE (1..maxFreqIdle-r16)) OF ValidityArea-r16 @@ -5972,6 +7677,11 @@ MeasIdleCarrierEUTRA-r16 ::= SEQUENCE { ... } +MeasReselectionCarrierNR-r18 ::= SEQUENCE { + carrierFreq-r18 ARFCN-ValueNR, + ... +} + CellListNR-r16 ::= SEQUENCE (SIZE (1..maxCellMeasIdle-r16)) OF PCI-Range CellListEUTRA-r16 ::= SEQUENCE (SIZE (1..maxCellMeasIdle-r16)) OF EUTRA-PhysCellIdRange @@ -6054,13 +7764,16 @@ MeasObjectEUTRA::= SEQUENCE { cellsToRemoveListEUTRAN EUTRA-CellIndexList OPTIONAL, -- Need N cellsToAddModListEUTRAN SEQUENCE (SIZE (1..maxCellMeasEUTRA)) OF EUTRA-Cell OPTIONAL, -- Need N excludedCellsToRemoveListEUTRAN EUTRA-CellIndexList OPTIONAL, -- Need N - excludedCellsToAddModListEUTRAN SEQUENCE (SIZE (1..maxCellMeasEUTRA)) OF EUTRA-ExcludedCell OPTIONAL, -- Need N + excludedCellsToAddModListEUTRAN SEQUENCE (SIZE (1..maxCellMeasEUTRA)) OF EUTRA-ExcludedCell OPTIONAL, -- Need N eutra-PresenceAntennaPort1 EUTRA-PresenceAntennaPort1, eutra-Q-OffsetRange EUTRA-Q-OffsetRange OPTIONAL, -- Need R widebandRSRQ-Meas BOOLEAN, ..., [[ associatedMeasGap-r17 MeasGapId-r17 OPTIONAL -- Need R + ]], + [[ + measSequence-r18 MeasSequence-r18 OPTIONAL -- Need R ]] } @@ -6121,15 +7834,19 @@ MeasObjectNR ::= SEQUENCE { [[ associatedMeasGapSSB-r17 MeasGapId-r17 OPTIONAL, -- Need R associatedMeasGapCSIRS-r17 MeasGapId-r17 OPTIONAL, -- Need R - smtc4list-r17 SSB-MTC4List-r17 OPTIONAL, -- Need R + smtc4list-r17 SSB-MTC4List-r17 OPTIONAL, -- Need R measCyclePSCell-r17 ENUMERATED {ms160, ms256, ms320, ms512, ms640, ms1024, ms1280, spare1} OPTIONAL, -- Cond SCG cellsToAddModListExt-v1710 CellsToAddModListExt-v1710 OPTIONAL -- Need N - ]], - [[ + ]], + [[ associatedMeasGapSSB2-v1720 MeasGapId-r17 OPTIONAL, -- Cond AssociatedGapSSB associatedMeasGapCSIRS2-v1720 MeasGapId-r17 OPTIONAL -- Cond AssociatedGapCSIRS - ]] + ]], + [[ + measSequence-r18 MeasSequence-r18 OPTIONAL, -- Need R + cellsToAddModListExt-v1800 CellsToAddModListExt-v1800 OPTIONAL -- Need R + ]] } SSB-MTC3List-r16::= SEQUENCE (SIZE(1..4)) OF SSB-MTC3-r16 @@ -6161,6 +7878,9 @@ SSB-ConfigMobility::= SEQUENCE { [[ cca-CellsToAddModList-r17 PCI-List OPTIONAL, -- Need N cca-CellsToRemoveList-r17 PCI-List OPTIONAL -- Need N + ]], + [[ + ssb-ToMeasureAltitudeBasedList-r18 CHOICE {release NULL, setup SSB-ToMeasureAltitudeBasedList-r18 } OPTIONAL -- Need M ]] } @@ -6184,6 +7904,8 @@ CellsToAddModList ::= SEQUENCE (SIZE (1..maxNrofCellMeas)) OF Cell CellsToAddModListExt-v1710 ::= SEQUENCE (SIZE (1..maxNrofCellMeas)) OF CellsToAddModExt-v1710 +CellsToAddModListExt-v1800 ::= SEQUENCE (SIZE (1..maxNrofCellMeas)) OF CellsToAddModExt-v1800 + CellsToAddMod ::= SEQUENCE { physCellId PhysCellId, cellIndividualOffset Q-OffsetRangeList @@ -6194,6 +7916,10 @@ CellsToAddModExt-v1710 ::= SEQUENCE { ntn-PolarizationUL-r17 ENUMERATED {rhcp,lhcp,linear} OPTIONAL -- Need R } +CellsToAddModExt-v1800 ::= SEQUENCE { + ntn-NeighbourCellInfo-r18 NTN-NeighbourCellInfo-r18 OPTIONAL -- Cond NeighbourCell +} + RMTC-Config-r16 ::= SEQUENCE { rmtc-Periodicity-r16 ENUMERATED {ms40, ms80, ms160, ms320, ms640}, rmtc-SubframeOffset-r16 INTEGER(0..639) OPTIONAL, -- Need M @@ -6229,6 +7955,23 @@ SSB-PositionQCL-Cell-r17 ::= SEQUENCE { ssb-PositionQCL-r17 SSB-PositionQCL-Relation-r17 } +SSB-ToMeasureAltitudeBasedList-r18 ::= SEQUENCE (SIZE (1..maxNrofAltitudeRanges-r18)) OF SSB-ToMeasureAltitudeBased-r18 + +SSB-ToMeasureAltitudeBased-r18 ::= SEQUENCE { + altitudeRange-r18 SEQUENCE { + altitudeMin-r18 Altitude-r18 OPTIONAL, -- Need S + altitudeMax-r18 Altitude-r18 OPTIONAL, -- Need S + altitudeHyst-r18 HysteresisAltitude-r18 OPTIONAL -- Need R + }, + ssb-ToMeasure-r18 SSB-ToMeasure OPTIONAL -- Need S +} + +NTN-NeighbourCellInfo-r18 ::= SEQUENCE { + epochTime-r18 EpochTime-r17, + ephemerisInfo-r18 EphemerisInfo-r17, + referenceLocation-r18 ReferenceLocation-r17 OPTIONAL -- Need R +} + -- TAG-MEASOBJECTNR-STOP -- TAG-MEASOBJECTNR-SL-START @@ -6237,6 +7980,12 @@ MeasObjectNR-SL-r16 ::= SEQUENCE { tx-PoolMeasToAddModList-r16 Tx-PoolMeasList-r16 OPTIONAL -- Need N } +MeasObjectNR-SL-r18 ::= SEQUENCE { + sl-Frequency-r18 INTEGER (1..maxNrofFreqSL-r16), + tx-PoolMeasToRemoveList-r18 Tx-PoolMeasList-r16 OPTIONAL, -- Need N + tx-PoolMeasToAddModList-r18 Tx-PoolMeasList-r16 OPTIONAL -- Need N +} + Tx-PoolMeasList-r16 ::= SEQUENCE (SIZE (1..maxNrofSL-PoolToMeasureNR-r16)) OF SL-ResourcePoolID-r16 -- TAG-MEASOBJECTNR-SL-STOP @@ -6267,7 +8016,8 @@ MeasObjectToAddMod ::= SEQUENCE { measObjectNR-SL-r16 MeasObjectNR-SL-r16, measObjectCLI-r16 MeasObjectCLI-r16, measObjectRxTxDiff-r17 MeasObjectRxTxDiff-r17, - measObjectRelay-r17 SL-MeasObject-r16 + measObjectRelay-r17 SL-MeasObject-r16, + measObjectNR-SL-r18 MeasObjectNR-SL-r18 } } @@ -6353,6 +8103,10 @@ MeasResults ::= SEQUENCE { -- Contains PC5 SL-MeasResultRelay-r17 ul-PDCP-ExcessDelayResultList-r17 UL-PDCP-ExcessDelayResultList-r17 OPTIONAL, coarseLocationInfo-r17 OCTET STRING OPTIONAL + ]], + [[ + altitudeUE-r18 Altitude-r18 OPTIONAL, + cellsMetReportOnLeaveList-r18 SEQUENCE (SIZE (1..maxCellReport)) OF PhysCellId OPTIONAL ]] } @@ -6382,14 +8136,17 @@ MeasResultNR ::= SEQUENCE { ..., [[ cgi-Info CGI-InfoNR OPTIONAL - ]] , + ]], [[ choCandidate-r17 ENUMERATED {true} OPTIONAL, choConfig-r17 SEQUENCE (SIZE (1..2)) OF CondTriggerConfig-r16 OPTIONAL, triggeredEvent-r17 SEQUENCE { timeBetweenEvents-r17 TimeBetweenEvent-r17 OPTIONAL, - firstTriggeredEvent ENUMERATED {condFirstEvent, condSecondEvent} OPTIONAL + firstTriggeredEvent-r17 ENUMERATED {condFirstEvent, condSecondEvent} OPTIONAL } OPTIONAL + ]], + [[ + firstEntering-r18 ENUMERATED {true} OPTIONAL ]] } @@ -6556,7 +8313,11 @@ MeasResultsPerCellIdleNR-r16 ::= SEQUENCE { rsrq-Result-r16 RSRQ-Range OPTIONAL, resultsSSB-Indexes-r16 ResultsPerSSB-IndexList-r16 OPTIONAL }, - ... + ..., + [[ + validityStatus-r18 MeasurementValidityDuration-r18 OPTIONAL + ]] + } ResultsPerSSB-IndexList-r16 ::= SEQUENCE (SIZE (1.. maxNrofIndexesToReport)) OF ResultsPerSSB-IndexIdle-r16 @@ -6596,7 +8357,10 @@ MeasResultList2NR ::= SEQUENCE (SIZE (1..maxFreq)) OF MeasResult2N MeasResultsSL-r16 ::= SEQUENCE { measResultsListSL-r16 CHOICE { measResultNR-SL-r16 MeasResultNR-SL-r16, - ... + ..., + [[ + measResultNR-SL-r18 MeasResultNR-SL-r18 + ]] }, ... } @@ -6612,7 +8376,23 @@ MeasResultCBR-NR-r16 ::= SEQUENCE { ... } +MeasResultNR-SL-r18 ::= SEQUENCE { + measResultListCBR-DedicatedSL-PRS-r18 SEQUENCE (SIZE (1..maxNrofDedicatedSL-PRS-PoolToMeas-r18)) OF MeasResultCBR-DedicatedSL-PRS-r18, + ... +} + +MeasResultCBR-DedicatedSL-PRS-r18 ::= SEQUENCE { + sl-PRS-ResourcePoolID-r18 SL-PRS-ResourcePoolID-r18, + sL-CBR-ResultsDedicatedSL-PRS-RP-r18 SL-CBR-r16, + ... +} + -- TAG-MEASRESULTSSL-STOP +-- TAG-MEASSEQUENCE-START + +MeasSequence-r18 ::= INTEGER (1..maxMeasSequence-r18) + +-- TAG-MEASSEQUENCE-STOP -- TAG-MEASTRIGGERQUANTITYEUTRA-START MeasTriggerQuantityEUTRA::= CHOICE { @@ -6628,6 +8408,24 @@ RSRQ-RangeEUTRA ::= INTEGER (0..34) SINR-RangeEUTRA ::= INTEGER (0..127) -- TAG-MEASTRIGGERQUANTITYEUTRA-STOP +-- TAG-MEASUREMENTVALIDITYDURATION-START + +MeasurementValidityDuration-r18 ::= ENUMERATED {s5, s10, s20, s50, s100, spare3, spare2, spare1} + +-- TAG-MEASUREMENTVALIDITYDURATION-STOP +-- TAG-MEASWINDOWCONFIG-START + +MeasWindowConfig-r18 ::= SEQUENCE { + windowOffsetPeriodicity CHOICE { + periodicityMs40 INTEGER (0..39), + periodicityMs80 INTEGER (0..79), + ... + }, + windowDuration ENUMERATED {ms2, ms5, ms5dot5, spare1}, + ... +} + +-- TAG-MEASWINDOWCONFIG-STOP -- TAG-MOBILITYSTATEPARAMETERS-START MobilityStateParameters ::= SEQUENCE{ @@ -6711,19 +8509,40 @@ NR-MultiBandInfo ::= SEQUENCE { nr-NS-PmaxList NR-NS-PmaxList OPTIONAL -- Need S } +MultiFrequencyBandListNR-SIB-v1760 ::= SEQUENCE (SIZE (1.. maxNrofMultiBands)) OF NR-MultiBandInfo-v1760 + +NR-MultiBandInfo-v1760 ::= SEQUENCE { + nr-NS-PmaxList-v1760 NR-NS-PmaxList-v1760 OPTIONAL -- Need S +} + +MultiFrequencyBandListNR-Aerial-SIB-r18 ::= SEQUENCE (SIZE (1.. maxNrofMultiBands)) OF NR-MultiBandInfoAerial-r18 + +NR-MultiBandInfoAerial-r18 ::= SEQUENCE { + freqBandIndicatorNR-Aerial-r18 FreqBandIndicatorNR OPTIONAL, -- Cond OptULNotSIB2 + nr-NS-PmaxListAerial-r18 NR-NS-PmaxListAerial-r18 OPTIONAL -- Need S +} + -- TAG-MULTIFREQUENCYBANDLISTNR-SIB-STOP -- TAG-MUSIM-GAPCONFIG-START MUSIM-GapConfig-r17 ::= SEQUENCE { - musim-GapToReleaseList-r17 SEQUENCE (SIZE (1..3)) OF MUSIM-GapId-r17 OPTIONAL, -- Need N - musim-GapToAddModList-r17 SEQUENCE (SIZE (1..3)) OF MUSIM-Gap-r17 OPTIONAL, -- Need N - musim-AperiodicGap-r17 MUSIM-GapInfo-r17 OPTIONAL, -- Need N - ... + musim-GapToReleaseList-r17 SEQUENCE (SIZE (1..3)) OF MUSIM-GapId-r17 OPTIONAL, -- Need N + musim-GapToAddModList-r17 SEQUENCE (SIZE (1..3)) OF MUSIM-Gap-r17 OPTIONAL, -- Need N + musim-AperiodicGap-r17 MUSIM-GapInfo-r17 OPTIONAL, -- Need N + ..., + [[ + musim-GapToAddModListExt-v1820 SEQUENCE (SIZE (1..3)) OF MUSIM-GapExt-v1820 OPTIONAL, -- Need N + musim-GapKeep-r18 ENUMERATED {true} OPTIONAL -- Need N + ]] } -MUSIM-Gap-r17 ::= SEQUENCE { - musim-GapId-r17 MUSIM-GapId-r17, - musim-GapInfo-r17 MUSIM-GapInfo-r17 +MUSIM-Gap-r17 ::= SEQUENCE { + musim-GapId-r17 MUSIM-GapId-r17, + musim-GapInfo-r17 MUSIM-GapInfo-r17 +} + +MUSIM-GapExt-v1820 ::= SEQUENCE { + gapPriority-r18 GapPriority-r17 } -- TAG-MUSIM-GAPCONFIG-STOP @@ -6757,6 +8576,206 @@ MUSIM-Starting-SFN-AndSubframe-r17 ::= SEQUENCE { } -- TAG-MUSIM-GAPINFO-STOP +-- TAG-N3C-INDIRECTPATHCONFIGRELAY-START + +N3C-IndirectPathConfigRelay-r18 ::= SEQUENCE { + n3c-MappingToReleaseList-r18 SEQUENCE (SIZE (1..maxLC-ID)) OF SL-RemoteUE-RB-Identity-r17 OPTIONAL, -- Need N + n3c-MappingToAddModList-r18 SEQUENCE (SIZE (1..maxLC-ID)) OF N3C-MappingConfig-r18 OPTIONAL, -- Need N + ... +} + +N3C-MappingConfig-r18 ::= SEQUENCE { + n3c-RemoteUE-RB-Identity-r18 SL-RemoteUE-RB-Identity-r17, + n3c-RLC-ChannelUu-r18 Uu-RelayRLC-ChannelID-r17, + ... +} + +-- TAG-N3C-INDIRECTPATHCONFIGRELAY-STOP +-- TAG-N3C-INDIRECTPATHADDCHANGE-START + +N3C-IndirectPathAddChange-r18 ::= SEQUENCE { + n3c-RelayIdentification-r18 N3C-RelayUE-Info-r18, + ... +} + +-- TAG-N3C-INDIRECTPATHADDCHANGE-STOP +-- TAG-N3CRELAYUEINFO-START + +N3C-RelayUE-Info-r18 ::= SEQUENCE { + n3c-CellGlobalId-r18 SEQUENCE { + n3c-PLMN-Id-r18 PLMN-Identity, + n3c-CellIdentity-r18 CellIdentity + }, + n3c-C-RNTI-r18 RNTI-Value +} + +-- TAG-N3CRELAYUEINFO-STOP +-- TAG-NCR-APERIODICFWDCONFIG-START + +NCR-AperiodicFwdConfig-r18 ::= SEQUENCE { + aperiodicFwdTimeRsrcToAddModList-r18 SEQUENCE (SIZE (1..maxNrofAperiodicFwdTimeResource-r18)) OF NCR-AperiodicFwdTimeResource-r18 + OPTIONAL, -- Need N + aperiodicFwdTimeRsrcToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofAperiodicFwdTimeResource-r18)) OF NCR-AperiodicFwdTimeResourceId-r18 + OPTIONAL, -- Need N + referenceSCS-r18 SubcarrierSpacing OPTIONAL, -- Need M + aperiodicBeamFieldWidth-r18 INTEGER (1..6) OPTIONAL, -- Need M + numberOfFields-r18 INTEGER (1..32) OPTIONAL, -- Need M + ... +} + +NCR-AperiodicFwdTimeResource-r18 ::= SEQUENCE { + aperiodicFwdTimeRsrcId-r18 NCR-AperiodicFwdTimeResourceId-r18, + slotOffsetAperiodic-r18 INTEGER (0..14), + symbolOffset-r18 INTEGER (0..maxNrofSymbols-1), + durationInSymbols-r18 INTEGER (1..28), + ... +} + +NCR-AperiodicFwdTimeResourceId-r18 ::= INTEGER (0..maxNrofAperiodicFwdTimeResource-1-r18) + +-- TAG-NCR-APERIODICFWDCONFIG-STOP +-- TAG-NCR-FWDCONFIG-START + +NCR-FwdConfig-r18 ::= SEQUENCE { + periodicFwdRsrcSetToAddModList-r18 SEQUENCE (SIZE (1..maxNrofPeriodicFwdResourceSet-r18)) OF NCR-PeriodicFwdResourceSet-r18 + OPTIONAL, -- Need N + periodicFwdRsrcSetToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofPeriodicFwdResourceSet-r18)) OF NCR-PeriodicFwdResourceSetId-r18 + OPTIONAL, -- Need N + aperiodicFwdConfig-r18 CHOICE {release NULL, setup NCR-AperiodicFwdConfig-r18} OPTIONAL, -- Need M + semiPersistentFwdRsrcSetToAddModList-r18 SEQUENCE (SIZE (1..maxNrofSemiPersistentFwdResourceSet-r18)) OF + NCR-SemiPersistentFwdResourceSet-r18 OPTIONAL, -- Need N + semiPersistentFwdRsrcSetToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofSemiPersistentFwdResourceSet-r18)) OF + NCR-SemiPersistentFwdResourceSetId-r18 OPTIONAL, -- Need N + ... +} + +-- TAG-NCR-FWDCONFIG-STOP +-- TAG-NCR-PERIODICITYANDOFFSET-START + +NCR-PeriodicityAndOffset-r18 ::= CHOICE { + slot NCR-SlotPeriodicityAndSlotOffset-r18, + ms NCR-MsPeriodicityAndSlotOffset-r18 +} + +NCR-SlotPeriodicityAndSlotOffset-r18 ::= CHOICE { + sl1 NULL, + sl2 INTEGER(0..1), + sl4 INTEGER(0..3), + sl5 INTEGER(0..4), + sl8 INTEGER(0..7), + sl10 INTEGER(0..9), + sl16 INTEGER(0..15), + sl20 INTEGER(0..19), + sl32 INTEGER(0..31), + sl40 INTEGER(0..39), + sl64 INTEGER(0..63), + sl80 INTEGER(0..79), + sl128 INTEGER(0..127), + sl160 INTEGER(0..159), + sl256 INTEGER(0..255), + sl320 INTEGER(0..319), + sl512 INTEGER(0..511), + sl640 INTEGER(0..639), + sl1024 INTEGER(0..1023), + sl1280 INTEGER(0..1279), + sl2560 INTEGER(0..2559), + sl5120 INTEGER(0..5119), + sl10240 INTEGER(0..10239), + ... +} + +NCR-MsPeriodicityAndSlotOffset-r18 ::= CHOICE { + ms1 INTEGER(0..15), + ms2 INTEGER(0..31), + ms4 INTEGER(0..63), + ms5 INTEGER(0..79), + ms8 INTEGER(0..127), + ms10 INTEGER(0..159), + ms16 INTEGER(0..255), + ms20 INTEGER(0..319), + ms32 INTEGER(0..511), + ms40 INTEGER(0..639), + ms64 INTEGER(0..1023), + ms80 INTEGER(0..1279), + ms128 INTEGER(0..2047), + ms160 INTEGER(0..2559), + ms256 INTEGER(0..4095), + ms320 INTEGER(0..5119), + ms512 INTEGER(0..8191), + ms640 INTEGER(0..10239), + ms1024 INTEGER(0..16383), + ms1280 INTEGER(0..20479), + ms2560 INTEGER(0..40959), + ms5120 INTEGER(0..81919), + ms10240 INTEGER(0..163839), + ... +} + +-- TAG-NCR-PERIODICITYANDOFFSET-STOP +-- TAG-NCR-PERIODICFWDRESOURCESET-START + +NCR-PeriodicFwdResourceSet-r18 ::= SEQUENCE { + periodicFwdRsrcSetId-r18 NCR-PeriodicFwdResourceSetId-r18, + periodicFwdRsrcToAddModList-r18 SEQUENCE (SIZE (1..maxNrofPeriodicFwdResource-r18)) OF NCR-PeriodicFwdResource-r18 + OPTIONAL, -- Need N + periodicFwdRsrcToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofPeriodicFwdResource-r18)) OF NCR-PeriodicFwdResourceId-r18 + OPTIONAL, -- Need N + referenceSCS-r18 SubcarrierSpacing OPTIONAL, -- Need M + priorityFlag-r18 ENUMERATED {true} OPTIONAL, -- Need R + ... +} + +NCR-PeriodicFwdResource-r18 ::= SEQUENCE { + periodicFwdRsrcId-r18 NCR-PeriodicFwdResourceId-r18, + beamIndex-r18 INTEGER (0..63), + periodicTimeRsrc-r18 SEQUENCE { + periodicityAndOffset-r18 NCR-PeriodicityAndOffset-r18, + symbolOffset-r18 INTEGER (0..maxNrofSymbols-1), + durationInSymbols-r18 INTEGER (1..112) + }, + ... +} + +NCR-PeriodicFwdResourceId-r18 ::= INTEGER (0..maxNrofPeriodicFwdResource-1-r18) + +-- TAG-NCR-PERIODICFWDRESOURCESET-STOP +-- TAG-NCR-PERIODICFWDRESOURCESETID-START + +NCR-PeriodicFwdResourceSetId-r18 ::= INTEGER (0..maxNrofPeriodicFwdResourceSet-1-r18) + +-- TAG-NCR-PERIODICFWDRESOURCESETID-STOP +-- TAG-NCR-SEMIPERSISTENTFWDRESOURCESET-START + +NCR-SemiPersistentFwdResourceSet-r18 ::= SEQUENCE { + semiPersistentFwdRsrcSetId-r18 NCR-SemiPersistentFwdResourceSetId-r18, + semiPersistentFwdRsrcToAddModList-r18 SEQUENCE (SIZE (1..maxNrofSemiPersistentFwdResource-r18)) OF + NCR-SemiPersistentFwdResource-r18 OPTIONAL, -- Need N + semiPersistentFwdRsrcToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofSemiPersistentFwdResource-r18)) OF + NCR-SemiPersistentFwdResourceId-r18 OPTIONAL, -- Need N + referenceSCS-r18 SubcarrierSpacing OPTIONAL, -- Need M + priorityFlag-r18 ENUMERATED {true} OPTIONAL, -- Need R + ... +} + +NCR-SemiPersistentFwdResource-r18 ::= SEQUENCE { + semiPersistentFwdRsrcId-r18 NCR-SemiPersistentFwdResourceId-r18, + beamIndex-r18 INTEGER (0..63), + semiPersistentTimeRsrc-r18 SEQUENCE { + periodicityAndOffset-r18 NCR-PeriodicityAndOffset-r18, + symbolOffset-r18 INTEGER (0..maxNrofSymbols-1), + durationInSymbols-r18 INTEGER (1..112) + }, + ... +} + +NCR-SemiPersistentFwdResourceId-r18 ::= INTEGER (0..maxNrofSemiPersistentFwdResource-1-r18) + +-- TAG-NCR-SEMIPERSISTENTFWDRESOURCESET-STOP +-- TAG-NCR-SEMIPERSISTENTFWDRESOURCESETID-START + +NCR-SemiPersistentFwdResourceSetId-r18 ::= INTEGER (0..maxNrofSemiPersistentFwdResourceSet-1-r18) + +-- TAG-NCR-SEMIPERSISTENTFWDRESOURCESETID-STOP -- TAG-NeedForGapsConfigNR-START NeedForGapsConfigNR-r16 ::= SEQUENCE { @@ -6834,6 +8853,23 @@ NeedForNCSG-NR-r17 ::= SEQUENCE { } -- TAG-NEEDFORGAPNCSG-INFONR-STOP +-- TAG-NeedForInterruptionInfoNR-START + +NeedForInterruptionInfoNR-r18 ::= SEQUENCE { + intraFreq-needForInterruption-r18 NeedForInterruptionIntraFreqList-r18, + interFreq-needForInterruption-r18 NeedForInterruptionBandListNR-r18, + ... +} + +NeedForInterruptionIntraFreqList-r18 ::= SEQUENCE (SIZE (1.. maxNrofServingCells)) OF NeedForInterruptionNR-r18 + +NeedForInterruptionBandListNR-r18 ::= SEQUENCE (SIZE (1..maxBands)) OF NeedForInterruptionNR-r18 + +NeedForInterruptionNR-r18 ::= SEQUENCE { + interruptionIndication-r18 ENUMERATED {no-gap-with-interruption, no-gap-no-interruption} OPTIONAL +} + +-- TAG-NeedForInterruptionInfoNR-STOP -- TAG-NEXTHOPCHAININGCOUNT-START NextHopChainingCount ::= INTEGER (0..7) @@ -6890,6 +8926,9 @@ NPN-IdentityInfo-r16 ::= SEQUENCE { ..., [[ gNB-ID-Length-r17 INTEGER (22..32) OPTIONAL -- Need R + ]], + [[ + mobileIAB-Support-r18 ENUMERATED {true} OPTIONAL -- Need S ]] } @@ -6903,7 +8942,7 @@ NR-DL-PRS-PDC-Info-r17 ::= SEQUENCE { NR-DL-PRS-PDC-ResourceSet-r17 ::= SEQUENCE { periodicityAndOffset-r17 NR-DL-PRS-Periodicity-and-ResourceSetSlotOffset-r17, - numSymbols-r17 ENUMERATED {n2, n4, n6, n12, spare4, spare3, spare2, spare1}, + numSymbols-r17 ENUMERATED {n2, n4, n6, n12, n1-v1800, spare3, spare2, spare1}, dl-PRS-ResourceBandwidth-r17 INTEGER (1..63), dl-PRS-StartPRB-r17 INTEGER (0..2176), resourceList-r17 SEQUENCE (SIZE (1..maxNrofPRS-ResourcesPerSet-r17)) OF NR-DL-PRS-Resource-r17, @@ -7008,7 +9047,10 @@ NR-DL-PRS-Resource-r17 ::= SEQUENCE { dl-PRS-ResourceSlotOffset-r17 INTEGER (0..maxNrofPRS-ResourceOffsetValue-1-r17), dl-PRS-ResourceSymbolOffset-r17 INTEGER (0..12), dl-PRS-QCL-Info-r17 DL-PRS-QCL-Info-r17 OPTIONAL, -- Need N - ... + ..., + [[ + dl-PRS-ResourceSymbolOffset-v1800 INTEGER (13) OPTIONAL -- Need R + ]] } DL-PRS-QCL-Info-r17 ::= CHOICE { @@ -7041,6 +9083,19 @@ NR-NS-PmaxValue ::= SEQUENCE { additionalSpectrumEmission AdditionalSpectrumEmission } +NR-NS-PmaxList-v1760 ::= SEQUENCE (SIZE (1.. maxNR-NS-Pmax)) OF NR-NS-PmaxValue-v1760 + +NR-NS-PmaxValue-v1760 ::= SEQUENCE { + additionalSpectrumEmission-v1760 AdditionalSpectrumEmission-v1760 OPTIONAL -- Need N +} + +NR-NS-PmaxListAerial-r18 ::= SEQUENCE (SIZE (1..maxNR-NS-Pmax)) OF NR-NS-PmaxValueAerial-r18 + +NR-NS-PmaxValueAerial-r18 ::= SEQUENCE { + additionalPmax-r18 P-Max OPTIONAL, -- Need N + additionalSpectrumEmission-r18 AdditionalSpectrumEmission-r18 +} + -- TAG-NR-NS-PMAXLIST-STOP -- TAG-NSAG-ID-START @@ -7071,11 +9126,6 @@ NTN-Config-r17 ::= SEQUENCE { ... } -EpochTime-r17 ::= SEQUENCE { - sfn-r17 INTEGER(0..1023), - subFrameNR-r17 INTEGER(0..9) -} - TA-Info-r17 ::= SEQUENCE { ta-Common-r17 INTEGER(0..66485757), ta-CommonDrift-r17 INTEGER(-257303..257303) OPTIONAL, -- Need R @@ -7093,7 +9143,12 @@ NZP-CSI-RS-Resource ::= SEQUENCE { scramblingID ScramblingId, periodicityAndOffset CSI-ResourcePeriodicityAndOffset OPTIONAL, -- Cond PeriodicOrSemiPersistent qcl-InfoPeriodicCSI-RS TCI-StateId OPTIONAL, -- Cond Periodic - ... + ..., + [[ + subcarrierSpacing-r18 SubcarrierSpacing OPTIONAL, -- Cond LTM + absoluteFrequencyPointA-r18 ARFCN-ValueNR OPTIONAL, -- Cond LTM + cyclicPrefix-r18 ENUMERATED {extended} OPTIONAL -- Cond LTM + ]] } -- TAG-NZP-CSI-RS-RESOURCE-STOP @@ -7119,6 +9174,9 @@ NZP-CSI-RS-ResourceSet ::= SEQUENCE { cmrGroupingAndPairing-r17 CMRGroupingAndPairing-r17 OPTIONAL, -- Need R aperiodicTriggeringOffset-r17 INTEGER (0..124) OPTIONAL, -- Need S aperiodicTriggeringOffsetL2-r17 INTEGER(0..31) OPTIONAL -- Need R + ]], + [[ + resourceType-r18 ENUMERATED {periodic} OPTIONAL -- Cond LTM ]] } @@ -7235,6 +9293,10 @@ PDCCH-Config ::= SEQUENCE { monitoringCapabilityConfig-v1710 ENUMERATED { r17monitoringcapability } OPTIONAL, -- Need M searchSpaceSwitchConfig-r17 SearchSpaceSwitchConfig-r17 OPTIONAL, -- Need R pdcch-SkippingDurationList-r17 SEQUENCE(SIZE (1..3)) OF SCS-SpecificDuration-r17 OPTIONAL -- Need R + ]], + [[ + pdcch-MonitoringResumptionAfterNack-r18 ENUMERATED {true} OPTIONAL, -- Need R + searchSpacesToAddModListExt-v1800 SEQUENCE(SIZE (1..10)) OF SearchSpaceExt-v1800 OPTIONAL -- Need N ]] } @@ -7310,6 +9372,12 @@ PDCCH-ConfigCommon ::= SEQUENCE { ]], [[ followUnifiedTCI-State-v1720 ENUMERATED {enabled} OPTIONAL -- Need R + ]], + [[ + applyIndicatedTCI-State-r18 ENUMERATED {first, second, both, none} OPTIONAL, -- Cond FollowUTCI + commonSearchSpaceListExt-r18 SEQUENCE (SIZE(1..4)) OF SearchSpaceExt-v1800 OPTIONAL, -- Need R + searchSpaceMulticastMCCH-r18 SearchSpaceId OPTIONAL, -- Need R + searchSpaceMulticastMTCH-r18 SearchSpaceId OPTIONAL -- Need S ]] } @@ -7412,6 +9480,12 @@ PDCP-Config ::= SEQUENCE { uplinkDataCompression-r17 CHOICE {release NULL, setup UplinkDataCompression-r17 } OPTIONAL, -- Cond Rlc-AM discardTimerExt2-r17 CHOICE {release NULL, setup DiscardTimerExt2-r17 } OPTIONAL, -- Need M initialRX-DELIV-r17 BIT STRING (SIZE (32)) OPTIONAL -- Cond MRB-Initialization + ]], + [[ + pdu-SetDiscard-r18 ENUMERATED {true} OPTIONAL, -- Need R + discardTimerForLowImportance-r18 CHOICE {release NULL, setup DiscardTimerForLowImportance-r18 } OPTIONAL, -- Cond DRB2 + primaryPathOnIndirectPath-r18 ENUMERATED {true} OPTIONAL, -- Cond SplitBearerMP + sn-GapReport-r18 ENUMERATED {true} OPTIONAL -- Need R ]] } @@ -7448,6 +9522,8 @@ UplinkDataCompression-r17 ::= CHOICE { drb-ContinueUDC NULL } +DiscardTimerForLowImportance-r18 ::= ENUMERATED {ms0, ms2, ms4, ms6, ms8, ms10, ms12, ms14, ms18, ms22, ms26, ms30, ms40, ms50, ms75, ms100} + -- TAG-PDCP-CONFIG-STOP -- TAG-PDSCH-CONFIG-START @@ -7570,6 +9646,10 @@ PDSCH-Config ::= SEQUENCE { ]], [[ pdsch-TimeDomainAllocationListForMultiPDSCH-r17 CHOICE {release NULL, setup MultiPDSCH-TDRA-List-r17 } OPTIONAL -- Need M + ]], + [[ + advancedReceiver-MU-MIMO-r18 CHOICE {release NULL, setup AdvancedReceiver-MU-MIMO-r18 } OPTIONAL, -- Need M + pdsch-ConfigDCI-1-3-r18 CHOICE {release NULL, setup PDSCH-ConfigDCI-1-3-r18 } OPTIONAL -- Need M ]] } @@ -7584,6 +9664,15 @@ MinSchedulingOffsetK0-Values-r17 ::= SEQUENCE (SIZE (1..maxNrOfMinSchedulingO MaxMIMO-LayersDL-r16 ::= INTEGER (1..8) +PDSCH-ConfigDCI-1-3-r18 ::= SEQUENCE { + resourceAllocationDCI-1-3-r18 ENUMERATED {resourceAllocationType0, resourceAllocationType1, dynamicSwitch} + OPTIONAL, -- Need M + rbg-SizeDCI-1-3-r18 ENUMERATED {config1, config2, config3, spare1} OPTIONAL, -- Cond DCI-1-3 + resourceAllocationType1GranularityDCI-1-3-r18 ENUMERATED {n2,n4,n8,n16} OPTIONAL, -- Need S + numberOfBitsForRV-DCI-1-3-r18 INTEGER (0..2) OPTIONAL, -- Need R + harq-ProcessNumberSizeDCI-1-3-r18 INTEGER (0..5) OPTIONAL -- Need R +} + -- TAG-PDSCH-CONFIG-STOP -- TAG-PDSCH-CONFIGCOMMON-START @@ -7642,7 +9731,7 @@ PDSCH-TimeDomainResourceAllocation-r16 ::= SEQUENCE { k0-r16 INTEGER(0..32) OPTIONAL, -- Need S mappingType-r16 ENUMERATED {typeA, typeB}, startSymbolAndLength-r16 INTEGER (0..127), - repetitionNumber-r16 ENUMERATED {n2, n3, n4, n5, n6, n7, n8, n16} OPTIONAL, -- Cond Formats1-0and1-1 + repetitionNumber-r16 ENUMERATED {n2, n3, n4, n5, n6, n7, n8, n16} OPTIONAL, -- Cond Formats1-0_1-1_4-0_4-1_4-2 ..., [[ k0-v1710 INTEGER(33..128) OPTIONAL -- Need S @@ -7662,6 +9751,11 @@ MultiPDSCH-TDRA-r17 ::= SEQUENCE { } -- TAG-PDSCH-TIMEDOMAINRESOURCEALLOCATIONLIST-STOP +-- TAG-PDU-SESSIONID-START + +PDU-SessionID ::= INTEGER (0..255) + +-- TAG-PDU-SESSIONID-STOP -- TAG-PHR-CONFIG-START PHR-Config ::= SEQUENCE { @@ -7679,6 +9773,10 @@ PHR-Config ::= SEQUENCE { [[ mpe-Reporting-FR2-r17 CHOICE {release NULL, setup MPE-Config-FR2-r17 } OPTIONAL, -- Need M twoPHRMode-r17 ENUMERATED {enabled} OPTIONAL -- Need R + ]], + [[ + phr-AssumedPUSCH-Reporting-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + dpc-Reporting-FR1-r18 ENUMERATED {enabled} OPTIONAL -- Need R ]] } @@ -7794,10 +9892,23 @@ PhysicalCellGroupConfig ::= SEQUENCE { ]], [[ pdcch-BlindDetection4-r17 CHOICE {release NULL, setup PDCCH-BlindDetection4-r17 } OPTIONAL -- Need M + ]], + [[ + simultaneousPUCCH-PUSCH-SamePriority-r17 ENUMERATED {enabled} OPTIONAL, -- Need R + simultaneousPUCCH-PUSCH-SamePriority-SecondaryPUCCHgroup-r17 ENUMERATED {enabled} OPTIONAL -- Cond twoPUCCHgroup + ]], + [[ + ncr-RNTI-r18 RNTI-Value OPTIONAL, -- Cond NCR + cellDTRX-DCI-config-r18 CHOICE {release NULL, setup CellDTRX-DCI-config-r18 } OPTIONAL, -- Need M + twoQCL-TypeD-ForMultiDCI-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + enableType1HARQ-ACK-MuxForDL-AssignmentAfterUL-Grant-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + enableType2HARQ-ACK-MuxForDL-AssignmentAfterUL-Grant-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + enableType3HARQ-ACK-MuxForDL-AssignmentAfterUL-Grant-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + enableDiffPUCCH-Resource-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + enableDiffCB-Size-r18 ENUMERATED {enabled} OPTIONAL -- Need R ]] } - PDSCH-HARQ-ACK-EnhType3-r17 ::= SEQUENCE { pdsch-HARQ-ACK-EnhType3Index-r17 PDSCH-HARQ-ACK-EnhType3Index-r17, applicable-r17 CHOICE { @@ -7850,6 +9961,11 @@ PDCCH-BlindDetectionCA-CombIndicator-r17 ::= SEQUENCE { pdcch-BlindDetectionCA3-r17 INTEGER (1..15) } +CellDTRX-DCI-config-r18 ::= SEQUENCE { + cellDTRX-RNTI-r18 RNTI-Value, + sizeDCI-2-9-r18 INTEGER (1..maxDCI-2-9-Size-r18) +} + -- TAG-PHYSICALCELLGROUPCONFIG-STOP -- TAG-PLMN-IDENTITY-START @@ -7881,7 +9997,10 @@ PLMN-IdentityInfo ::= SEQUENCE { ]], [[ trackingAreaList-r17 SEQUENCE (SIZE (1..maxTAC-r17)) OF TrackingAreaCode OPTIONAL, -- Need R - gNB-ID-Length-r17 INTEGER (22..32) OPTIONAL -- Need R + gNB-ID-Length-r17 INTEGER (22..32) OPTIONAL -- Cond eventID-TSS + ]], + [[ + mobileIAB-Support-r18 ENUMERATED {true} OPTIONAL -- Need S ]] } -- TAG-PLMN-IDENTITYINFOLIST-STOP @@ -7924,7 +10043,10 @@ PTRS-UplinkConfig ::= SEQUENCE { sampleDensity SEQUENCE (SIZE (5)) OF INTEGER (1..276), timeDensityTransformPrecoding ENUMERATED {d2} OPTIONAL -- Need S } OPTIONAL, -- Need R - ... + ..., + [[ + maxNrofPorts-SDM-r18 ENUMERATED {n1, n2} OPTIONAL -- Need R + ]] } -- TAG-PTRS-UPLINKCONFIG-STOP @@ -8051,18 +10173,24 @@ PUCCH-ResourceExt-v1610 ::= SEQUENCE { } } OPTIONAL, --Need R format-v1610 CHOICE { - interlace1-v1610 INTEGER (0..9), - occ-v1610 SEQUENCE { - occ-Length-v1610 ENUMERATED {n2,n4} OPTIONAL, -- Need M - occ-Index-v1610 ENUMERATED {n0,n1,n2,n3} OPTIONAL -- Need M + interlace1-v1610 INTEGER (0..9), + occ-v1610 SEQUENCE { + occ-Length-v1610 ENUMERATED {n2,n4} OPTIONAL, -- Need M + occ-Index-v1610 ENUMERATED {n0,n1,n2,n3} OPTIONAL -- Need M } - } OPTIONAL, -- Need R + } OPTIONAL, -- Need R ..., [[ - format-v1700 SEQUENCE { + format-v1700 SEQUENCE { nrofPRBs-r17 INTEGER (1..16) - } OPTIONAL, -- Need R - pucch-RepetitionNrofSlots-r17 ENUMERATED { n1,n2,n4,n8 } OPTIONAL -- Need R + } OPTIONAL, -- Need R + pucch-RepetitionNrofSlots-r17 ENUMERATED { n1,n2,n4,n8 } OPTIONAL -- Need R + ]], + [[ + applyIndicatedTCI-State-r18 ENUMERATED {first, second, both, spare1} OPTIONAL, -- Need R + multipanelSFN-Scheme-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + dl-DataToUL-ACK-r18 CHOICE {release NULL, setup DL-DataToUL-ACK-r18 } OPTIONAL, -- Need M + dl-DataToUL-ACK-DCI-1-2-r18 CHOICE {release NULL, setup DL-DataToUL-ACK-DCI-1-2-r18} OPTIONAL -- Need M ]] } @@ -8114,10 +10242,14 @@ DL-DataToUL-ACK-r17 ::= SEQUENCE (SIZE (1..8)) OF INTEGER (-1 DL-DataToUL-ACK-v1700 ::= SEQUENCE (SIZE (1..8)) OF INTEGER (16..31) +DL-DataToUL-ACK-r18 ::= SEQUENCE (SIZE (1..8)) OF INTEGER (0..31) + DL-DataToUL-ACK-DCI-1-2-r16 ::= SEQUENCE (SIZE (1..8)) OF INTEGER (0..15) DL-DataToUL-ACK-DCI-1-2-r17 ::= SEQUENCE (SIZE (1..8)) OF INTEGER (0..127) +DL-DataToUL-ACK-DCI-1-2-r18 ::= SEQUENCE (SIZE (1..8)) OF INTEGER (0..31) + UL-AccessConfigListDCI-1-1-r16 ::= SEQUENCE (SIZE (1..16)) OF INTEGER (0..15) UL-AccessConfigListDCI-1-2-r17 ::= SEQUENCE (SIZE (1..16)) OF INTEGER (0..15) @@ -8149,6 +10281,14 @@ PUCCH-ConfigCommon ::= SEQUENCE { PUCCH-ConfigurationList-r16 ::= SEQUENCE (SIZE (1..2)) OF PUCCH-Config -- TAG-PUCCH-CONFIGURATIONLIST-STOP +-- TAG-PUCCH-CSI-RESOURCE-START + +PUCCH-CSI-Resource ::= SEQUENCE { + uplinkBandwidthPartId BWP-Id, + pucch-Resource PUCCH-ResourceId +} + +-- TAG-PUCCH-CSI-RESOURCE-STOP -- TAG-PUCCH-PATHLOSSREFERENCERS-ID-START PUCCH-PathlossReferenceRS-Id ::= INTEGER (0..maxNrofPUCCH-PathlossReferenceRSs-1) @@ -8347,6 +10487,17 @@ PUSCH-Config ::= SEQUENCE { harq-ProcessNumberSizeDCI-0-1-r17 INTEGER (5) OPTIONAL, -- Need R mpe-ResourcePoolToAddModList-r17 SEQUENCE (SIZE(1..maxMPE-Resources-r17)) OF MPE-Resource-r17 OPTIONAL, -- Need N mpe-ResourcePoolToReleaseList-r17 SEQUENCE (SIZE(1..maxMPE-Resources-r17)) OF MPE-ResourceId-r17 OPTIONAL -- Need N + ]], + [[ + maxRank-v1810 INTEGER (5..8) OPTIONAL, -- Need R + sTx-2Panel-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + multipanelSchemeSDM-r18 SDM-Scheme-r18 OPTIONAL, -- Need R + multipanelSchemeSFN-r18 SFN-Scheme-r18 OPTIONAL, -- Need R + codebookTypeUL-r18 CHOICE {release NULL, setup CodebookTypeUL-r18 } OPTIONAL, -- Need M + applyIndicatedTCI-State-r18 ENUMERATED {first, second} OPTIONAL, -- Need R + dynamicTransformPrecoderFieldPresenceDCI-0-1-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + dynamicTransformPrecoderFieldPresenceDCI-0-2-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + pusch-ConfigDCI-0-3-r18 CHOICE {release NULL, setup PUSCH-ConfigDCI-0-3-r18 } OPTIONAL -- Need M ]] } @@ -8410,6 +10561,35 @@ MPE-Resource-r17 ::= SEQUENCE { MPE-ResourceId-r17 ::= INTEGER (1..maxMPE-Resources-r17) +SDM-Scheme-r18 ::= SEQUENCE { + maxRankSDM-r18 INTEGER (1..2) OPTIONAL, -- Need R + maxRankSDM-DCI-0-2-r18 INTEGER (1..2) OPTIONAL -- Need R +} + + +SFN-Scheme-r18 ::= SEQUENCE { + maxRankSFN-r18 INTEGER (1..2) OPTIONAL, -- Need R + maxRankSFN-DCI-0-2-r18 INTEGER (1..2) OPTIONAL -- Need R +} + + +CodebookTypeUL-r18 ::= CHOICE { + codebook1-r18 ENUMERATED {ng1n4n1, ng1n2n2}, + codebook2-r18 ENUMERATED {ng2}, + codebook3-r18 ENUMERATED {ng4}, + codebook4-r18 ENUMERATED {ng8} +} + +PUSCH-ConfigDCI-0-3-r18 ::= SEQUENCE { + resourceAllocationDCI-0-3-r18 ENUMERATED {resourceAllocationType0, resourceAllocationType1, dynamicSwitch} + OPTIONAL, -- Need M + rbg-SizeDCI-0-3-r18 ENUMERATED {config2, config3} OPTIONAL, -- Need S + resourceAllocationType1GranularityDCI-0-3-r18 ENUMERATED {n2,n4,n8,n16} OPTIONAL, -- Need S + numberOfBitsForRV-DCI-0-3-r18 INTEGER (0..2) OPTIONAL, -- Need R + harq-ProcessNumberSizeDCI-0-3-r18 INTEGER (0..5) OPTIONAL, -- Need R + uci-OnPUSCH-ListDCI-0-3-r18 CHOICE {release NULL, setup UCI-OnPUSCH-ListDCI-0-1-r16 } OPTIONAL -- Need M +} + -- TAG-PUSCH-CONFIG-STOP -- TAG-PUSCH-CONFIGCOMMON-START @@ -8531,8 +10711,15 @@ PUSCH-ServingCellConfig ::= SEQUENCE { maxMIMO-LayersDCI-0-2-r16 CHOICE {release NULL, setup MaxMIMO-LayersDCI-0-2-r16} OPTIONAL -- Need M ]], [[ - nrofHARQ-ProcessesForPUSCH-r17 ENUMERATED {n32} OPTIONAL, -- Need R + nrofHARQ-ProcessesForPUSCH-r17 ENUMERATED {n32} OPTIONAL, -- Need R uplinkHARQ-mode-r17 CHOICE {release NULL, setup UplinkHARQ-mode-r17} OPTIONAL -- Need M + ]], + [[ + maxMIMO-Layers-v1810 INTEGER (5..8) OPTIONAL, -- Need R + maxMIMO-LayersforSDM-r18 INTEGER (1..2) OPTIONAL, -- Need R + maxMIMO-LayersforSDM-DCI-0-2-r18 INTEGER (1..2) OPTIONAL, -- Need R + maxMIMO-LayersforSFN-r18 INTEGER (1..2) OPTIONAL, -- Need R + maxMIMO-LayersforSFN-DCI-0-2-r18 INTEGER (1..2) OPTIONAL -- Need R ]] } @@ -8590,6 +10777,11 @@ PUSCH-TPC-CommandConfig ::= SEQUENCE { } -- TAG-PUSCH-TPC-COMMANDCONFIG-STOP +-- TAG-QFI-START + +QFI ::= INTEGER (0..maxQFI) + +-- TAG-QFI-STOP -- TAG-Q-OFFSETRANGE-START Q-OffsetRange ::= ENUMERATED { @@ -8745,10 +10937,10 @@ RACH-ConfigCommonTwoStepRA-r16 ::= SEQUENCE { } GroupB-ConfiguredTwoStepRA-r16 ::= SEQUENCE { - ra-MsgA-SizeGroupA ENUMERATED {b56, b144, b208, b256, b282, b480, b640, b800, + ra-MsgA-SizeGroupA-r16 ENUMERATED {b56, b144, b208, b256, b282, b480, b640, b800, b1000, b72, spare6, spare5, spare4, spare3, spare2, spare1}, - messagePowerOffsetGroupB ENUMERATED {minusinfinity, dB0, dB5, dB8, dB10, dB12, dB15, dB18}, - numberOfRA-PreamblesGroupA INTEGER (1..64) + messagePowerOffsetGroupB-r16 ENUMERATED {minusinfinity, dB0, dB5, dB8, dB10, dB12, dB15, dB18}, + numberOfRA-PreamblesGroupA-r16 INTEGER (1..64) } -- TAG-RACH-CONFIGCOMMONTWOSTEPRA-STOP @@ -8784,6 +10976,9 @@ CFRA ::= SEQUENCE { ..., [[ totalNumberOfRA-Preambles INTEGER (1..63) OPTIONAL -- Cond Occasions + ]], + [[ + msg1-RepetitionNum-r18 ENUMERATED {n2, n4, n8, spare1} OPTIONAL -- Cond 4StepCFRArep ]] } @@ -8864,6 +11059,23 @@ RACH-ConfigGenericTwoStepRA-r16 ::= SEQUENCE { } -- TAG-RACH-CONFIGGENERICTWOSTEPRA-STOP +-- TAG-RACH-CONFIGTWOTA-START + +RACH-ConfigTwoTA-r18 ::= SEQUENCE { + additionalPCI-andRACH-Index-r18 AdditionalPCIIndex-r17, + rach-ConfigGeneric-r18 RACH-ConfigGeneric, + ssb-perRACH-Occasion-r18 ENUMERATED {oneEighth, oneFourth, oneHalf, one, two, four, eight, sixteen} OPTIONAL, -- Need M + prach-RootSequenceIndex-r18 CHOICE { + l839 INTEGER (0..837), + l139 INTEGER (0..137), + l571 INTEGER (0..569), + l1151 INTEGER (0..1149) + }, + msg1-SubcarrierSpacing-r18 SubcarrierSpacing OPTIONAL, -- Cond L139 + ... +} + +-- TAG-RACH-CONFIGTWOTA-STOP -- TAG-RA-PRIORITIZATION-START RA-Prioritization ::= SEQUENCE { @@ -8903,8 +11115,11 @@ RadioBearerConfig ::= SEQUENCE { mrb-ToReleaseList-r17 MRB-ToReleaseList-r17 OPTIONAL, -- Need N srb4-ToAddMod-r17 SRB-ToAddMod OPTIONAL, -- Need N srb4-ToRelease-r17 ENUMERATED{true} OPTIONAL -- Need N + ]], + [[ + srb5-ToAddMod-r18 SRB-ToAddMod OPTIONAL, -- Need N + srb5-ToRelease-r18 ENUMERATED{true} OPTIONAL -- Need N ]] - } SRB-ToAddModList ::= SEQUENCE (SIZE (1..2)) OF SRB-ToAddMod @@ -8917,6 +11132,10 @@ SRB-ToAddMod ::= SEQUENCE { ..., [[ srb-Identity-v1700 SRB-Identity-v1700 OPTIONAL -- Need M + ]], + [[ + srb-Identity-v1800 SRB-Identity-v1800 OPTIONAL, -- Need M + n3c-BearerAssociated-r18 ENUMERATED{true} OPTIONAL -- Cond N3C MP ]] } @@ -8934,6 +11153,9 @@ DRB-ToAddMod ::= SEQUENCE { ..., [[ daps-Config-r16 ENUMERATED{true} OPTIONAL -- Cond DAPS + ]], + [[ + n3c-BearerAssociated-r18 ENUMERATED{true} OPTIONAL -- Cond N3C MP ]] } DRB-ToReleaseList ::= SEQUENCE (SIZE (1..maxDRB)) OF DRB-Identity @@ -9075,6 +11297,11 @@ RateMatchPatternLTE-CRS ::= SEQUENCE { LTE-CRS-PatternList-r16 ::= SEQUENCE (SIZE (1..maxLTE-CRS-Patterns-r16)) OF RateMatchPatternLTE-CRS -- TAG-RATEMATCHPATTERNLTE-CRS-STOP +-- TAG-REFERENCECONFIGURATION-START + +ReferenceConfiguration-r18 ::= OCTET STRING (CONTAINING RRCReconfiguration) + +-- TAG-REFERENCECONFIGURATION-STOP -- TAG-REFERENCELOCATION-START ReferenceLocation-r17 ::= OCTET STRING @@ -9211,7 +11438,20 @@ EventTriggerConfigInterRAT ::= SEQUENCE { timeToTrigger-r17 TimeToTrigger, ... } - ]] + ]], + [[ + eventZ1-Relay-r18 SEQUENCE { + z1-Threshold1-Relay-r18 SEQUENCE { + sl-RSRP-r18 SL-MeasTriggerQuantity-r16, + sd-RSRP-r18 SL-MeasTriggerQuantity-r16 OPTIONAL -- Need S + }, + z1-Threshold2-Relay-r18 SL-MeasTriggerQuantity-r16, + reportOnLeave-r18 BOOLEAN, + hysteresis-r18 Hysteresis, + timeToTrigger-r18 TimeToTrigger, + ... + } + ]] }, rsType NR-RS-Type, @@ -9231,7 +11471,11 @@ EventTriggerConfigInterRAT ::= SEQUENCE { ]], [[ reportQuantityRelay-r17 SL-MeasReportQuantity-r16 OPTIONAL -- Need R - ]]} + ]], + [[ + cellIndividualOffsetList-r18 SEQUENCE (SIZE (1..maxCellMeasEUTRA)) OF CellIndividualOffsetList-EUTRA-r18 OPTIONAL -- Need R + ]] +} PeriodicalReportConfigInterRAT ::= SEQUENCE { reportInterval ReportInterval, @@ -9252,6 +11496,7 @@ PeriodicalReportConfigInterRAT ::= SEQUENCE { reportQuantityRelay-r17 SL-MeasReportQuantity-r16 OPTIONAL -- Need R ]] + } MeasTriggerQuantityUTRA-FDD-r16 ::= CHOICE{ @@ -9264,6 +11509,12 @@ MeasReportQuantityUTRA-FDD-r16 ::= SEQUENCE { cpich-EcN0 BOOLEAN } +CellIndividualOffsetList-EUTRA-r18 ::= SEQUENCE { + physCellId-r18 EUTRA-PhysCellId, + cellIndividualOffset-r18 EUTRA-Q-OffsetRange, + carrierFreq-r18 ARFCN-ValueEUTRA OPTIONAL -- Need R +} + -- TAG-REPORTCONFIGINTERRAT-STOP -- TAG-REPORTCONFIGNR-START @@ -9277,7 +11528,8 @@ ReportConfigNR ::= SEQUENCE { condTriggerConfig-r16 CondTriggerConfig-r16, cli-Periodical-r16 CLI-PeriodicalReportConfig-r16, cli-EventTriggered-r16 CLI-EventTriggerConfig-r16, - rxTxPeriodical-r17 RxTxPeriodical-r17 + rxTxPeriodical-r17 RxTxPeriodical-r17, + reportOnScellActivation-r18 ReportOnScellActivation-r18 } } @@ -9331,13 +11583,23 @@ CondTriggerConfig-r16 ::= SEQUENCE { condEventT1-r17 SEQUENCE { t1-Threshold-r17 INTEGER (0..549755813887), duration-r17 INTEGER (1..6000) + }, + condEventD2-r18 SEQUENCE { + distanceThreshFromReference1-r18 INTEGER(0.. 65535), + distanceThreshFromReference2-r18 INTEGER(0.. 65535), + hysteresisLocation-r18 HysteresisLocation-r17, + timeToTrigger-r18 TimeToTrigger } }, rsType-r16 NR-RS-Type, - ... + ..., + [[ + nesEvent-r18 ENUMERATED {true} OPTIONAL -- Need R + ]] + } -EventTriggerConfig::= SEQUENCE { +EventTriggerConfig ::= SEQUENCE { eventId CHOICE { eventA1 SEQUENCE { a1-Threshold MeasTriggerQuantity, @@ -9405,6 +11667,99 @@ EventTriggerConfig::= SEQUENCE { hysteresisLocation-r17 HysteresisLocation-r17, timeToTrigger-r17 TimeToTrigger } + ]], + [[ + eventH1-r18 SEQUENCE { + h1-Threshold-r18 Altitude-r18, + h1-Hysteresis-r18 HysteresisAltitude-r18, + reportOnLeave-r18 BOOLEAN, + timeToTrigger-r18 TimeToTrigger, + includeAltitudeUE-r18 BOOLEAN, + simulMultiTriggerSingleMeasReport-r18 BOOLEAN + }, + eventH2-r18 SEQUENCE { + h2-Threshold-r18 Altitude-r18, + h2-Hysteresis-r18 HysteresisAltitude-r18, + reportOnLeave-r18 BOOLEAN, + timeToTrigger-r18 TimeToTrigger, + includeAltitudeUE-r18 BOOLEAN, + simulMultiTriggerSingleMeasReport-r18 BOOLEAN + }, + eventA3H1-r18 SEQUENCE { + a3-Offset-r18 MeasTriggerQuantityOffset, + reportOnLeave-r18 BOOLEAN, + a3-Hysteresis-r18 Hysteresis, + timeToTrigger-r18 TimeToTrigger, + useAllowedCellList-r18 BOOLEAN, + h1-Threshold-r18 Altitude-r18, + h1-Hysteresis-r18 HysteresisAltitude-r18, + includeAltitudeUE-r18 BOOLEAN, + simulMultiTriggerSingleMeasReport-r18 BOOLEAN + }, + eventA3H2-r18 SEQUENCE { + a3-Offset-r18 MeasTriggerQuantityOffset, + reportOnLeave-r18 BOOLEAN, + a3-Hysteresis-r18 Hysteresis, + timeToTrigger-r18 TimeToTrigger, + useAllowedCellList-r18 BOOLEAN, + h2-Threshold-r18 Altitude-r18, + h2-Hysteresis-r18 HysteresisAltitude-r18, + includeAltitudeUE-r18 BOOLEAN, + simulMultiTriggerSingleMeasReport-r18 BOOLEAN + }, + eventA4H1-r18 SEQUENCE { + a4-Threshold-r18 MeasTriggerQuantity, + reportOnLeave-r18 BOOLEAN, + a4-Hysteresis-r18 Hysteresis, + timeToTrigger-r18 TimeToTrigger, + useAllowedCellList-r18 BOOLEAN, + h1-Threshold-r18 Altitude-r18, + h1-Hysteresis-r18 HysteresisAltitude-r18, + includeAltitudeUE-r18 BOOLEAN, + simulMultiTriggerSingleMeasReport-r18 BOOLEAN + }, + eventA4H2-r18 SEQUENCE { + a4-Threshold-r18 MeasTriggerQuantity, + reportOnLeave-r18 BOOLEAN, + a4-Hysteresis-r18 Hysteresis, + timeToTrigger-r18 TimeToTrigger, + useAllowedCellList-r18 BOOLEAN, + h2-Threshold-r18 Altitude-r18, + h2-Hysteresis-r18 HysteresisAltitude-r18, + includeAltitudeUE-r18 BOOLEAN, + simulMultiTriggerSingleMeasReport-r18 BOOLEAN + }, + eventA5H1-r18 SEQUENCE { + a5-Threshold1-r18 MeasTriggerQuantity, + a5-Threshold2-r18 MeasTriggerQuantity, + reportOnLeave-r18 BOOLEAN, + a5-Hysteresis-r18 Hysteresis, + timeToTrigger-r18 TimeToTrigger, + useAllowedCellList-r18 BOOLEAN, + h1-Threshold-r18 Altitude-r18, + h1-Hysteresis-r18 HysteresisAltitude-r18, + includeAltitudeUE-r18 BOOLEAN, + simulMultiTriggerSingleMeasReport-r18 BOOLEAN + }, + eventA5H2-r18 SEQUENCE { + a5-Threshold1-r18 MeasTriggerQuantity, + a5-Threshold2-r18 MeasTriggerQuantity, + reportOnLeave-r18 BOOLEAN, + a5-Hysteresis-r18 Hysteresis, + timeToTrigger-r18 TimeToTrigger, + useAllowedCellList-r18 BOOLEAN, + h2-Threshold-r18 Altitude-r18, + h2-Hysteresis-r18 HysteresisAltitude-r18, + includeAltitudeUE-r18 BOOLEAN, + simulMultiTriggerSingleMeasReport-r18 BOOLEAN + }, + eventD2-r18 SEQUENCE { + distanceThreshFromReference1-r18 INTEGER(1.. 65535), + distanceThreshFromReference2-r18 INTEGER(1.. 65535), + reportOnLeave-r18 BOOLEAN, + hysteresisLocation-r18 HysteresisLocation-r17, + timeToTrigger-r18 TimeToTrigger + } ]] }, rsType NR-RS-Type, @@ -9428,6 +11783,14 @@ EventTriggerConfig::= SEQUENCE { [[ coarseLocationRequest-r17 ENUMERATED {true} OPTIONAL, -- Need R reportQuantityRelay-r17 SL-MeasReportQuantity-r16 OPTIONAL -- Need R + ]], + [[ + numberOfTriggeringCells-r18 INTEGER (2..maxCellReport) OPTIONAL, -- Need R + cellIndividualOffsetList-r18 SEQUENCE (SIZE (1..maxNrofCellMeas)) OF CellIndividualOffsetList-r18 OPTIONAL, -- Need R + eventX1-SD-Threshold1-r18 SL-MeasTriggerQuantity-r16 OPTIONAL, -- Need S + eventX2-SD-Threshold-r18 SL-MeasTriggerQuantity-r16 OPTIONAL, -- Need S + reportOnBestCellChange-r18 ENUMERATED {n1, n2} OPTIONAL, -- Need R + enteringLeavingReport-r18 ENUMERATED {true} OPTIONAL -- Need R ]] } @@ -9522,6 +11885,19 @@ MeasTriggerQuantityCLI-r16 ::= CHOICE { MeasReportQuantityCLI-r16 ::= ENUMERATED {srs-rsrp, cli-rssi} +ReportOnScellActivation-r18 ::= SEQUENCE { + rsType-r18 NR-RS-Type, + reportQuantityRS-Indexes-r18 MeasReportQuantity, + maxNrofRS-IndexesToReport-r18 INTEGER (1..maxNrofIndexesToReport), + includeBeamMeasurements-r18 BOOLEAN +} + +CellIndividualOffsetList-r18 ::= SEQUENCE { + physCellId-r18 PhysCellId, + cellIndividualOffset-r18 Q-OffsetRangeList, + ssbFrequency-r18 ARFCN-ValueNR OPTIONAL -- Need R +} + -- TAG-REPORTCONFIGNR-STOP -- TAG-REPORTCONFIGNR-SL-START @@ -9600,7 +11976,7 @@ ReselectionThresholdQ ::= INTEGER (0..31) ResumeCause ::= ENUMERATED {emergency, highPriorityAccess, mt-Access, mo-Signalling, mo-Data, mo-VoiceCall, mo-VideoCall, mo-SMS, rna-Update, mps-PriorityAccess, - mcs-PriorityAccess, spare1, spare2, spare3, spare4, spare5 } + mcs-PriorityAccess, mt-SDT-v1810, srs-PosConfigOrActivationReq-v1800, spare3, spare2, spare1 } -- TAG-RESUMECAUSE-STOP -- TAG-RLC-BEARERCONFIG-START @@ -9924,10 +12300,6 @@ SDAP-Config ::= SEQUENCE { ... } -QFI ::= INTEGER (0..maxQFI) - -PDU-SessionID ::= INTEGER (0..255) - -- TAG-SDAP-CONFIG-STOP -- TAG-SEARCHSPACE-START @@ -9996,6 +12368,11 @@ SearchSpace ::= SEQUENCE { formats3-0-And-3-1} OPTIONAL, -- Need R dci-FormatsExt-r16 ENUMERATED {formats0-2-And-1-2, formats0-1-And-1-1And-0-2-And-1-2} OPTIONAL -- Need R + ]], + [[ + dci-FormatsNCR-r18 ENUMERATED {formats2-8} OPTIONAL, -- Need R + dci-FormatsSL-PRS-r18 ENUMERATED {formats3-2, formats3-0-And-3-2, formats3-0-And-3-1-And-3-2, + formats3-1-And-3-2} OPTIONAL -- Need R ]] } } OPTIONAL -- Cond Setup2 @@ -10078,6 +12455,21 @@ SearchSpaceExt-v1700 ::= SEQUENCE { searchSpaceLinkingId-r17 INTEGER (0..maxNrofSearchSpacesLinks-1-r17) OPTIONAL -- Cond DedicatedOnly } +SearchSpaceExt-v1800 ::= SEQUENCE { + searchSpaceType-r18 CHOICE { + common-r18 SEQUENCE { + dci-Format2-9-r18 SEQUENCE { + ... + } OPTIONAL, -- Need R + ... + }, + ue-Specific-r18 SEQUENCE { + dci-FormatsMC-r18 ENUMERATED {formats0-3, formats1-3, formats0-3-And-1-3} OPTIONAL, -- Need R + ... + } + } OPTIONAL -- Need R +} + -- TAG-SEARCHSPACE-STOP -- TAG-SEARCHSPACEID-START @@ -10106,6 +12498,14 @@ CipheringAlgorithm ::= ENUMERATED { spare2, spare1, ...} -- TAG-SECURITYALGORITHMCONFIG-STOP +-- TAG-SELECTEDPSCELLFORCHO-WITHSCG-START + +SelectedPSCellForCHO-WithSCG-r18 ::= SEQUENCE { + ssbFrequency-r18 ARFCN-ValueNR, + physCellId-r18 PhysCellId +} + +-- TAG-SELECTEDPSCELLFORCHO-WITHSCG-STOP -- TAG-SEMISTATICCHANNELACCESSCONFIG-START SemiStaticChannelAccessConfig-r16 ::= SEQUENCE { @@ -10221,9 +12621,30 @@ ServingCellConfig ::= SEQUENCE { ]], [[ crossCarrierSchedulingConfigRelease-r17 ENUMERATED {true} OPTIONAL -- Need N + ]], + [[ + multiPDSCH-PerSlotType1-CB-r17 ENUMERATED {enabled, disabled} OPTIONAL -- Need R + ]], + [[ + lte-CRS-PatternList3-r18 CHOICE {release NULL, setup LTE-CRS-PatternList-r16 } OPTIONAL, -- Need M + lte-CRS-PatternList4-r18 CHOICE {release NULL, setup LTE-CRS-PatternList-r16 } OPTIONAL, -- Need M + pdcch-CandidateReceptionWith-CRS-Overlap-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + cjt-Scheme-PDSCH-r18 ENUMERATED {cjtSchemeA, cjtSchemeB} OPTIONAL, -- Need R + tag2-r18 Tag2-r18 OPTIONAL, -- Need R + cellDTX-DRX-Config-r18 CHOICE {release NULL, setup CellDTX-DRX-Config-r18 } OPTIONAL, -- Need M + positionInDCI-cellDTRX-r18 INTEGER (0..maxDCI-2-9-Size-1-r18) OPTIONAL, -- Need R + cellDTX-DRX-L1activation-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + mc-DCI-SetOfCellsToAddModList-r18 SEQUENCE (SIZE (1..maxNrofSetsOfCells-r18)) OF MC-DCI-SetOfCells-r18 OPTIONAL, -- Need N + mc-DCI-SetOfCellsToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofSetsOfCells-r18)) OF SetOfCellsId-r18 OPTIONAL -- Need N ]] } +Tag2-r18 ::= SEQUENCE { + tag2-Id-r18 TAG-Id, + tag2-flag-r18 BOOLEAN, + n-TimingAdvanceOffset2-r18 ENUMERATED { n0, n25600, n39936, spare1 } OPTIONAL -- Need S +} + UplinkConfig ::= SEQUENCE { initialUplinkBWP BWP-UplinkDedicated OPTIONAL, -- Need M uplinkBWP-ToReleaseList SEQUENCE (SIZE (1..maxNrofBWPs)) OF BWP-Id OPTIONAL, -- Need N @@ -10243,6 +12664,12 @@ UplinkConfig ::= SEQUENCE { enableDefaultBeamPL-ForSRS-r16 ENUMERATED {enabled} OPTIONAL, -- Need R uplinkTxSwitching-r16 CHOICE {release NULL, setup UplinkTxSwitching-r16 } OPTIONAL, -- Need M mpr-PowerBoost-FR2-r16 ENUMERATED {true} OPTIONAL -- Need R + ]], + [[ + srs-PosTx-Hopping-r18 CHOICE {release NULL, setup SRS-PosTx-Hopping-r18 } OPTIONAL, -- Need M + enablePL-RS-UpdateForType1CG-PUSCH-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + powerBoostPi2BPSK-r18 BOOLEAN OPTIONAL, -- Need R + powerBoostQPSK-r18 BOOLEAN OPTIONAL -- Need R ]] } @@ -10303,9 +12730,61 @@ MIMOParam-r17 ::= SEQUENCE { uplink-PowerControlToReleaseList-r17 SEQUENCE (SIZE (1..maxUL-TCI-r17)) OF Uplink-powerControlId-r17 OPTIONAL, -- Need N sfnSchemePDCCH-r17 ENUMERATED {sfnSchemeA,sfnSchemeB} OPTIONAL, -- Need R sfnSchemePDSCH-r17 ENUMERATED {sfnSchemeA,sfnSchemeB} OPTIONAL -- Need R +} +MC-DCI-SetOfCells-r18 ::= SEQUENCE { + setOfCellsId-r18 SetOfCellsId-r18, + nCI-Value-r18 INTEGER (0..7), + scheduledCellListDCI-1-3-r18 SEQUENCE (SIZE (2..maxNrofCellsInSet-r18)) OF ServCellIndex OPTIONAL, -- Need R + scheduledCellListDCI-0-3-r18 SEQUENCE (SIZE (2..maxNrofCellsInSet-r18)) OF ServCellIndex OPTIONAL, -- Need R + scheduledCellComboListDCI-1-3-r18 SEQUENCE (SIZE (1..maxNrofCellCombos-r18)) OF ScheduledCellCombo-r18 OPTIONAL, -- Need R + scheduledCellComboListDCI-0-3-r18 SEQUENCE (SIZE (1..maxNrofCellCombos-r18)) OF ScheduledCellCombo-r18 OPTIONAL, -- Need R + antennaPortsDCI1-3-r18 ENUMERATED {type1a, type2} OPTIONAL, -- Cond TypeDCI1-3 + antennaPortsDCI0-3-r18 ENUMERATED {type1a, type2} OPTIONAL, -- Cond TypeDCI0-3 + tpmi-DCI0-3-r18 ENUMERATED {type1a, type2} OPTIONAL, -- Cond TypeDCI0-3 + sri-DCI0-3-r18 ENUMERATED {type1a, type2} OPTIONAL, -- Cond TypeDCI0-3 + priorityIndicatorDCI-1-3-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + priorityIndicatorDCI-0-3-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + dormancyDCI-1-3-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + dormancyDCI-0-3-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + pdcchMonAdaptDCI-1-3-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + pdcchMonAdaptDCI-0-3-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + minimumSchedulingOffsetK0DCI-1-3-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + minimumSchedulingOffsetK0DCI-0-3-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + pdsch-HARQ-ACK-OneShotFeedbackDCI-1-3-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + pdsch-HARQ-ACK-enhType3DCI-1-3-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + pdsch-HARQ-ACK-enhType3DCIfieldDCI-1-3-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + pdsch-HARQ-ACK-retxDCI-1-3-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + pucch-sSCellDynDCI-1-3-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + tdra-FieldIndexListDCI-1-3-r18 SEQUENCE (SIZE (1..32)) OF TDRA-FieldIndexDCI-1-3-r18 OPTIONAL, -- Need R + tdra-FieldIndexListDCI-0-3-r18 SEQUENCE (SIZE (1..64)) OF TDRA-FieldIndexDCI-0-3-r18 OPTIONAL, -- Need R + rateMatchListDCI-1-3-r18 SEQUENCE (SIZE (1..16)) OF RateMatchDCI-1-3-r18 OPTIONAL, -- Need R + zp-CSI-RSListDCI-1-3-r18 SEQUENCE (SIZE (1..8)) OF ZP-CSI-DCI-1-3-r18 OPTIONAL, -- Need R + tci-ListDCI-1-3-r18 SEQUENCE (SIZE (1..16)) OF TCI-DCI-1-3-r18 OPTIONAL, -- Need R + srs-RequestListDCI-1-3-r18 SEQUENCE (SIZE (1..16)) OF SRS-RequestCombo-r18 OPTIONAL, -- Need R + srs-OffsetListDCI-1-3-r18 SEQUENCE (SIZE (1..8)) OF SRS-OffsetCombo-r18 OPTIONAL, -- Need R + srs-RequestListDCI-0-3-r18 SEQUENCE (SIZE (1..16)) OF SRS-RequestCombo-r18 OPTIONAL, -- Need R + srs-OffsetListDCI-0-3-r18 SEQUENCE (SIZE (1..8)) OF SRS-OffsetCombo-r18 OPTIONAL -- Need R } +SetOfCellsId-r18 ::= INTEGER (0..maxNrofSetsOfCells-1-r18) + +ScheduledCellCombo-r18 ::= SEQUENCE (SIZE (1..maxNrofCellsInSet-r18)) OF INTEGER (0..maxNrofCellsInSet-1-r18) + +RateMatchDCI-1-3-r18 ::= SEQUENCE (SIZE (1..maxNrofCellsInSet-r18)) OF BIT STRING (SIZE (1..2)) + +ZP-CSI-DCI-1-3-r18 ::= SEQUENCE (SIZE (1.. maxNrofCellsInSet-r18)) OF BIT STRING (SIZE (1..2)) + +TCI-DCI-1-3-r18 ::= SEQUENCE (SIZE (2.. maxNrofCellsInSet-r18)) OF BIT STRING (SIZE (3)) + +SRS-RequestCombo-r18 ::= SEQUENCE (SIZE (1.. maxNrofCellsInSet-r18)) OF BIT STRING (SIZE (2..3)) + +SRS-OffsetCombo-r18 ::= SEQUENCE (SIZE (1.. maxNrofCellsInSet-r18)) OF INTEGER (0..3) + +TDRA-FieldIndexDCI-1-3-r18 ::= SEQUENCE (SIZE (2.. maxNrofBWPsInSetOfCells-r18)) OF INTEGER (0..maxNrofDL-Allocations-1-r18) + +TDRA-FieldIndexDCI-0-3-r18 ::= SEQUENCE (SIZE (2.. maxNrofBWPsInSetOfCells-r18)) OF INTEGER (0..maxNrofUL-Allocations-1-r18) + -- TAG-SERVINGCELLCONFIG-STOP -- TAG-SERVINGCELLCONFIGCOMMON-START @@ -10357,6 +12836,13 @@ ServingCellConfigCommon ::= SEQUENCE { ]], [[ ra-ChannelAccess-r17 ENUMERATED {enabled} OPTIONAL -- Cond SharedSpectrum2 + ]], + [[ + featurePriorities-v1800 SEQUENCE { + msg1-Repetitions-Priority-r18 FeaturePriority-r17 OPTIONAL, -- Need R + eRedCapPriority-r18 FeaturePriority-r17 OPTIONAL -- Need R + } OPTIONAL, -- Need R + atg-Config-r18 ATG-Config-r18 OPTIONAL -- Need R ]] } @@ -10391,10 +12877,14 @@ ServingCellConfigCommonSIB ::= SEQUENCE { uplinkConfigCommon-v1700 UplinkConfigCommonSIB-v1700 OPTIONAL -- Need R ]], [[ - enhancedMeasurementLEO-r17 ENUMERATED {true} OPTIONAL -- Need R + enhancedMeasurementNGSO-r17 ENUMERATED {true} OPTIONAL -- Need R ]], [[ ra-ChannelAccess-r17 ENUMERATED {enabled} OPTIONAL -- Cond SharedSpectrum2 + ]], + [[ + downlinkConfigCommon-v1760 DownlinkConfigCommonSIB-v1760 OPTIONAL, -- Need R + uplinkConfigCommon-v1760 UplinkConfigCommonSIB-v1760 OPTIONAL -- Need R ]] } @@ -10432,6 +12922,24 @@ SI-RequestResources ::= SEQUENCE { } -- TAG-SI-REQUESTCONFIG-STOP +-- TAG-SI-REQUESTCONFIGREPETITION-START + +SI-RequestConfigRepetition-r18 ::= SEQUENCE { + rach-OccasionsSI-r18 SEQUENCE { + rach-ConfigSI-r18 RACH-ConfigGeneric, + ssb-perRACH-Occasion-r18 ENUMERATED {oneEighth, oneFourth, oneHalf, one, two, four, eight, sixteen} + } OPTIONAL, -- Need R + si-RequestResourcesRepetitionNum2-r18 SEQUENCE (SIZE (1..maxSI-Message)) OF SI-RequestResourcesRepetition-r18 OPTIONAL, -- Need R + si-RequestResourcesRepetitionNum4-r18 SEQUENCE (SIZE (1..maxSI-Message)) OF SI-RequestResourcesRepetition-r18 OPTIONAL, -- Need R + si-RequestResourcesRepetitionNum8-r18 SEQUENCE (SIZE (1..maxSI-Message)) OF SI-RequestResourcesRepetition-r18 OPTIONAL, -- Need R + ... +} + +SI-RequestResourcesRepetition-r18 ::= SEQUENCE { + ra-PreambleStartIndex-r18 INTEGER (0..63) +} + +-- TAG-SI-REQUESTCONFIGREPETITION-STOP -- TAG-SI-SCHEDULINGINFO-START SI-SchedulingInfo ::= SEQUENCE { @@ -10451,13 +12959,19 @@ SchedulingInfo ::= SEQUENCE { SI-SchedulingInfo-v1700 ::= SEQUENCE { schedulingInfoList2-r17 SEQUENCE (SIZE (1..maxSI-Message)) OF SchedulingInfo2-r17, - dummy SI-RequestConfig OPTIONAL + dummy SI-RequestConfig OPTIONAL } SI-SchedulingInfo-v1740 ::= SEQUENCE { si-RequestConfigRedCap-r17 SI-RequestConfig OPTIONAL -- Cond REDCAP-MSG-1 } +SI-SchedulingInfo-v1800 ::= SEQUENCE { + si-RequestConfigMSG1-Repetition-r18 SI-RequestConfigRepetition-r18 OPTIONAL, -- Cond MSG-1 + si-RequestConfigRedCap-MSG1-Repetition-r18 SI-RequestConfigRepetition-r18 OPTIONAL, -- Cond REDCAP-MSG-1 + si-RequestConfigSUL-MSG1-Repetition-r18 SI-RequestConfigRepetition-r18 OPTIONAL -- Cond SUL-MSG-1 +} + SchedulingInfo2-r17 ::= SEQUENCE { si-BroadcastStatus-r17 ENUMERATED {broadcasting, notBroadcasting}, si-WindowPosition-r17 INTEGER (1..256), @@ -10480,14 +12994,18 @@ SIB-TypeInfo ::= SEQUENCE { SIB-TypeInfo-v1700 ::= SEQUENCE { sibType-r17 CHOICE { type1-r17 ENUMERATED {sibType15, sibType16, sibType17, sibType18, sibType19, sibType20, sibType21, - spare9, spare8, spare7, spare6, spare5, spare4, spare3, spare2, spare1,...}, + sibType22-v1800, sibType23-v1800 ,sibType24-v1800, sibType25-v1800, + sibType17bis-v1820, spare4, spare3, spare2, spare1,...}, type2-r17 SEQUENCE { posSibType-r17 ENUMERATED {posSibType1-9, posSibType1-10, posSibType2-24, posSibType2-25, - posSibType6-4, posSibType6-5, posSibType6-6, spare9, spare8, spare7, spare6, - spare5, spare4, spare3, spare2, spare1,...}, + posSibType6-4, posSibType6-5, posSibType6-6, posSibType2-17a-v1770, + posSibType2-18a-v1770, posSibType2-20a-v1770, posSibType1-11-v1800, + posSibType1-12-v1800, posSibType2-26-v1800, posSibType2-27-v1800, + posSibType6-7-v1800, posSibType7-1-v1800,..., + posSibType7-2-v1800, posSibType7-3-v1800, posSibType7-4-v1800}, encrypted-r17 ENUMERATED { true } OPTIONAL, -- Need R gnss-id-r17 GNSS-ID-r16 OPTIONAL, -- Need R - sbas-id-r17 SBAS-ID-r16 OPTIONAL -- Need R + sbas-id-r17 SBAS-ID-r16 OPTIONAL -- Cond GNSS-ID-SBAS } }, valueTag-r17 INTEGER (0..31) OPTIONAL, -- Cond NonPosSIB @@ -10645,6 +13163,8 @@ SRB-Identity ::= INTEGER (1..3) SRB-Identity-v1700 ::= INTEGER (4) +SRB-Identity-v1800 ::= INTEGER (5) + -- TAG-SRB-IDENTITY-STOP -- TAG-SRS-CARRIERSWITCHING-START @@ -10687,7 +13207,10 @@ SRS-Config ::= SEQUENCE { OPTIONAL, -- Need N srs-PosResourceSetToAddModList-r16 SEQUENCE (SIZE(1..maxNrofSRS-PosResourceSets-r16)) OF SRS-PosResourceSet-r16 OPTIONAL,-- Need N srs-PosResourceToReleaseList-r16 SEQUENCE (SIZE(1..maxNrofSRS-PosResources-r16)) OF SRS-PosResourceId-r16 OPTIONAL,-- Need N - srs-PosResourceToAddModList-r16 SEQUENCE (SIZE(1..maxNrofSRS-PosResources-r16)) OF SRS-PosResource-r16 OPTIONAL -- Need N + srs-PosResourceToAddModList-r16 SEQUENCE (SIZE(1..maxNrofSRS-PosResources-r16)) OF SRS-PosResource-r16 OPTIONAL -- Need N + ]], + [[ + dci-TriggeringPosResourceSetLink-r18 ENUMERATED { enabled } OPTIONAL -- Need R ]] } @@ -10727,6 +13250,9 @@ SRS-ResourceSet ::= SEQUENCE { usagePDC-r17 ENUMERATED {true} OPTIONAL, -- Need R availableSlotOffsetList-r17 SEQUENCE (SIZE(1..4)) OF AvailableSlotOffset-r17 OPTIONAL, -- Need R followUnifiedTCI-StateSRS-r17 ENUMERATED {enabled} OPTIONAL -- Need R + ]], + [[ + applyIndicatedTCI-State-r18 ENUMERATED {first, second} OPTIONAL -- Cond FollowUTCI ]] } @@ -10771,6 +13297,7 @@ SRS-PosResourceSet-r16 ::= SEQUENCE { dl-PRS-r16 DL-PRS-Info-r16 } OPTIONAL, -- Need M ... + } SRS-ResourceSetId ::= INTEGER (0..maxNrofSRS-ResourceSets-1) @@ -10855,6 +13382,26 @@ SRS-Resource ::= SEQUENCE { srs-DLorJointTCI-State-v1730 SEQUENCE { cellAndBWP-r17 ServingCellAndBWP-Id-r17 } OPTIONAL -- Cond DLorJointTCI-SRS + ]], + [[ + nrofSRS-Ports-n8-r18 ENUMERATED {ports8, ports8tdm} OPTIONAL, -- Need R + combOffsetHopping-r18 SEQUENCE { + hoppingId-r18 INTEGER (0..1023) OPTIONAL, -- Need R + hoppingSubset-r18 CHOICE { + transmissionComb-n4 BIT STRING (SIZE (4)), + transmissionComb-n8 BIT STRING (SIZE (8)) + } OPTIONAL, -- Need R + hoppingWithRepetition-r18 ENUMERATED {symbol, repetition} OPTIONAL -- Need R + } OPTIONAL, -- Need R + cyclicShiftHopping-r18 SEQUENCE { + hoppingId-r18 INTEGER (0..1023) OPTIONAL, -- Need R + hoppingSubset-r18 CHOICE { + transmissionComb-n2 BIT STRING (SIZE (8)), + transmissionComb-n4 BIT STRING (SIZE (12)), + transmissionComb-n8 BIT STRING (SIZE (6)) + } OPTIONAL, -- Need R + hoppingFinerGranularity-r18 ENUMERATED {enable} OPTIONAL -- Need R + } OPTIONAL -- Need R ]] } @@ -10895,19 +13442,28 @@ SRS-PosResource-r16::= SEQUENCE { ..., [[ periodicityAndOffset-sp-Ext-r16 SRS-PeriodicityAndOffsetExt-r16 OPTIONAL -- Need R - ]] + ]], + [[ + srs-PosPeriodicConfigHyperSFN-Index-r18 ENUMERATED {even0, odd1} OPTIONAL --Need R + ]] }, periodic-r16 SEQUENCE { periodicityAndOffset-p-r16 SRS-PeriodicityAndOffset-r16, ..., [[ periodicityAndOffset-p-Ext-r16 SRS-PeriodicityAndOffsetExt-r16 OPTIONAL -- Need R + ]], + [[ + srs-PosPeriodicConfigHyperSFN-Index-r18 ENUMERATED {even0, odd1} OPTIONAL --Need R ]] } }, sequenceId-r16 INTEGER (0..65535), spatialRelationInfoPos-r16 SRS-SpatialRelationInfoPos-r16 OPTIONAL, -- Need R - ... + ..., + [[ + txHoppingConfig-r18 TxHoppingConfig-r18 OPTIONAL --Need R + ]] } SRS-SpatialRelationInfo ::= SEQUENCE { @@ -11035,7 +13591,78 @@ SpatialRelationInfo-PDC-r17 ::= SEQUENCE { ... } +TxHoppingConfig-r18 ::= SEQUENCE { + overlapValue-r18 ENUMERATED {zeroRB, oneRB, twoRB, fourRB}, + numberOfHops-r18 INTEGER(1..6), + slotOffsetForRemainingHopsList-r18 SEQUENCE (SIZE (1..maxNrofHops-1-r18) ) OF SlotOffsetForRemainingHops-r18, + ... +} + +SlotOffsetForRemainingHops-r18 ::= SEQUENCE { + slotOffsetRemainingHops-r18 CHOICE { + aperiodic-r18 SEQUENCE { + slotOffset-r18 INTEGER (1..32) OPTIONAL, -- Need S + startPosition-r18 INTEGER (0..13) OPTIONAL, -- Need R + ... + }, + semi-persistent-r18 SEQUENCE { + periodicityAndOffset-sp-r18 SRS-PeriodicityAndOffset-r16 OPTIONAL, -- Need R + periodicityAndOffset-sp-Ext-r18 SRS-PeriodicityAndOffsetExt-r16 OPTIONAL, -- Need R + startPosition-r18 INTEGER (0..13) OPTIONAL, -- Need R + ... + }, + periodic-r18 SEQUENCE { + periodicityAndOffset-p-r18 SRS-PeriodicityAndOffset-r16 OPTIONAL, -- Need R + periodicityAndOffset-p-Ext-r18 SRS-PeriodicityAndOffsetExt-r16 OPTIONAL, -- Need R + startPosition-r18 INTEGER (0..13) OPTIONAL, -- Need S + ... + }, + ... + } +} + -- TAG-SRS-CONFIG-STOP +-- TAG-SRS-PosTx-Hopping-START + +SRS-PosTx-Hopping-r18 ::= SEQUENCE { + srs-PosConfig-r18 SRS-PosConfig-r17, + bwp-r18 BWP OPTIONAL, -- Need R + inactivePosSRS-TimeAlignmentTimer-r18 TimeAlignmentTimer OPTIONAL, -- Need M + inactivePosSRS-RSRP-ChangeThreshold-r18 RSRP-ChangeThreshold-r17 OPTIONAL, -- Need M + srs-PosUplinkTransmissionWindowConfig-r18 CHOICE {release NULL, setup SRS-PosUplinkTransmissionWindowConfig-r18 } OPTIONAL, -- Need M + ... +} + +SRS-PosUplinkTransmissionWindowConfig-r18 ::= SEQUENCE { + startSFN-r18 INTEGER(0..1023), + windowPeriodicityAndOffset-r18 CHOICE { + periodicityAndOffset-r18 SRS-PeriodicityAndOffset-r16, + periodicityAndOffset-Ext-r18 SRS-PeriodicityAndOffsetExt-r16 + }, + duration-r18 ENUMERATED {s1,s2,s4,s6}, + ... +} + +-- TAG-SRS-PosTx-Hopping-STOP +-- TAG-SRS-POSRESOURCESETLINKEDFORAGGBW-START + +SRS-PosResourceSetLinkedForAggBW-r18 ::= SEQUENCE { + srs-PosResourceSetLinked-r18 SRS-PosResourceSetId-r16, + srs-LinkedConfig-r18 CHOICE { + rrc-connectedState-r18 SEQUENCE { + servingCellAndBWP-Id-r18 ServingCellAndBWP-Id-r17, + ... + }, + rrc-inactiveState-r18 SEQUENCE { + scs-SpecificCarrier-r18 SCS-SpecificCarrier, + freqInfo-r18 ARFCN-ValueNR, + ... + } + }, + ... +} + +-- TAG-SRS-POSRESOURCESETLINKEDFORAGGBW-STOP -- TAG-SRS-RSRP-RANGE-START SRS-RSRP-Range-r16 ::= INTEGER(0..98) @@ -11173,6 +13800,11 @@ TAR-Config-r17 ::= SEQUENCE { timingAdvanceSR-r17 ENUMERATED {enabled} OPTIONAL, -- Need R ... } +TAR-Config-r18 ::= SEQUENCE { + offsetThresholdTA-r18 INTEGER (1..56) OPTIONAL, -- Need R + timingAdvanceSR-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + ... +} -- TAG-TAR-CONFIG-STOP -- TAG-TCI-ACTIVATEDCONFIG-START @@ -11194,8 +13826,10 @@ TCI-State ::= SEQUENCE { additionalPCI-r17 AdditionalPCIIndex-r17 OPTIONAL, -- Need R pathlossReferenceRS-Id-r17 PathlossReferenceRS-Id-r17 OPTIONAL, -- Cond JointTCI1 ul-powerControl-r17 Uplink-powerControlId-r17 OPTIONAL -- Cond JointTCI + ]], + [[ + tag-Id-ptr-r18 ENUMERATED {n0,n1} OPTIONAL -- Cond 2TA ]] - } QCL-Info ::= SEQUENCE { @@ -11229,7 +13863,10 @@ TCI-UL-State-r17 ::= SEQUENCE { additionalPCI-r17 AdditionalPCIIndex-r17 OPTIONAL, -- Need R ul-powerControl-r17 Uplink-powerControlId-r17 OPTIONAL, -- Need R pathlossReferenceRS-Id-r17 PathlossReferenceRS-Id-r17 OPTIONAL, -- Cond Mandatory - ... + ..., + [[ + tag-Id-ptr-r18 ENUMERATED {n0,n1} OPTIONAL -- Cond 2TA + ]] } -- TAG-TCI-UL-STATE-STOP @@ -11328,6 +13965,11 @@ TimeToTrigger ::= ENUMERATED { ms5120} -- TAG-TIMETOTRIGGER-STOP +-- TAG-TN-AREAID-START + +TN-AreaId-r18 ::= INTEGER (1..maxTN-AreaInfo-r18) + +-- TAG-TN-AREAID-STOP -- TAG-UAC-BARRINGINFOSETINDEX-START UAC-BarringInfoSetIndex ::= INTEGER (1..maxBarringInfoSet) @@ -11479,6 +14121,10 @@ UplinkConfigCommonSIB-v1700 ::= SEQUENCE { initialUplinkBWP-RedCap-r17 BWP-UplinkCommon OPTIONAL -- Need R } +UplinkConfigCommonSIB-v1760 ::= SEQUENCE { + frequencyInfoUL-v1760 FrequencyInfoUL-SIB-v1760 +} + -- TAG-UPLINKCONFIGCOMMONSIB-STOP -- TAG-UPLINK-POWERCONTROL-START @@ -11498,7 +14144,7 @@ P0AlphaSet-r17 ::= SEQUENCE { Uplink-powerControlId-r17 ::= INTEGER(1.. maxUL-TCI-r17) -- TAG-UPLINK-POWERCONTROL-STOP --- TAG-UURELAYRLCCHANNELCONFIG-START +-- TAG-UU-RELAYRLC-CHANNELCONFIG-START Uu-RelayRLC-ChannelConfig-r17::= SEQUENCE { uu-LogicalChannelIdentity-r17 LogicalChannelIdentity OPTIONAL, -- Cond RelayLCH-SetupOnly @@ -11509,12 +14155,12 @@ Uu-RelayRLC-ChannelConfig-r17::= SEQUENCE { ... } --- TAG-UURELAYRLCCHANNELCONFIG-STOP --- TAG-UURELAYRLCCHANNELID-START +-- TAG-UU-RELAYRLC-CHANNELCONFIG-STOP +-- TAG-UU-RELAYRLC-CHANNELID-START Uu-RelayRLC-ChannelID-r17 ::= INTEGER (1..maxLC-ID) --- TAG-UURELAYRLCCHANNELID-STOP +-- TAG-UU-RELAYRLC-CHANNELID-STOP -- TAG-UPLINKTXDIRECTCURRENTLIST-START UplinkTxDirectCurrentList ::= SEQUENCE (SIZE (1..maxNrofServingCells)) OF UplinkTxDirectCurrentCell @@ -11619,9 +14265,39 @@ ZP-CSI-RS-ResourceSetId ::= INTEGER (0..maxNrofZP-CSI-RS-Res -- TAG-ACCESSSTRATUMRELEASE-START AccessStratumRelease ::= ENUMERATED { - rel15, rel16, rel17, spare5, spare4, spare3, spare2, spare1, ... } + rel15, rel16, rel17, rel18, spare4, spare3, spare2, spare1, ... } -- TAG-ACCESSSTRATUMRELEASE-STOP +-- TAG-AERIALPARAMETERS-START + +AerialParameters-r18 ::= SEQUENCE { + -- Support of Aerial UE features + aerialUE-Capability-r18 ENUMERATED {supported} OPTIONAL, + -- Support of altitude measurement and event H1/H2-triggered reporting + altitudeMeas-r18 ENUMERATED {supported} OPTIONAL, + -- Support of altitude based measurement configuration of SSB-ToMeasure + altitudeBasedSSB-ToMeasure-r18 ENUMERATED {supported} OPTIONAL, + -- Support of events A3H1, A3H2, A4H1, A4H2, A5H1, A5H2 + eventAxHy-r18 ENUMERATED {supported} OPTIONAL, + -- Support of flight path reporting + flightPathReporting-r18 ENUMERATED {supported} OPTIONAL, + -- Support of flight path availability indication via UAI + flightPathAvailabilityIndicationUAI-r18 ENUMERATED {supported} OPTIONAL, + -- Support of numberOfTriggeringCells for eventA3, eventA4, and eventA5, and additionally, if the UE supports eventAxHy-r18, + -- support of numberOfTriggeringCells for eventA3H1, eventA3H2, eventA4H1, eventA4H2, eventA5H1, and eventA5H2 + multipleCellsMeasExtension-r18 ENUMERATED {supported} OPTIONAL, + -- Support of handling aerial-specific Ns value(s) and Pmax list broadcasted by the cell + nr-NS-PmaxListAerial-r18 ENUMERATED {supported} OPTIONAL, + -- Support of reporting only the measurement report corresponding to the event with the smallest value between the + -- altitude of the UAV and the altitude threshold for which the altitude-related entering condition e.g. A3H1-2 is satisfied, when + -- multiple events of the same type (Hx or AxHy) for the same MO (for AxHy) are triggered simultaneously. + simulMultiTriggerSingleMeasReport-r18 ENUMERATED {supported} OPTIONAL, + -- Support of A2X service(s) using PC5 Sidelink and dedicated resource pool for A2X service(s) + sl-A2X-Service-r18 ENUMERATED {brid, daa, bridAndDAA} OPTIONAL, + ... +} + +-- TAG-AERIALPARAMETERS-STOP -- TAG-APPLAYERMEASPARAMETERS-START AppLayerMeasParameters-r17 ::= SEQUENCE { @@ -11631,7 +14307,14 @@ AppLayerMeasParameters-r17 ::= SEQUENCE { ran-VisibleQoE-Streaming-MeasReport-r17 ENUMERATED {supported} OPTIONAL, ran-VisibleQoE-VR-MeasReport-r17 ENUMERATED {supported} OPTIONAL, ul-MeasurementReportAppLayer-Seg-r17 ENUMERATED {supported} OPTIONAL, - ... + ..., + [[ + qoe-IdleInactiveMeasReport-r18 ENUMERATED {supported} OPTIONAL, + qoe-NRDC-MeasReport-r18 ENUMERATED {supported} OPTIONAL, + qoe-AdditionalMemoryMeasReport-r18 ENUMERATED {kB128, kB256, kB512, kB1024} OPTIONAL, + qoe-PriorityBasedDiscarding-r18 ENUMERATED {supported} OPTIONAL, + srb5-r18 ENUMERATED {supported} OPTIONAL + ]] } -- TAG-APPLAYERMEASPARAMETERS-STOP @@ -11653,6 +14336,8 @@ BandCombinationList-v1590 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandComb BandCombinationList-v15g0 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-v15g0 +BandCombinationList-v15n0 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-v15n0 + BandCombinationList-v1610 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-v1610 BandCombinationList-v1630 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-v1630 @@ -11675,6 +14360,16 @@ BandCombinationList-v1730 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandComb BandCombinationList-v1740 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-v1740 +BandCombinationList-v1760 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-v1760 + +BandCombinationList-v1770 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-v1770 + +BandCombinationList-v1780 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-v1780 + +BandCombinationList-v1790 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-v1790 + +BandCombinationList-v1800 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-v1800 + BandCombinationList-UplinkTxSwitch-r16 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-UplinkTxSwitch-r16 BandCombinationList-UplinkTxSwitch-v1630 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-UplinkTxSwitch-v1630 @@ -11689,6 +14384,8 @@ BandCombinationList-UplinkTxSwitch-v1690 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombinationList-UplinkTxSwitch-v16a0 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-UplinkTxSwitch-v16a0 +BandCombinationList-UplinkTxSwitch-v16e0 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-UplinkTxSwitch-v16e0 + BandCombinationList-UplinkTxSwitch-v1700 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-UplinkTxSwitch-v1700 BandCombinationList-UplinkTxSwitch-v1720 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-UplinkTxSwitch-v1720 @@ -11697,6 +14394,16 @@ BandCombinationList-UplinkTxSwitch-v1730 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombinationList-UplinkTxSwitch-v1740 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-UplinkTxSwitch-v1740 +BandCombinationList-UplinkTxSwitch-v1760 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-UplinkTxSwitch-v1760 + +BandCombinationList-UplinkTxSwitch-v1770 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-UplinkTxSwitch-v1770 + +BandCombinationList-UplinkTxSwitch-v1780 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-UplinkTxSwitch-v1780 + +BandCombinationList-UplinkTxSwitch-v1790 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-UplinkTxSwitch-v1790 + +BandCombinationList-UplinkTxSwitch-v1800 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombination-UplinkTxSwitch-v1800 + BandCombination ::= SEQUENCE { bandList SEQUENCE (SIZE (1..maxSimultaneousBands)) OF BandParameters, featureSetCombination FeatureSetCombinationId, @@ -11741,7 +14448,11 @@ BandCombination-v15g0::= SEQUENCE { mrdc-Parameters-v15g0 MRDC-Parameters-v15g0 OPTIONAL } -BandCombination-v1610 ::= SEQUENCE { +BandCombination-v15n0::= SEQUENCE { + mrdc-Parameters-v15n0 MRDC-Parameters-v15n0 +} + +BandCombination-v1610 ::= SEQUENCE { bandList-v1610 SEQUENCE (SIZE (1..maxSimultaneousBands)) OF BandParameters-v1610 OPTIONAL, ca-ParametersNR-v1610 CA-ParametersNR-v1610 OPTIONAL, ca-ParametersNRDC-v1610 CA-ParametersNRDC-v1610 OPTIONAL, @@ -11806,6 +14517,35 @@ BandCombination-v1740 ::= SEQUENCE { ca-ParametersNR-v1740 CA-ParametersNR-v1740 OPTIONAL } +BandCombination-v1760 ::= SEQUENCE { + ca-ParametersNR-v1760 CA-ParametersNR-v1760, + ca-ParametersNRDC-v1760 CA-ParametersNRDC-v1760 +} + +BandCombination-v1770::= SEQUENCE { + bandList-v1770 SEQUENCE (SIZE (1..maxSimultaneousBands)) OF BandParameters-v1770, + mrdc-Parameters-v1770 MRDC-Parameters-v1770 OPTIONAL, + ca-ParametersNR-v1770 CA-ParametersNR-v1770 OPTIONAL +} + +BandCombination-v1780 ::= SEQUENCE { + ca-ParametersNR-v1780 CA-ParametersNR-v1780 OPTIONAL, + ca-ParametersNRDC-v1780 CA-ParametersNRDC-v1780 OPTIONAL, + bandList-v1780 SEQUENCE (SIZE (1..maxSimultaneousBands)) OF BandParameters-v1780 OPTIONAL, + mrdc-Parameters-v1780 MRDC-Parameters-v1770 OPTIONAL +} + +BandCombination-v1790 ::= SEQUENCE { + supportedIntraENDC-BandCombinationList-r17 SEQUENCE (SIZE (1..maxNrofIntraEndc-Components-r17)) OF SupportedIntraENDC-BandCombination-r17 OPTIONAL +} + +BandCombination-v1800 ::= SEQUENCE { + ca-ParametersNR-v1800 CA-ParametersNR-v1800 OPTIONAL, + ca-ParametersNRDC-v1800 CA-ParametersNRDC-v1800 OPTIONAL, + supportedBandCombListPerBC-SL-U2U-RelayDiscovery-r18 BIT STRING (SIZE (1..maxBandComb)) OPTIONAL, + bandList-v1810 SEQUENCE (SIZE (1..maxSimultaneousBands)) OF BandParameters-v1810 OPTIONAL +} + BandCombination-UplinkTxSwitch-r16 ::= SEQUENCE { bandCombination-r16 BandCombination, bandCombination-v1540 BandCombination-v1540 OPTIONAL, @@ -11848,6 +14588,10 @@ BandCombination-UplinkTxSwitch-v16a0 ::= SEQUENCE { bandCombination-v16a0 BandCombination-v16a0 OPTIONAL } +BandCombination-UplinkTxSwitch-v16e0 ::= SEQUENCE { + bandCombination-v15n0 BandCombination-v15n0 OPTIONAL +} + BandCombination-UplinkTxSwitch-v1700 ::= SEQUENCE { bandCombination-v1700 BandCombination-v1700 OPTIONAL, -- R4 16-1/16-2/16-3 Dynamic Tx switching between 2CC/3CC 2Tx-2Tx/1Tx-2Tx switching @@ -11869,6 +14613,34 @@ BandCombination-UplinkTxSwitch-v1740 ::= SEQUENCE { bandCombination-v1740 BandCombination-v1740 OPTIONAL } +BandCombination-UplinkTxSwitch-v1760 ::= SEQUENCE { + bandCombination-v1760 BandCombination-v1760 OPTIONAL +} + +BandCombination-UplinkTxSwitch-v1770 ::= SEQUENCE { + bandCombination-v1770 BandCombination-v1770 OPTIONAL +} + +BandCombination-UplinkTxSwitch-v1780 ::= SEQUENCE { + bandCombination-v1780 BandCombination-v1780 OPTIONAL +} + +BandCombination-UplinkTxSwitch-v1790 ::= SEQUENCE { + bandCombination-v1790 BandCombination-v1790 OPTIONAL +} + +BandCombination-UplinkTxSwitch-v1800 ::= SEQUENCE { + bandCombination-v1800 BandCombination-v1800 OPTIONAL, + supportedBandPairListNR-r18 SEQUENCE (SIZE (1..maxULTxSwitchingBandPairs)) OF ULTxSwitchingBandPair-r18 OPTIONAL, + -- R1 49-Y: Minimum separation time for two uplink switching on more than 2 bands within any two consecutive reference slots + uplinkTxSwitchingMinimumSeparationTime-r18 ENUMERATED {n0us, n500us} OPTIONAL, + -- R4 38-4: Switching Period for unaffected Band for Dual UL + uplinkTxSwitchingAdditionalPeriodDualUL-List-r18 SEQUENCE (SIZE (1..maxULTxSwitchingBetweenBandPairs-r18)) OF + UplinkTxSwitchingAdditionalPeriodDualUL-r18 OPTIONAL, + -- R4 38-6: Switching period restriction for fallback band combination + switchingPeriodRestriction-r18 ENUMERATED {true} OPTIONAL +} + ULTxSwitchingBandPair-r16 ::= SEQUENCE { bandIndexUL1-r16 INTEGER(1..maxSimultaneousBands), bandIndexUL2-r16 INTEGER(1..maxSimultaneousBands), @@ -11880,11 +14652,50 @@ ULTxSwitchingBandPair-v1700 ::= SEQUENCE { uplinkTxSwitchingPeriod2T2T-r17 ENUMERATED {n35us, n140us, n210us} OPTIONAL } -UplinkTxSwitchingBandParameters-v1700 ::= SEQUENCE { - bandIndex-r17 INTEGER(1..maxSimultaneousBands), - uplinkTxSwitching2T2T-PUSCH-TransCoherence-r17 ENUMERATED {nonCoherent, fullCoherent} OPTIONAL +ULTxSwitchingBandPair-r18 ::= SEQUENCE { + bandIndexUL1-r18 INTEGER(1..maxSimultaneousBands), + bandIndexUL2-r18 INTEGER(1..maxSimultaneousBands), + -- R1 49-X: Supported switching option for each band pair in the band combination for UL Tx switching across more than 2 bands + uplinkTxSwitchingOptionForBandPair-r18 ENUMERATED {switchedUL, dualUL, both}, + -- R4 38-1: Switching period for dynamic UL Tx switching across up to 4 bands in case of inter-band CA, SUL up to two TAGs + uplinkTxSwitchingPeriodForBandPair-r18 SEQUENCE { + switchingPeriodFor2T-r18 ENUMERATED {n35us, n140us, n210us} OPTIONAL, + switchingPeriodFor1T-r18 ENUMERATED {n35us, n140us, n210us} + }, + -- R4 38-2: Application of DL interruptions due to dynamic UL Tx switching + uplinkTxSwitching-DL-Interruption-r18 BIT STRING (SIZE(1..maxSimultaneousBands)) OPTIONAL, + -- R4 38-3: Switching Period for unaffected Band for Dual UL + uplinkTxSwitchingPeriodUnaffectedBandDualUL-List-r18 SEQUENCE (SIZE (1..maxSimultaneousBands-2-r18)) OF + SwitchingPeriodUnaffectedBandDualUL-r18 OPTIONAL } +UplinkTxSwitchingBandParameters-v1700 ::= SEQUENCE { + bandIndex-r17 INTEGER(1..maxSimultaneousBands), + -- R4 38-5: UL-MIMO coherence capability for dynamic Tx switching between 2Tx-2Tx switching among up to 4 bands + uplinkTxSwitching2T2T-PUSCH-TransCoherence-r17 ENUMERATED {nonCoherent, fullCoherent} OPTIONAL +} + +UplinkTxSwitchingAdditionalPeriodDualUL-r18::= SEQUENCE { + uplinkTxSwitchingBetweenBandPairs-r18 SEQUENCE { + bandPairIndex1-r18 INTEGER(1.. maxULTxSwitchingBandPairs), + anotherBandPairOrBand-r18 CHOICE { + bandPairIndex2-r18 INTEGER(1.. maxULTxSwitchingBandPairs), + bandIndex-r18 INTEGER(1..maxSimultaneousBands) + } + }, + -- R4 38-4: Additional switching Period for switching case across three or four bands for Dual UL + switchingAdditionalPeriodDualUL-r18 ENUMERATED {n35us, n140us, n210us} +} + +SwitchingPeriodUnaffectedBandDualUL-r18::= SEQUENCE { + bandIndexUnaffected-r18 INTEGER(1..maxSimultaneousBands), + periodUnaffectedBandDualUL-r18 CHOICE { + maintainedUL-Trans-r18 NULL, + periodOnULBands-r18 ENUMERATED {n35us, n140us, n210us} + } +} + + BandParameters ::= CHOICE { eutra SEQUENCE { bandEUTRA FreqBandIndicatorEUTRA, @@ -11938,12 +14749,44 @@ BandParameters-v1730 ::= SEQUENCE { srs-SwitchingAffectedBandsListNR-r17 SEQUENCE (SIZE (1..maxSimultaneousBands)) OF SRS-SwitchingAffectedBandsNR-r17 } +BandParameters-v1770 ::= SEQUENCE { + ca-BandwidthClassDL-NR-r17 CA-BandwidthClassNR-r17 OPTIONAL, + ca-BandwidthClassUL-NR-r17 CA-BandwidthClassNR-r17 OPTIONAL +} + +BandParameters-v1780 ::= SEQUENCE { + ca-BandwidthClassDL-NR-r17 CA-BandwidthClassNR-r17 OPTIONAL, + ca-BandwidthClassUL-NR-r17 CA-BandwidthClassNR-r17 OPTIONAL, + supportedAggBW-FR2-r17 SEQUENCE { + supportedAggBW-DL-r17 SupportedAggBandwidth-r17 OPTIONAL, + supportedAggBW-UL-r17 SupportedAggBandwidth-r17 OPTIONAL + } OPTIONAL +} + +BandParameters-v1810 ::= SEQUENCE { + -- R1 40-5-4: SRS 8 Tx ports-antenna switching + srs-AntennaSwitching8T8R-r18 SEQUENCE { + antennaSwitch8T8R-r18 ENUMERATED {noTdm, tdmAndNoTdm} OPTIONAL, + downgradeConfig-r18 CHOICE { + empty-r18 NULL, + downgrade-r18 BIT STRING (SIZE (11)) + } OPTIONAL, + entryNumberAffect-r18 INTEGER (1..32) OPTIONAL, + entryNumberSwitch-r18 INTEGER (1..32) OPTIONAL + } OPTIONAL +} + ScalingFactorSidelink-r16 ::= ENUMERATED {f0p4, f0p75, f0p8, f1} IntraBandPowerClass-r16 ::= ENUMERATED {pc2, pc3, spare6, spare5, spare4, spare3, spare2, spare1} SRS-SwitchingAffectedBandsNR-r17 ::= BIT STRING (SIZE (1..maxSimultaneousBands)) +SupportedIntraENDC-BandCombination-r17 ::= SEQUENCE { + supportedBandwidthCombinationSetIntraENDC-v1790 BIT STRING (SIZE (1..32)) OPTIONAL, + mrdc-Parameters-v1790 MRDC-Parameters-v1790 OPTIONAL +} + -- TAG-BANDCOMBINATIONLIST-STOP -- TAG-BANDCOMBINATIONLISTSIDELINKEUTRANR-START @@ -12047,8 +14890,12 @@ CA-BandwidthClassEUTRA ::= ENUMERATED {a, b, c, d, e, f, ...} -- TAG-CA-BANDWIDTHCLASSEUTRA-STOP -- TAG-CA-BANDWIDTHCLASSNR-START --- R4 17-6: new CA BW Classes R2~R12 -CA-BandwidthClassNR ::= ENUMERATED {a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, ...,r2-v1730, r3-v1730, r4-v1730, r5-v1730, r6-v1730, r7-v1730, r8-v1730, r9-v1730, r10-v1730, r11-v1730, r12-v1730 } +-- R4 17-6: new CA BW Classes R2-R12 +-- R4 17-7: new CA BW Classes V, W + +CA-BandwidthClassNR ::= ENUMERATED {a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, ...,r2-v1730, r3-v1730, r4-v1730, r5-v1730, r6-v1730, r7-v1730, r8-v1730, r9-v1730, r10-v1730, r11-v1730, r12-v1730,v-v1770, w-v1770 } + +CA-BandwidthClassNR-r17 ::= ENUMERATED {r, s, t, u, ...} -- TAG-CA-BANDWIDTHCLASSNR-STOP -- TAG-CA-PARAMETERSEUTRA-START @@ -12408,6 +15255,250 @@ CA-ParametersNR-v1740 ::= SEQUENCE { singlePUCCH-ConfigForMulticast-r17 ENUMERATED {supported} OPTIONAL } +CA-ParametersNR-v1760 ::= SEQUENCE { + prioSCellPRACH-OverSP-PeriodicSRS-Support-r17 ENUMERATED {supported} OPTIONAL +} + +CA-ParametersNR-v1770 ::= SEQUENCE { + parallelTxPUCCH-PUSCH-SamePriority-r17 ENUMERATED {supported} OPTIONAL +} + +CA-ParametersNR-v1780 ::= SEQUENCE { + parallelTxPUCCH-PUSCH-SamePriority-r17 ENUMERATED {supported} OPTIONAL, + supportedAggBW-FR1-r17 SEQUENCE { + scalingFactorSCS-r17 ENUMERATED {true} OPTIONAL, + supportedAggBW-FDD-DL-r17 SupportedAggBandwidth-r17 OPTIONAL, + supportedAggBW-FDD-UL-r17 SupportedAggBandwidth-r17 OPTIONAL, + supportedAggBW-TDD-DL-r17 SupportedAggBandwidth-r17 OPTIONAL, + supportedAggBW-TDD-UL-r17 SupportedAggBandwidth-r17 OPTIONAL, + supportedAggBW-TotalDL-r17 SupportedAggBandwidth-r17 OPTIONAL, + supportedAggBW-TotalUL-r17 SupportedAggBandwidth-r17 OPTIONAL + } OPTIONAL +} + +CA-ParametersNR-v1800 ::= SEQUENCE { + codebookParametersetype2DopplerCSI-PerBC-r18 CodebookParametersetype2DopplerCSI-r18 OPTIONAL, + codebookParametersfetype2DopplerCSI-PerBC-r18 CodebookParametersfetype2DopplerCSI-r18 OPTIONAL, + codebookParametersetype2CJT-PerBC-r18 CodebookParametersetype2CJT-r18 OPTIONAL, + codebookParametersfetype2CJT-PerBC-r18 CodebookParametersfetype2CJT-r18 OPTIONAL, + codebookComboParametersCJT-PerBC-r18 CodebookComboParametersCJT-r18 OPTIONAL, + codebookParametersHARQ-ACK-PUSCH-PerBC-r18 CodebookParametersHARQ-ACK-PUSCH-r18 OPTIONAL, + -- R1 40-2-8: Maximum number of TAGs across all CCs + maxNumberTAG-AcrossCC-r18 INTEGER (2..4) OPTIONAL, + -- R1 40-3-3-1: TDCP (Time Domain Channel Properties) report + tdcp-ReportPerBC-r18 SEQUENCE { + valueX-r18 INTEGER (1..2), + maxNumberActiveResource-r18 INTEGER (2..32) + } OPTIONAL, + -- R1 40-3-3-5: Number of CSI-RS resources for TDCP + tdcp-ResourcePerBC-r18 SEQUENCE { + maxNumberConfigPerCC-r18 ENUMERATED {n2,n4,n6,n8,n10,n12}, + maxNumberConfigAcrossCC-r18 INTEGER (1..32), + maxNumberSimultaneousPerCC-r18 ENUMERATED {n2, n4, n6, n8, n12, n16, n20, n24, n28, n32} + } OPTIONAL, + -- R1 40-3-1-24: Timeline for regular eType-II-CJT CSI, or for port selection FeType-II-CJT CSI + timelineRelax-CJT-CSI-CA-r18 ENUMERATED {n0,n2} OPTIONAL, + -- R1 42-1: Spatial domain adaptation with CSI feedback based on CSI report sub-configuration(s) for periodic CSI reporting + spatialAdaptation-CSI-FeedbackPerBC-r18 SEQUENCE { + maxNumberCSI-ResourceAcrossCC-r18 SEQUENCE { + sdType1-Resource-r18 ENUMERATED {n5, n6, n7, n8, n9, n10, n12, n14, n16, n18, n20, n22, + n24, n26, n28, n30, n32, n34, n36, n38, n40, n42, n44, + n46, n48, n50, n52, n54, n56, n58, n60, n62, n64}, + sdType2-Resource-r18 ENUMERATED {n5, n6, n7, n8, n9, n10, n12, n14, n16, n18, n20, n22, + n24, n26, n28, n30, n32, n34, n36, n38, n40, n42, n44, + n46, n48, n50, n52, n54, n56, n58, n60, n62, n64} + }, + maxNumberPortsAcrossCC-r18 SEQUENCE { + sdType1-Resource-r18 INTEGER (1..32), + sdType2-Resource-r18 INTEGER (1..32) + } + } OPTIONAL, + -- R1 40-7-2a: Association between CSI-RS and SRS for non-codebook case + nonCodebook-CSI-RS-SRS-PerBC-r18 SEQUENCE (SIZE (1.. maxNrofCSI-RS-Resources)) OF SupportedCSI-RS-Resource OPTIONAL, + -- R1 42-1a: Spatial domain adaptation with CSI feedback based on CSI report sub-configuration(s) for periodic CSI reporting on + -- PUSCH + spatialAdaptation-CSI-FeedbackPUSCH-PerBC-r18 SEQUENCE { + maxNumberCSI-ResourceAcrossCC-r18 ENUMERATED {n5, n6, n7, n8, n9, n10, n12, n14, n16, n18, n20, n22, n24, n26, n28, + n30, n32, n34, n36, n38, n40, n42, n44, n46, n48, n50, n52, n54, + n56, n58, n60, n62, n64}, + maxNumberPortsAcrossCC-r18 INTEGER (1..32) + } OPTIONAL, + -- R1 42-1b: Spatial domain adaptation with CSI feedback based on CSI report sub-configuration(s) for aperiodic CSI reporting + spatialAdaptation-CSI-FeedbackAperiodicPerBC-r18 SEQUENCE { + maxNumberCSI-ResourceAcrossCC-r18 SEQUENCE { + sdType1-Resource-r18 ENUMERATED {n5, n6, n7, n8, n9, n10, n12, n14, n16, n18, n20, n22, + n24, n26, n28, n30, n32, n34, n36, n38, n40, n42, n44, + n46, n48, n50, n52, n54, n56, n58, n60, n62, n64}, + sdType2-Resource-r18 ENUMERATED {n5, n6, n7, n8, n9, n10, n12, n14, n16, n18, n20, n22, + n24, n26, n28, n30, n32, n34, n36, n38, n40, n42, n44, + n46, n48, n50, n52, n54, n56, n58, n60, n62, n64} + }, + maxNumberPortsAcrossCC-r18 SEQUENCE { + sdType1-Resource-r18 INTEGER (1..32), + sdType2-Resource-r18 INTEGER (1..32) } + } OPTIONAL, + -- R1 42-1c: Spatial domain adaptation with CSI feedback based on CSI report sub-configuration(s) for semi-persistent CSI + -- reporting on PUCCH + spatialAdaptation-CSI-FeedbackPUCCH-PerBC-r18 SEQUENCE { + maxNumberCSI-ResourceAcrossCC-r18 ENUMERATED {n5, n6, n7, n8, n9, n10, n12, n14, n16, n18, n20, n22, n24, n26, n28, + n30, n32, n34, n36, n38, n40, n42, n44, n46, n48, n50, n52, n54, + n56, n58, n60, n62, n64}, + maxNumberPortsAcrossCC-r18 INTEGER (1..32) + } OPTIONAL, + -- R1 42-2: Spatial domain adaptation with CSI feedback based on CSI report sub-configuration(s) for periodic CSI reporting + powerAdaptation-CSI-FeedbackPerBC-r18 SEQUENCE { + maxNumberCSI-ResourceAcrossCC-r18 ENUMERATED {n5, n6, n7, n8, n9, n10, n12, n14, n16, n18, n20, n22, n24, n26, n28, + n30, n32, n34, n36, n38, n40, n42, n44, n46, n48, n50, n52, n54, + n56, n58, n60, n62, n64}, + maxNumberPortsAcrossCC-r18 INTEGER (1..32) + } OPTIONAL, + -- R1 42-2a: Spatial domain adaptation with CSI feedback based on CSI report sub-configuration(s) for periodic CSI reporting on PUSCH + powerAdaptation-CSI-FeedbackPUSCH-PerBC-r18 SEQUENCE { + maxNumberCSI-ResourceAcrossCC-r18 ENUMERATED {n5, n6, n7, n8, n9, n10, n12, n14, n16, n18, n20, n22, n24, n26, n28, + n30, n32, n34, n36, n38, n40, n42, n44, n46, n48, n50, n52, n54, + n56, n58, n60, n62, n64}, + maxNumberPortsAcrossCC-r18 INTEGER (1..32) + } OPTIONAL, + -- R1 42-2b: Spatial domain adaptation with CSI feedback based on CSI report sub-configuration(s) for aperiodic CSI reporting + powerAdaptation-CSI-FeedbackAperiodicPerBC-r18 SEQUENCE { + maxNumberCSI-ResourceAcrossCC-r18 ENUMERATED {n5, n6, n7, n8, n9, n10, n12, n14, n16, n18, n20, n22, n24, n26, n28, + n30, n32, n34, n36, n38, n40, n42, n44, n46, n48, n50, n52, n54, + n56, n58, n60, n62, n64}, + maxNumberPortsAcrossCC-r18 INTEGER (1..32) + } OPTIONAL, + -- R1 42-2c: Spatial domain adaptation with CSI feedback based on CSI report sub-configuration(s) for semi-persistent CSI + -- reporting on PUCCH + powerAdaptation-CSI-FeedbackPUCCH-PerBC-r18 SEQUENCE { + maxNumberCSI-ResourceAcrossCC-r18 ENUMERATED {n5, n6, n7, n8, n9, n10, n12, n14, n16, n18, n20, n22, n24, n26, n28, + n30, n32, n34, n36, n38, n40, n42, n44, n46, n48, n50, n52, n54, + n56, n58, n60, n62, n64}, + maxNumberPortsAcrossCC-r18 INTEGER (1..32) + } OPTIONAL, + + -- R1 42-7: Mixed codebook combination for spatial domain adaptation with CSI feedback based on CSI report sub-configuration(s), + -- each containing one port subset configuration + mixCodeBookSpatialAdaptationPerBC-r18 SEQUENCE (SIZE (1.. maxNrofCSI-RS-Resources)) OF SupportedCSI-RS-Resource OPTIONAL, + -- R1 42-9: Indicates whether the UE supports CSI report framework and the number of CSI report(s) which the UE can + -- simultaneously process across all CCs, and across MCG and SCG in case of NR-DC. + simultaneousCSI-SubReportsAllCC-r18 INTEGER (5..32) OPTIONAL, + + -- R1 49-1: Multi-cell PDSCH scheduling by DCI format 1_3 on a scheduling cell with same SCS between scheduling + -- cell and cells in the set + multiCell-PDSCH-DCI-1-3-SameSCS-r18 SEQUENCE { + coScheduledCellSCS-r18 SEQUENCE { + nonSharedSpectrum-fdd-fr1 ENUMERATED {supported} OPTIONAL, + nonSharedSpectrum-tdd-fr1 ENUMERATED {supported} OPTIONAL, + sharedSpectrum-tdd-fr1 ENUMERATED {supported} OPTIONAL, + fr2-1 ENUMERATED {supported} OPTIONAL, + fr2-2 ENUMERATED {supported} OPTIONAL + }, + maxNumberCoScheduledCell-r18 INTEGER (2..4), + maxNumberSetsOfCellAcrossPUCCH-Group-r18 INTEGER (1..8), + maxNumberSetsOfCellScheduling-r18 INTEGER (1..4), + harqFeedbackType-r18 ENUMERATED {type1, type2, type1And2}, + coScheduledCellIndicationScheme-r18 ENUMERATED {fdra,cellInd, both}, + supportOfSearchSpace-r18 ENUMERATED {supported} OPTIONAL, + licensed-fdd-tdd-fr1-r18 ENUMERATED {supported} OPTIONAL + } OPTIONAL, + -- R1 49-1b: Multi-cell PDSCH scheduling by DCI format 1_3 on a scheduling cell not included in a set of cells with different + -- SCS/carrier type between scheduling cell and cells in the set + multiCell-PDSCH-DCI-1-3-DiffSCS-r18 SEQUENCE { + coScheduledCellSCS-r18 ENUMERATED {lowScheduling-highScheduled, highScheduling-lowScheduled, both}, + combinationCarrierType-r18 SEQUENCE (SIZE(1..maxSchedulingBandCombination-r18)) OF + CombinationCarrierType-r18, + maxNumberCoScheduledCell-r18 INTEGER (2..4), + maxNumberSetsOfCellAcrossPUCCH-Group-r18 INTEGER (1..8), + maxNumberSetsOfCellScheduling-r18 INTEGER (1..4), + harqFeedbackType-r18 ENUMERATED {type1, type2, type1And2}, + coScheduledCellIndicationScheme-r18 ENUMERATED {fdra,cellInd, both} + } OPTIONAL, + -- R1 49-2: Multi-cell PUSCH scheduling by DCI format 0_3 on a scheduling cell with same SCS between scheduling cell + -- and cells in the set + multiCell-PUSCH-DCI-0-3-SameSCS-r18 SEQUENCE { + coScheduledCellSCS-r18 SEQUENCE { + nonSharedSpectrum-fdd-fr1 ENUMERATED {supported} OPTIONAL, + nonSharedSpectrum-tdd-fr1 ENUMERATED {supported} OPTIONAL, + sharedSpectrum-tdd-fr1 ENUMERATED {supported} OPTIONAL, + fr2-1 ENUMERATED {supported} OPTIONAL, + fr2-2 ENUMERATED {supported} OPTIONAL + }, maxNumberCoScheduledCell-r18 INTEGER (2..4), + maxNumberSetsOfCellAcrossPUCCH-Group-r18 INTEGER (1..8), + maxNumberSetsOfCellScheduling-r18 INTEGER (1..4), + coScheduledCellIndicationScheme-r18 ENUMERATED {fdra,cellInd, both}, + supportOfSearchSpace-r18 ENUMERATED {supported} OPTIONAL, + licensed-fdd-tdd-fr1-r18 ENUMERATED {supported} OPTIONAL + } OPTIONAL, + -- R1 49-2b: Multi-cell PUSCH scheduling by DCI format 0_3 on a scheduling cell not included in a set of cells with + -- different SCS/carrier type between scheduling cell and cells in the set + multiCell-PUSCH-DCI-0-3-DiffSCS-r18 SEQUENCE { + coScheduledCellSCS-r18 ENUMERATED {lowScheduling-highScheduled, highScheduling-lowScheduled, both}, + combinationCarrierType-r18 SEQUENCE (SIZE(1..maxSchedulingBandCombination-r18)) OF + CombinationCarrierType-r18, + maxNumberCoScheduledCell-r18 INTEGER (2..4), + maxNumberSetsOfCellAcrossPUCCH-Group-r18 INTEGER (1..8), + maxNumberSetsOfCellScheduling-r18 INTEGER (1..4), + coScheduledCellIndicationScheme-r18 ENUMERATED {fdra,cellInd, both} + } OPTIONAL, + -- R1 49-3x: Advanced UE capability for larger number of unicast DL DCI + advUnicastDCI-DL-r18 SEQUENCE { + scs-15kHz-120kHz-r18 ENUMERATED {n2, n4} OPTIONAL, + scs-15kHz-60kHz-r18 ENUMERATED {n2, n4} OPTIONAL, + scs-30kHz-120kHz-r18 ENUMERATED {n2, n4} OPTIONAL, + scs-15kHz-30kHz-r18 ENUMERATED {n2} OPTIONAL, + scs-30kHz-60kHz-r18 ENUMERATED {n2} OPTIONAL, + scs-60kHz-120kHz-r18 ENUMERATED {n2} OPTIONAL + } OPTIONAL, + -- R1 49-3y: Advanced UE capability for larger number of unicast UL DCI + advUnicastDCI-UL-r18 SEQUENCE { + scs-15kHz-120kHz-r18 ENUMERATED {n2, n4} OPTIONAL, + scs-15kHz-60kHz-r18 ENUMERATED {n2, n4} OPTIONAL, + scs-30kHz-120kHz-r18 ENUMERATED {n2, n4} OPTIONAL, + scs-15kHz-30kHz-r18 ENUMERATED {n2} OPTIONAL, + scs-30kHz-60kHz-r18 ENUMERATED {n2} OPTIONAL, + scs-60kHz-120kHz-r18 ENUMERATED {n2} OPTIONAL + } OPTIONAL, + -- R1 49-5a: Trigger Type 3 HARQ CB based feedback using DCI format 1_3 + type3HARQ-CB-DCI-1-3-r18 ENUMERATED {supported} OPTIONAL, + -- R1 49-5b: Trigger enhanced Type 3 HARQ CB based feedback using DCI format 1_3 + type3EnhHARQ-CB-DCI-1-3-r18 SEQUENCE { + numberOfCodebook-r18 ENUMERATED {n1, n2, n4, n8}, + maxNumberPUCCH-Trans-r18 INTEGER (1..7) + } OPTIONAL, + -- R1 49-9: SCell dormancy indication within active time in DCI format 0_3/1_3 + scellDormancyWithinActiveTime-DCI-0-3-And-1-3-r18 ENUMERATED {supported} OPTIONAL, + pdcch-MonitoringCA-Ext-r18 CHOICE { + -- R1 55-6a: Capability on the number of CCs for monitoring a maximum number of BDs and non-overlapped CCEs per span when + -- configured with DL CA with Rel-16 PDCCH monitoring capability on all the serving cells + pdcch-MonitoringCA-r18 SEQUENCE { + maxNumberOfMonitoringCC-r18 INTEGER (2..16), + supportedSpanArrangement-r18 ENUMERATED {alignedOnly, alignedAndNonAligned} + }, + -- R1 55-6f: Capability on the number of CCs for monitoring a maximum number of BDs and non-overlapped CCEs per span when + -- configured with DL CA with Rel-16 PDCCH monitoring capability on all the serving cells with restriction for non-aligned + -- span case + pdcch-MonitoringCA-NonAlignedSpan-r18 INTEGER (2..16) + } OPTIONAL, + pdcch-BlindDetectionCA-MixedExt-r18 CHOICE { + -- R1 55-6c: Number of carriers for CCE/BD scaling with DL CA with mix of Rel. 16 and Rel. 15 PDCCH monitoring capabilities on + -- different carriers + pdcch-BlindDetectionCA-Mixed-r18 SEQUENCE { + blindDetectionCA-Mixed-r18 SEQUENCE(SIZE (1..maxNrofPdcch-BlindDetectionMixed-1-r16)) OF + PDCCH-BlindDetectionCA-MixedExt-r16, + supportedSpanArrangement-r18 ENUMERATED{ alignedOnly, alignedAndNonAligned } + }, + -- R1 55-6g: Number of carriers for CCE/BD scaling with DL CA with mix of Rel. 16 and Rel. 15 PDCCH monitoring capabilities on + -- different carriers with restriction for non-aligned span case + pdcch-BlindDetectionCA-Mixed-NonAlignedSpan-r18 SEQUENCE(SIZE (1..maxNrofPdcch-BlindDetectionMixed-1-r16)) OF + PDCCH-BlindDetectionCA-MixedExt-r16 + } OPTIONAL, + -- R1 55-6e: Number of carriers for CCE/BD scaling for MCG and for SCG when configured for NR-DC operation with mix of Rel. 16 + -- and Rel. 15 PDCCH monitoring capabilities on different carriers + pdcch-BlindDetectionMCG-SCG-List-r18 SEQUENCE(SIZE (1..maxNrofPdcch-BlindDetectionMixed-1-r16)) OF + PDCCH-BlindDetectionMixed2-r18 OPTIONAL, + -- R4 33-1: Support of intra-band non-collocated NR CA operation + intraBandNR-CA-non-collocated-r18 ENUMERATED {supported} OPTIONAL +} + CrossCarrierSchedulingSCell-SpCell-r17 ::= SEQUENCE { supportedSCS-Combinations-r17 SEQUENCE { scs15kHz-15kHz-r17 ENUMERATED {supported} OPTIONAL, @@ -12483,6 +15574,11 @@ PDCCH-BlindDetectionCA-Mixed1-r17 ::= SEQUENCE { pdcch-BlindDetectionCA3-r17 INTEGER (1..15) OPTIONAL } +PDCCH-BlindDetectionMixed2-r18 ::= SEQUENCE{ + pdcch-BlindDetectionMCG-UE-Mixed-r18 PDCCH-BlindDetectionCG-UE-MixedExt-r16, + pdcch-BlindDetectionSCG-UE-Mixed-r18 PDCCH-BlindDetectionCG-UE-MixedExt-r16 +} + SimulSRS-ForAntennaSwitching-r16 ::= SEQUENCE { supportSRS-xTyR-xLessThanY-r16 ENUMERATED {supported} OPTIONAL, supportSRS-xTyR-xEqualToY-r16 ENUMERATED {supported} OPTIONAL, @@ -12523,6 +15619,11 @@ PUCCH-Group-Config-r17 ::= SEQUENCE { fr1-FR2-NonSharedTDD-r17 ENUMERATED {supported} OPTIONAL } +CombinationCarrierType-r18 ::= SEQUENCE { + schedulingCellCarrierType-r18 ENUMERATED {licensed-fdd-fr1, licensed-tdd-fr1, unlicensed-tdd-fr1, fr2-1, fr2-2}, + scheduledCellCarrierType-r18 ENUMERATED {licensed-fdd-fr1, licensed-tdd-fr1, unlicensed-tdd-fr1, fr2-1, fr2-2} +} + -- TAG-CA-PARAMETERSNR-STOP -- TAG-CA-PARAMETERS-NRDC-START @@ -12580,7 +15681,30 @@ CA-ParametersNRDC-v1720 ::= SEQUENCE { } CA-ParametersNRDC-v1730 ::= SEQUENCE { - ca-ParametersNR-ForDC-v1730 CA-ParametersNR-v1730 OPTIONAL + ca-ParametersNR-ForDC-v1730 CA-ParametersNR-v1730 OPTIONAL +} + +CA-ParametersNRDC-v1760 ::= SEQUENCE { + ca-ParametersNR-ForDC-v1760 CA-ParametersNR-v1760 +} + +CA-ParametersNRDC-v1780 ::= SEQUENCE { + ca-ParametersNR-ForDC-v1780 CA-ParametersNR-v1780 OPTIONAL +} + +CA-ParametersNRDC-v1800 ::= SEQUENCE { + ca-ParametersNR-ForDC-v1800 CA-ParametersNR-v1800 OPTIONAL, + -- R1 55-6d: Capability on the number of CCs for monitoring a maximum number of BDs and non-overlapped CCEs per span for MCG and for + -- SCG when configured for NR-DC operation with Rel-16 PDCCH monitoring on all the serving cells + pdcch-BlindDetectionNRDC-r18 SEQUENCE(SIZE (1..maxNrofPdcch-BlindDetectionMixed-1-r16)) OF + PDCCH-BlindDetectionMixed1-r18 OPTIONAL +} + +PDCCH-BlindDetectionMixed1-r18::= SEQUENCE { + pdcch-BlindDetectionCG-UE-Mixed-r18 SEQUENCE{ + pdcch-BlindDetectionMCG-UE-Mixed-r18 INTEGER (1..15), + pdcch-BlindDetectionSCG-UE-Mixed-r18 INTEGER (1..15) + } } -- TAG-CA-PARAMETERS-NRDC-STOP @@ -12987,6 +16111,171 @@ CodebookComboParameterMultiTRP-PerBC-r17::= SEQUENCE { OPTIONAL } +CodebookParametersetype2DopplerCSI-r18 ::= SEQUENCE { + -- R1 40-3-2-1: Support of Rel-16-based doppler CSI + eType2Doppler-r18 SEQUENCE { + supportedCSI-RS-ResourceList-r18 SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER + (0..maxNrofCSI-RS-ResourcesAlt-1-r16), + valueY-P-SP-CSI-RS-r18 INTEGER (1..3), + valueY-A-CSI-RS-r18 INTEGER (1..3), + scalingfactor-r18 ENUMERATED {n1, n2, n4} + }, + -- R1 40-3-2-1a: Support of Rel-16-based doppler measurement with N4>1 + eType2DopplerN4-r18 SEQUENCE { + supportedCSI-RS-ReportSettingList1-r18 SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF + SupportedCSI-RS-ReportSetting-r18, + supportedCSI-RS-ReportSettingList2-r18 SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF + SupportedCSI-RS-ReportSetting-r18 + } OPTIONAL, + -- R1 40-3-2-1a-1: DD unit size when A-CSI-RS is configured for CMR N4>1 + ddUnitSize-A-CSI-RS-CMR-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-3-2-1b: Maximum number of aperiodic CSI-RS resources that can be configured in the same CSI report setting for + -- Rel-16-based doppler measurement + maxNumberAperiodicCSI-RS-Resource-r18 ENUMERATED {n4, n8, n12} OPTIONAL, + -- R1 40-3-2-2: Support R=2 for Rel-16-based doppler codebook + eType2DopplerR2-r18 SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER (0..maxNrofCSI-RS-ResourcesAlt-1-r16) + OPTIONAL, + -- R1 40-3-2-3: Support X=1 based on first and last slot of WCSI, for Rel-16-based doppler codebook + eType2DopplerX1-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-3-2-3a: Support X=2 CQI based on 2 slots for Rel-16-based doppler codebook + eType2DopplerX2-r18 ENUMERATED {supported} OPTIONAL, + --R1 40-3-2-7: support of l = (n - nCSI,ref ) for CSI reference slot for Rel-16 based doppler codebook + eType2DopplerL-N4D1-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-3-2-8: Support of L=6 for Rel-16 based doppler codebook + eType2DopplerL6-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-3-2-9: Support of rank equals 3 and 4 for Rel-16 based doppler codebook + eType2DopplerR3R4-r18 ENUMERATED {supported} OPTIONAL +} + +CodebookParametersfetype2DopplerCSI-r18 ::= SEQUENCE { + -- R1 40-3-2-4: Support of Rel-17-based doppler CSI + feType2Doppler-r18 SEQUENCE { + supportedCSI-RS-ResourceList-r18 SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER + (0..maxNrofCSI-RS-ResourcesAlt-1-r16), + valueY-A-CSI-RS-r18 INTEGER (1..3), + scalingfactor-r18 ENUMERATED {n1, n2, n4} + }, + -- R1 40-3-2-4b: Maximum number of aperiodic CSI-RS resources that can be configured in the same CSI report setting for + -- Rel-17-based doppler CSI + maxNumberAperiodicCSI-RS-Resource-r18 ENUMERATED {n4, n8, n12} OPTIONAL, + + -- R1 40-3-2-5: Support of M=2 and R=1 for Rel-17-based doppler codebook + feType2DopplerM2R1-r18 SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER + (0..maxNrofCSI-RS-ResourcesAlt-1-r16) + OPTIONAL, + -- R1 40-3-2-6: Support R=2 for Rel-17-based doppler codebook + feType2DopplerR2-r18 SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER (0..maxNrofCSI-RS-ResourcesAlt-1-r16) + OPTIONAL, + --R1 40-3-2-7a: Support of l = (n - nCSI,ref ) for CSI reference slot for Rel-17 based doppler codebook + feType2DopplerL-N4D1-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-3-2-10: Support of rank equals 3 and 4 for Rel-17 based doppler codebook + feType2DopplerR3R4-r18 ENUMERATED {supported} OPTIONAL +} + +CodebookParametersetype2CJT-r18 ::= SEQUENCE { + -- R1 40-3-1-1: Basic feature for Rel-16-based CJT type-II codebook + eType2CJT-r18 SEQUENCE { + supportedCSI-RS-ResourceList-r18 SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER + (0..maxNrofCSI-RS-ResourcesAlt-1-r16), + scalingfactor-r18 ENUMERATED {n1, n1dot5, n2}, + maxNumberNZP-CSI-RS-MultiTRP-CJT-r18 INTEGER (2..4) + }, + -- R1 40-3-1-1a: Support of mode 1 for Rel-16-based CJT type-II codebook with FD basis selection integer frequency offset + eType2CJT-FD-IO-r18 SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER + (0..maxNrofCSI-RS-ResourcesAlt-1-r16) OPTIONAL, + -- R1 40-3-1-2: Support for FD basis selection fractional offset mode for Rel-16-based CJT codebook with mode1 + eType2CJT-FD-FO-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-3-1-3: Support R=2 for Rel-16-based CJT codebook + eType2CJT-R2-r18 SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER + (0..maxNrofCSI-RS-ResourcesAlt-1-r16) OPTIONAL, + -- R1 40-3-1-4: Support pv={1/2,1/2,1/2,1/2} and beta=1/2 for Rel-16-based CJT codebook + eType2CJT-PV-Beta-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-3-1-9: Support for 2NN1N2 >32 for Rel-16 based CJT codebook + eType2CJT-2NN1N2-r18 ENUMERATED {n64,n96,n128} OPTIONAL, + -- R1 40-3-1-12: Support of Rank 3 and 4 for Rel-16-based CJT type-II codebook + eType2CJT-Rank3Rank4-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-3-1-14: Support of Support of L=6 for Rel-16-based CJT type-II codebook + eType2CJT-L6-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-3-1-15: dynamic selection of N<=N_TRP for Rel-16-based CJT type-II codebook + eType2CJT-NN-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-3-1-17: Support for N_L>1 combinations of number of SD basis across CSI-RS resources for Rel-16-based CJT + -- type-II codebook + eType2CJT-NL-SD-r18 ENUMERATED {n2,n4} OPTIONAL, + -- R1 40-3-1-23: Unequal number of spatial basis selection configuration for multi-TRP CJT + eType2CJT-Unequal-r18 ENUMERATED {supported} OPTIONAL +} + +CodebookParametersfetype2CJT-r18 ::= SEQUENCE { + -- R1 40-3-1-5: Basic feature for Rel-17-based CJT type-II codebook + feType2CJT-r18 SEQUENCE { + supportedCSI-RS-ResourceList-r18 SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER + (0..maxNrofCSI-RS-ResourcesAlt-1-r16), + scalingfactor-r18 ENUMERATED {n1, n1dot5, n2}, + maxNumberNZP-CSI-RS-MultiTRP-CJT-r18 INTEGER (2..4) + }, + -- R1 40-3-1-5a: Support of mode 1 for Rel-17-based CJT type-II codebook with FD basis selection integer frequency offset + feType2CJT-FD-IO-r18 SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER + (0..maxNrofCSI-RS-ResourcesAlt-1-r16) OPTIONAL, + -- R1 40-3-1-6: Support for FD basis selection fractional offset mode for Rel-17-based CJT codebook with mode1 + feType2CJT-FD-FO-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-3-1-7: Support of M=2 and R=1 for Rel-17-based CJT codebook + feType2CJT-M2R1-r18 SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER + (0..maxNrofCSI-RS-ResourcesAlt-1-r16) OPTIONAL, + -- R1 40-3-1-8: Support of R=2 for Rel-17-based CJT codebook + feType2CJT-R2-r18 SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER + (0..maxNrofCSI-RS-ResourcesAlt-1-r16) OPTIONAL, + -- R1 40-3-1-9a: Support for 2NN1N2 >32 for Rel-17 based CJT codebook + feType2CJT-2NN1N2-r18 ENUMERATED {n64,n96,n128} OPTIONAL, + -- R1 40-3-1-13: Support of Rank 3 and 4 for Rel-17-based CJT type-II codebook + feType2CJT-Rank3Rank4-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-3-1-16: dynamic selection of N<=N_TRP for Rel-17-based CJT type-II codebook + feType2CJT-NN-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-3-1-18: Support for N_L>1 combinations of number of SD basis across CSI-RS resources for Rel-17-based CJT + -- type-II codebook + feType2CJT-NL-r18 ENUMERATED {n2,n4} OPTIONAL, + -- R1 40-3-1-23a: Unequal number of port selection configuration for multi-TRP CJT + feType2CJT-Unequal-r18 ENUMERATED {supported} OPTIONAL +} + +CodebookComboParametersCJT-r18::= SEQUENCE { + -- R1 40-3-1-11: Active CSI-RS resources and ports for mixed codebook types including Type-II-CJT in any slot + -- {Codebook 1} = Type I SP + cjt-Type1SP-eType2R1-null SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER (0..maxNrofCSI-RS-ResourcesAlt-1-r16) + OPTIONAL, + cjt-Type1SP-eType2R2-null SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER (0..maxNrofCSI-RS-ResourcesAlt-1-r16) + OPTIONAL, + cjt-Type1SP-feType2R1M1-null SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER (0..maxNrofCSI-RS-ResourcesAlt-1-r16) + OPTIONAL, + cjt-Type1SP-feType2R1M2-null SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER (0..maxNrofCSI-RS-ResourcesAlt-1-r16) + OPTIONAL, + cjt-Type1SP-feType2R2M2-null SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER (0..maxNrofCSI-RS-ResourcesAlt-1-r16) + OPTIONAL, + -- {Codebook 1} = Type I MP + cjt-Type1MP-eType2R1-null SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER (0..maxNrofCSI-RS-ResourcesAlt-1-r16) + OPTIONAL, + cjt-Type1MP-eType2R2-null SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER (0..maxNrofCSI-RS-ResourcesAlt-1-r16) + OPTIONAL, + cjt-Type1MP-feType2R1M1-null SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER (0..maxNrofCSI-RS-ResourcesAlt-1-r16) + OPTIONAL, + cjt-Type1MP-feType2R1M2-null SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER (0..maxNrofCSI-RS-ResourcesAlt-1-r16) + OPTIONAL, + cjt-Type1MP-feType2R2M2-null SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesExt-r16)) OF INTEGER (0..maxNrofCSI-RS-ResourcesAlt-1-r16) + OPTIONAL +} + +CodebookParametersHARQ-ACK-PUSCH-r18::= SEQUENCE { + -- R1 55-4a: Multiplexing Type-1 HARQ-ACK codebook in a PUSCH for PDSCH scheduled after UL grant + multiplexingType1-r18 ENUMERATED {supported} OPTIONAL, + -- R1 55-4b: Multiplexing Type-2 HARQ-ACK codebook in a PUSCH for PDSCH scheduled after UL grant + multiplexingType2-r18 ENUMERATED {supported} OPTIONAL, + -- R1 55-4c: Multiplexing Type-3 HARQ-ACK codebook in a PUSCH for PDSCH scheduled after UL grant + multiplexingType3-r18 ENUMERATED {supported} OPTIONAL, + -- R1 55-4d: Determining a different PUCCH resource to transmit HARQ-ACK for PDSCH scheduled after UL grant + pucch-DiffResource-PDSCH-r18 ENUMERATED {supported} OPTIONAL, + -- R1 55-4e: Determining different codebook size to transmit HARQ-ACK for PDSCH scheduled after UL grant + diffCB-Size-PDSCH-r18 ENUMERATED {supported} OPTIONAL +} + CodebookVariantsList-r16 ::= SEQUENCE (SIZE (1..maxNrofCSI-RS-ResourcesAlt-r16)) OF SupportedCSI-RS-Resource SupportedCSI-RS-Resource ::= SEQUENCE { @@ -12995,7 +16284,43 @@ SupportedCSI-RS-Resource ::= SEQUENCE { totalNumberTxPortsPerBand INTEGER (2..256) } +SupportedCSI-RS-ReportSetting-r18 ::= SEQUENCE { + maxN4-r18 ENUMERATED {n1, n2, n4, n8}, + maxNumberTxPortsPerResource-r18 ENUMERATED {p2, p4, p8, p12, p16, p24, p32}, + maxNumberResourcesPerBand-r18 INTEGER (1..64), + totalNumberTxPortsPerBand-r18 INTEGER (2..256) +} + -- TAG-CODEBOOKPARAMETERS-STOP +-- TAG-DL-PRS-MEASUREMENTWITHRXFH-RRC-CONNECTED-START + +DL-PRS-MeasurementWithRxFH-RRC-Connected-r18 ::= SEQUENCE { + maximumPRS-BandwidthAcrossAllHopsFR1-r18 ENUMERATED {mhz40, mhz50, mhz80, mhz100} OPTIONAL, + maximumPRS-BandwidthAcrossAllHopsFR2-r18 ENUMERATED {mhz100, mhz200, mhz400} OPTIONAL, + maximumFH-Hops-r18 ENUMERATED {n2, n3, n4, n5, n6} OPTIONAL, + processingDuration-r18 SEQUENCE { + processingPRS-SymbolsDurationN3-r18 ENUMERATED {msDot125, msDot25, msDot5, ms1, ms2, ms4, ms6, ms8, ms12, + ms16, ms20, ms25, ms30, ms32, ms35, ms40, ms45, ms50}, + processingDurationT3-r18 ENUMERATED {ms8, ms16, ms20, ms30, ms40, ms80, ms160, ms320, ms640, ms1280} + } OPTIONAL, + rf-RxRetunTimeFR1-r18 ENUMERATED {n70, n140, n210} OPTIONAL, + rf-RxRetunTimeFR2-r18 ENUMERATED {n35, n70, n140} OPTIONAL, + numOfOverlappingPRB-r18 ENUMERATED {n0, n1, n2, n4} OPTIONAL, + ... +} + +-- TAG-DL-PRS-MEASUREMENTWITHRXFH-RRC-CONNECTED-STOP +-- TAG-EREDCAPPARAMETERS-START + +ERedCapParameters-r18::= SEQUENCE { + -- R1 48-1: eRedCap UE with reduced peak data rate and reduced baseband bandwidth in FR1 + supportOfERedCap-r18 ENUMERATED {supported}, + -- R1 48-2: eRedCap UE with reduced peak data rate without reduced baseband bandwidth in FR1 + eRedCapNotReducedBB-BW-r18 ENUMERATED {supported} OPTIONAL, + eRedCapIgnoreCapabilityFiltering-r18 ENUMERATED {supported} OPTIONAL +} + +-- TAG-EREDCAPPARAMETERS-STOP -- TAG-FEATURESETCOMBINATION-START FeatureSetCombination ::= SEQUENCE (SIZE (1..maxSimultaneousBands)) OF FeatureSetsPerBand @@ -13198,6 +16523,95 @@ FeatureSetDownlink-v1730 ::= SEQUENCE { prs-AsSpatialRelationRS-For-SRS-r17 ENUMERATED {supported} OPTIONAL } +FeatureSetDownlink-v1800 ::= SEQUENCE { + -- R1 40-1-14a: Dynamic switching - scheme A + dynamicSwitchingA-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-1-14b: Dynamic switching - scheme B + dynamicSwitchingB-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-3-2-11: Aperiodic CSI report timing relaxation for doppler codebook based on Type-II codebook + aperiodicCSI-TimeRelaxation-r18 SEQUENCE { + valueW-r18 SEQUENCE{ + scs-15kHz ENUMERATED {value1, value2} OPTIONAL, + scs-30kHz ENUMERATED {value1, value2} OPTIONAL, + scs-60kHz ENUMERATED {value1, value2} OPTIONAL, + scs-120kHz ENUMERATED {value1, value2} OPTIONAL + }, + timeRelaxation-r18 ENUMERATED {cap1, cap2} + } OPTIONAL, + -- R1 40-4-1: Basic feature of Rel.18 enhanced DMRS ports for PDSCH for scheduling of mapping type A + pdsch-TypeA-DMRS-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-1a: Basic feature of Rel.18 enhanced DMRS ports for PDSCH for scheduling of mapping type B + pdsch-TypeB-DMRS-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-1b: 1 symbol FL DMRS and 2 additional DMRS symbols for more than one port for Rel.18 enhanced DMRS ports for PDSCH + pdsch-1SymbolFL-DMRS-Addition2Symbol-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-1c: Alternative additional DMRS position for co-existence with LTE CRS for Rel.18 enhanced DMRS ports for PDSCH + pdsch-AlternativeDMRS-Coexistence-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-1d: 2 symbols FL-DMRS for Rel.18 enhanced DMRS ports for PDSCH + pdsch-2SymbolFL-DMRS-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-1e: 2-symbol FL DMRS + one additional 2-symbols DMRS for Rel.18 enhanced DMRS ports for PDSCH + pdsch-2SymbolFL-DMRS-Addition2Symbol-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-1f: 1 symbol FL DMRS and 3 additional DMRS symbols for Rel.18 enhanced DMRS ports for PDSCH + pdsch-1SymbolFL-DMRS-Addition3Symbol-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-1g: DMRS type for Rel.18 enhanced DMRS ports for PDSCH + pdsch-DMRS-Type-r18 ENUMERATED {etype1, etype1And2} OPTIONAL, + -- R1 40-4-1h: 1 port DL PTRS for Rel.18 enhanced DMRS ports for PDSCH with rank 1-8 + pdsch-1PortDL-PTRS-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-1i: 2 port DL PTRS for Rel.18 enhanced DMRS ports for PDSCH with rank 1-8 + pdsch-2PortDL-PTRS-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-1j: Support 1 symbol FL DMRS and 2 additional DMRS symbols for at least one port for scheduling of mapping type A + mappingTypeA-1SymbolFL-DMRS-Addition2Symbol-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-2: Capability on the maximum number of configured DMRS types for PDSCH across all DL DCI formats per cell + maxNumberDMRS-AcrossAllDL-DCI-r18 INTEGER (2..4) OPTIONAL, + -- R1 40-4-4: Reception of PDSCH without the scheduling restriction for Rel.18 eType1 DMRS ports + pdsch-ReceptionWithoutSchedulingRestriction-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-4a: Reception of PDSCH without the scheduling restriction for Rel.18 eType1 DMRS ports for PDSCH with fdmSchemeA + pdsch-ReceptionSchemeA-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-4b: Reception of PDSCH without the scheduling restriction for Rel.18 eType1 DMRS ports for PDSCH with fdmSchemeB + pdsch-ReceptionSchemeB-r18 ENUMERATED {supported} OPTIONAL, + + -- R1 40-4-5: Rel-18 DL DMRS with single DCI based M-TRP + dmrs-MultiTRP-SingleDCI-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-5a: Additional row(s) for antenna ports (0,2,3) for Rel.18 DL DMRS ports for single-DCI based M-TRP + dmrs-MultiTRP-AdditionRows-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-7: Rel-18 DL DMRS with M-DCI based M-TRP + dmrs-MultiTRP-MultiDCI-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-12: Support of Rel-18 DMRS and PDSCH processing capability 2 simultaneously + simulDMRS-PDSCH-r18 SEQUENCE { + scs-15kHz-r18 INTEGER (0..4) OPTIONAL, + scs-30kHz-r18 INTEGER (0..5) OPTIONAL, + scs-60kHz-r18 INTEGER (0..7) OPTIONAL + } OPTIONAL, + + -- R1 53-1: Support RLM/BM/BFD and gapless L3 intra-frequency measurements based on CD-SSB outside active BWP without interruptions + bwpOperationMeasWithoutInterrupt-r18 ENUMERATED {supported} OPTIONAL, + + -- R1 55-6: (2, 2) span-based PDCCH monitoring with additional restriction(s) + pdcch-MonitoringSpan2-2-r18 SEQUENCE{ + pdsch-ProcessingType1-r18 SEQUENCE{ + scs-15kHz-r18 ENUMERATED {supported} OPTIONAL, + scs-30kHz-r18 ENUMERATED {supported} OPTIONAL + }, + pdsch-ProcessingType2-r18 SEQUENCE{ + scs-15kHz-r18 ENUMERATED {supported} OPTIONAL, + scs-30kHz-r18 ENUMERATED {supported} OPTIONAL + } + } OPTIONAL, + -- R1 55-6b: Mix of Rel-16 PDCCH monitoring capability and Rel. 15 PDCCH monitoring capability on different carriers + pdcch-MonitoringMixed-r18 ENUMERATED {supported} OPTIONAL, + -- R1 55-6h: PDCCH repetition for Rel-16 PDCCH monitoring + mTRP-PDCCH-legacyMonitoring-r18 SEQUENCE { + scs-15kHz-r18 PDCCH-RepetitionParameters-r17 OPTIONAL, + scs-30kHz-r18 PDCCH-RepetitionParameters-r17 OPTIONAL + } OPTIONAL, + + -- R4 42-1: Support of SCell without SS/PBCH block for inter-band CA + scellWithoutSSB-InterBandCA-r18 CHOICE { + supportOfSingleGroup ENUMERATED {referenceBand, scellWithoutSSB, both}, + supportOfMultipleGroups ENUMERATED {referenceBand1, scellWithoutSSB1, referenceBand2, scellWithoutSSB2} + } OPTIONAL, + pdcch-RACH-DL-InfoList-r18 SEQUENCE (SIZE (1..maxBandsMRDC)) OF PDCCH-RACH-DL-Info-r18 OPTIONAL +} + PDCCH-MonitoringOccasions-r16 ::= SEQUENCE { period7span3-r16 ENUMERATED {supported} OPTIONAL, period4span3-r16 ENUMERATED {supported} OPTIONAL, @@ -13315,6 +16729,26 @@ FeatureSetDownlinkPerCC-v1730 ::= SEQUENCE { dci-BroadcastWith16Repetitions-r17 ENUMERATED {supported} OPTIONAL } +FeatureSetDownlinkPerCC-v1780 ::= SEQUENCE { + supportedBandwidthDL-v1780 SupportedBandwidth-v1700 OPTIONAL +} + +FeatureSetDownlinkPerCC-v1800 ::= SEQUENCE { + -- R1 40-2-1: Basic feature for multi-DCI based intra-cell Multi-TRP operation with two TA enhancement + multiDCI-IntraCellMultiTRP-TwoTA-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-2-2: Basic feature for multi-DCI based inter-cell Multi-TRP operation with two TA enhancement + multiDCI-InterCellMultiTRP-TwoTA-r18 INTEGER (1..2) OPTIONAL, + -- R1 40-2-6: Rx timing difference larger than CP length + rxTimingDiff-r18 ENUMERATED {supported} OPTIONAL, + + -- R1 55-7: Two QCL TypeD for CORESET monitoring in multi-DCI based multi-TRP + multiDCI-MultiTRP-CORESET-Monitoring-r18 ENUMERATED {supported} OPTIONAL, + broadcastNonServingCell-r18 ENUMERATED {supported} OPTIONAL, + + -- R4 30-1: Supports scheduling restriction relaxation and measurement restriction relaxation + schedulingMeasurementRelaxation-r18 ENUMERATED {supported} OPTIONAL +} + MultiDCI-MultiTRP-r16 ::= SEQUENCE { maxNumberCORESET-r16 ENUMERATED {n2, n3, n4, n5}, maxNumberCORESETPerPoolIndex-r16 INTEGER (1..3), @@ -13391,6 +16825,16 @@ FeatureSets ::= SEQUENCE { [[ featureSetsDownlink-v1730 SEQUENCE (SIZE (1..maxDownlinkFeatureSets)) OF FeatureSetDownlink-v1730 OPTIONAL, featureSetsDownlinkPerCC-v1730 SEQUENCE (SIZE (1..maxPerCC-FeatureSets)) OF FeatureSetDownlinkPerCC-v1730 OPTIONAL + ]], + [[ + featureSetsDownlinkPerCC-v1780 SEQUENCE (SIZE (1..maxPerCC-FeatureSets)) OF FeatureSetDownlinkPerCC-v1780 OPTIONAL, + featureSetsUplinkPerCC-v1780 SEQUENCE (SIZE (1..maxPerCC-FeatureSets)) OF FeatureSetUplinkPerCC-v1780 OPTIONAL + ]], + [[ + featureSetsDownlink-v1800 SEQUENCE (SIZE (1..maxDownlinkFeatureSets)) OF FeatureSetDownlink-v1800 OPTIONAL, + featureSetsDownlinkPerCC-v1800 SEQUENCE (SIZE (1..maxPerCC-FeatureSets)) OF FeatureSetDownlinkPerCC-v1800 OPTIONAL, + featureSetsUplink-v1800 SEQUENCE (SIZE (1..maxUplinkFeatureSets)) OF FeatureSetUplink-v1800 OPTIONAL, + featureSetsUplinkPerCC-v1800 SEQUENCE (SIZE (1..maxPerCC-FeatureSets)) OF FeatureSetUplinkPerCC-v1800 OPTIONAL ]] } @@ -13622,6 +17066,92 @@ FeatureSetUplink-v1720 ::= SEQUENCE { extendedDC-LocationReport-r17 ENUMERATED {supported} OPTIONAL } +FeatureSetUplink-v1800 ::= SEQUENCE { + -- R1 40-3-3-1a: Supported maximum delay value larger than D_basic + maxDelayValueBeyondD-Basic-r18 ENUMERATED {sl2,sl3,sl4,sl5,sl6,sl10} OPTIONAL, + -- R1 40-3-3-2: Number of delay values + tdcp-NumberDelayValue-r18 INTEGER (2..4) OPTIONAL, + -- R1 40-3-3-4: Phase report + phaseReportMoreThanOne-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-3-3-6: Maximum number of TRS resource sets in a report configuration + maxNumberTRS-ResourceSet-r18 INTEGER (2..3) OPTIONAL, + -- R1 40-3-3-7: Maximum number of TDCP report settings per-BWP + maxNumberTDCP-PerBWP-r18 INTEGER (1..4) OPTIONAL, + + -- R1 40-4-6c: DMRS type for Rel.18 enhanced DMRS ports for PUSCH + pusch-DMRS-TypeEnh-r18 SEQUENCE { + dmrs-Type-r18 ENUMERATED {etype1, both}, + pusch-TypeA-DMRS-r18 SEQUENCE { + -- R1 40-4-6: Basic feature of Rel.18 enhanced DMRS ports for PUSCH for scheduling mapping of type A for Rel.18 enhanced + -- DMRS ports + dmrs-TypeA-r18 ENUMERATED {supported}, + -- R1 40-4-6d: 2 symbols front-loaded DMRS (uplink) for Rel.18 enhanced DMRS ports for PUSCH + pusch-2SymbolFL-DMRS-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-6e: 2-symbol FL DMRS + one additional 2-symbols DMRS for Rel.18 enhanced DMRS ports for PUSCH + pusch-2SymbolFL-DMRS-Addition2Symbol-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-6f: 1 symbol FL DMRS and 3 additional DMRS symbols for Rel.18 enhanced DMRS ports for PUSCH + pusch-1SymbolFL-DMRS-Addition3Symbol-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-6k: 1 symbol FL DMRS and 2 additional DMRS symbols for more than one port for Rel.18 enhanced DMRS ports for + -- PUSCH + pusch-1SymbolFL-DMRS-BeyondOnePort-r18 ENUMERATED {supported} OPTIONAL + } OPTIONAL, + -- R1 40-4-10: DMRS port configuration for PUSCH with 8Tx + pusch-DMRS8Tx-r18 ENUMERATED {rel15, both} OPTIONAL, + -- R1 40-4-6a: Basic feature of Rel.18 enhanced DMRS ports for PUSCH for scheduling type B for Rel.18 enhanced DMRS ports + pusch-TypeB-DMRS-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-6g: 1 port UL PTRS for Rel.18 enhanced DMRS ports for PUSCH with rank 1-4 + pusch-rank-1-4-1Port-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-6h: 1 port UL PTRS for Rel.18 enhanced DMRS ports for PUSCH with rank 5-8 + pusch-rank-5-8-1Port-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-6i: 2 port UL PTRS for Rel.18 enhanced DMRS ports for PUSCH with rank 1-4 + pusch-rank-1-4-2Port-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-6j: 2 port UL PTRS for Rel.18 enhanced DMRS ports for PUSCH with rank 5-8 + pusch-rank-5-8-2Port-r18 ENUMERATED {supported} OPTIONAL + } OPTIONAL, + -- R1 40-4-13: Support Rel-18 UL DMRS with single-DCI based M-TRP + ul-DMRS-SingleDCI-M-TRP-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-4-14: Support Rel-18 UL DMRS with M-DCI based M-TRP + ul-DMRS-M-DCI-M-TRP-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-5-5: Maximum 2 SP and 1 periodic SRS sets for 8T8R antenna switching + srs-AntennaSwitching8T8R2SP-1Periodic-r18 ENUMERATED {supported} OPTIONAL, + + -- R1 40-6-4: Single-DCI based STx2P SFN scheme for PUCCH + pucch-SingleDCI-STx2P-SFN-r18 ENUMERATED {pf0-2, pf1-3-4, pf0-4} OPTIONAL, + + -- R1 41-4-6: Positioning SRS bandwidth aggregation in RRC_CONNECTED + posSRS-BWA-RRC-Connected-r18 PosSRS-BWA-RRC-Connected-r18 OPTIONAL, + -- R1 41-4-7: Positioning SRS bandwidth aggregation independent from UL communication CA in RRC_CONNECTED + posSRS-BWA-IndependentCA-RRC-Connected-r18 PosSRS-BWA-IndependentCA-RRC-Connected-r18 OPTIONAL, + -- R1 41-4-9: Indicate which other bands in the band combination are affected due to the need of a guard period + posSRS-BWA-AffectedBandList-r18 SEQUENCE (SIZE (1..maxBands)) OF FreqBandIndicatorNR OPTIONAL, + -- R1 45-5a: RACH-based early TA acquisition with simultaneous transmission + rach-EarlyTA-BandList-r18 SEQUENCE (SIZE (1..maxBandsMRDC)) OF BOOLEAN OPTIONAL, + + -- R1 49-6: Two HARQ-ACK codebooks with up to one sub-slot based HARQ-ACK codebook simultaneously constructed for supporting + -- HARQ-ACK codebooks with different priorities by DCI format 1_3 + simultaneous-2-1-HARQ-ACK-CB-r18 SubSlot-Config-r16 OPTIONAL, + -- R1 49-6a: Two HARQ-ACK codebooks with two sub-slot based HARQ-ACK codebook simultaneously constructed for supporting + -- HARQ-ACK codebooks with different priorities by DCI format 1_3 + simultaneous-2-2-HARQ-ACK-CB-r18 SubSlot-Config-r16 OPTIONAL, + -- R1 49-7: UL intra-UE multiplexing/prioritization of overlapping channel/signals with two priority levels in physical + -- layer for DCI format 1_3/0_3 + ul-IntraUE-MuxEnh-r18 SEQUENCE { + pusch-PreparationLowPriority-r18 ENUMERATED {sym0, sym1, sym2}, + pusch-PreparationHighPriority-r18 ENUMERATED {sym0, sym1, sym2} + } OPTIONAL, + + -- R4 27-1 TxDiversity for 4Tx + txDiversity4Tx-r18 ENUMERATED {supported} OPTIONAL, + + -- R4 41-2: Power boosting for DFT-s-OFDM pi/2 BPSK and QPSK transmissions without modified spectrum flatness requirement + powerBoosting-pi2BPSK-QPSK-r18 ENUMERATED {supported} OPTIONAL, + -- R4 41-3: Power boosting for DFT-s-OFDM pi/2 BPSK and QPSK transmissions with modified spectrum flatness requirement shaping + powerBoosting-pi2BPSK-QPSK-Modified-r18 ENUMERATED {supported} OPTIONAL, + -- R4 44-1 TxDiversity for 2Tx + txDiversity2Tx-r18 ENUMERATED {supported} OPTIONAL, + ue-PowerClassPerBandPerBC-v1820 ENUMERATED {pc5} OPTIONAL +} + SubSlot-Config-r16 ::= SEQUENCE { sub-SlotConfig-NCP-r16 ENUMERATED {n4,n5,n6,n7} OPTIONAL, sub-SlotConfig-ECP-r16 ENUMERATED {n4,n5,n6} OPTIONAL @@ -13668,6 +17198,47 @@ DummyF ::= SEQUENCE { simultaneousCSI-ReportsAllCC INTEGER (5..32) } +PosSRS-BWA-RRC-Connected-r18 ::= SEQUENCE { + numOfCarriersIntraBandContiguous-r18 ENUMERATED {two, three, twoandthree}, + maximumAggregatedBW-TwoCarriersFR1-r18 ENUMERATED {mhz20, mhz40, mhz50, mhz80, mhz100, + mhz160, mhz180, mhz190, mhz200} OPTIONAL, + maximumAggregatedBW-TwoCarriersFR2-r18 ENUMERATED {mhz50, mhz100, mhz200, mhz400, mhz600, mhz800} OPTIONAL, + maximumAggregatedBW-ThreeCarriersFR1-r18 ENUMERATED {mhz80, mhz100, mhz160, mhz200, mhz240, mhz300} OPTIONAL, + maximumAggregatedBW-ThreeCarriersFR2-r18 ENUMERATED {mhz50, mhz100, mhz200, mhz300, mhz400, + mhz600, mhz800, mhz1000, mhz1200} + OPTIONAL, + maximumAggregatedResourceSet-r18 ENUMERATED {n1, n2, n4, n8, n12, n16}, + maximumAggregatedResourcePeriodic-r18 ENUMERATED {n1, n2, n4, n8, n16, n32, n64}, + maximumAggregatedResourceAperiodic-r18 ENUMERATED {n0, n1, n2, n4, n8, n16, n32, n64}, + maximumAggregatedResourceSemi-r18 ENUMERATED {n0, n1, n2, n4, n8, n16, n32, n64}, + maximumAggregatedResourcePeriodicPerSlot-r18 ENUMERATED {n1, n2, n3, n4, n5, n6, n8, n10, n12, n14}, + maximumAggregatedResourceAperiodicPerSlot-r18 ENUMERATED {n0, n1, n2, n3, n4, n5, n6, n8, n10, n12, n14}, + maximumAggregatedResourceSemiPerSlot-r18 ENUMERATED {n0, n1, n2, n3, n4, n5, n6, n8, n10, n12, n14}, + ... +} + +PosSRS-BWA-IndependentCA-RRC-Connected-r18 ::= SEQUENCE { + numOfCarriersIntraBandContiguous-r18 ENUMERATED {two, three, twoandthree}, + maximumAggregatedBW-TwoCarriersFR1-r18 ENUMERATED {mhz20, mhz40, mhz50, mhz80, mhz100, + mhz160, mhz180, mhz190, mhz200} OPTIONAL, + maximumAggregatedBW-TwoCarriersFR2-r18 ENUMERATED {mhz50, mhz100, mhz200, mhz400, mhz600, mhz800} OPTIONAL, + maximumAggregatedBW-ThreeCarriersFR1-r18 ENUMERATED {mhz80, mhz100, mhz160, mhz200, mhz240, mhz300} OPTIONAL, + maximumAggregatedBW-ThreeCarriersFR2-r18 ENUMERATED {mhz50, mhz100, mhz200, mhz300, mhz400, + mhz600, mhz800, mhz1000, mhz1200} + OPTIONAL, + maximumAggregatedResourceSet-r18 ENUMERATED {n1, n2, n4, n8, n12, n16}, + maximumAggregatedResourcePeriodic-r18 ENUMERATED {n1, n2, n4, n8, n16, n32, n64}, + maximumAggregatedResourceAperiodic-r18 ENUMERATED {n0, n1, n2, n4, n8, n16, n32, n64}, + maximumAggregatedResourceSemi-r18 ENUMERATED {n0, n1, n2, n4, n8, n16, n32, n64}, + maximumAggregatedResourcePeriodicPerSlot-r18 ENUMERATED {n1, n2, n3, n4, n5, n6, n8, n10, n12, n14}, + maximumAggregatedResourceAperiodicPerSlot-r18 ENUMERATED {n0, n1, n2, n3, n4, n5, n6, n8, n10, n12, n14}, + maximumAggregatedResourceSemiPerSlot-r18 ENUMERATED {n0, n1, n2, n3, n4, n5, n6, n8, n10, n12, n14}, + guardPeriod-r18 ENUMERATED {n0, n30, n100, n140, n200}, + powerClassForTwoAggregatedCarriers-r18 ENUMERATED {pc2, pc3} OPTIONAL, + powerClassForThreeAggregatedCarriers-r18 ENUMERATED {pc2, pc3} OPTIONAL, + ... +} + -- TAG-FEATURESETUPLINK-STOP -- TAG-FEATURESETUPLINKID-START @@ -13703,6 +17274,108 @@ FeatureSetUplinkPerCC-v1700 ::= SEQUENCE { supportedBandwidthUL-v1710 SupportedBandwidth-v1700 OPTIONAL } +FeatureSetUplinkPerCC-v1780 ::= SEQUENCE { + supportedBandwidthUL-v1780 SupportedBandwidth-v1700 OPTIONAL +} + +FeatureSetUplinkPerCC-v1800 ::= SEQUENCE { + -- R1 40-2-7: Two TAs for multi-DCI STxMP PUSCH+PUSCH + twoPUSCH-MultiDCI-STx2P-TwoTA-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-1: Single-DCI based STx2P SDM scheme for PUSCH-codebook + pusch-CB-SingleDCI-STx2P-SDM-r18 SEQUENCE { + maxNumberSRS-ResourcePerSet-r18 ENUMERATED {n1,n2,n4}, + maxNumberLayerPerPanel-r18 INTEGER (1..2), + maxNumberNZP-PUSCH-PortsPerSet-r18 ENUMERATED {n1,n2,n4}, + maxNumberSRS-AntennaPortsPerSet-r18 ENUMERATED {n1,n2,n4} + } OPTIONAL, + -- R1 40-6-1a: Single-DCI based STx2P SDM scheme for PUSCH-noncodebook + pusch-NonCB-SingleDCI-STx2P-SDM-r18 SEQUENCE { + maxNumberSRS-ResourcePerSet-r18 INTEGER (1..4), + maxNumberLayerPerPanel-r18 INTEGER (1..2), + maxNumberSimulSRS-OneResourcePerSet-r18 INTEGER (1..4), + maxNumberSimulSRS-TwoResourcePerSet-r18 INTEGER (1..8) + } OPTIONAL, + -- R1 40-6-2: Single-DCI based STx2P SFN scheme for PUSCH-codebook + pusch-CB-SingleDCI-STx2P-SFN-r18 SEQUENCE { + maxNumberSRS-ResourcePerSet-r18 ENUMERATED {n1,n2,n4}, + maxNumberLayerPerSet-r18 INTEGER (1..2), + maxNumberSRS-AntennaPortsPerSet-r18 ENUMERATED {n1,n2,n4}, + maxNumberNZP-PUSCH-PortsPerSet-r18 ENUMERATED {n1,n2,n4} + } OPTIONAL, + -- R1 40-6-2a: Single-DCI based STx2P SFN scheme for PUSCH-noncodebook + pusch-NonCB-SingleDCI-STx2P-SFN-r18 SEQUENCE { + maxNumberSRS-ResourcePerSet-r18 INTEGER (1..4), + maxNumberLayerPerSet-r18 INTEGER (1..2), + maxNumberSimulSRS-OneResourcePerSet-r18 INTEGER (1..4), + maxNumberSimulSRS-TwoResourcePerSet-r18 INTEGER (1..8) + } OPTIONAL, + -- R1 40-6-3a: codebook multi-DCI based STx2P PUSCH+PUSCH for DG+DG + twoPUSCH-CB-MultiDCI-STx2P-DG-DG-r18 SEQUENCE { + maxNumberSRS-ResourcePerSet-r18 ENUMERATED {n1, n2, n4}, + maxNumberLayerOverlapping-r18 INTEGER (1..2), + maxNumberNZP-PUSCH-Overlapping-r18 ENUMERATED {n1, n2, n4}, + maxNumberPUSCH-PerCORESET-PerSlot-r18 SEQUENCE { + scs-60kHz-r18 ENUMERATED {n1,n2,n3,n4,n7} OPTIONAL, + scs-120kHz-r18 ENUMERATED {n1,n2,n3,n4,n7} OPTIONAL + } OPTIONAL, + maxNumberTotalLayerOverlapping-r18 INTEGER (2..4), + maxNumberSRS-AntennaPortsPerSet-r18 ENUMERATED {n1,n2,n4} + } OPTIONAL, + -- R1 40-6-3b: Noncodebook multi-DCI based STx2P PUSCH+PUSCH for DG+DG + twoPUSCH-NonCB-MultiDCI-STx2P-DG-DG-r18 SEQUENCE { + maxNumberSRS-ResourcePerSet-r18 INTEGER (1..4), + maxNumberLayerOverlapping-r18 INTEGER (1..2), + maxNumberSimulSRS-ResourcePerSet-r18 INTEGER (1..4), + maxNumberPUSCH-PerCORESET-PerSlot-r18 SEQUENCE { + scs-60kHz-r18 ENUMERATED {n1,n2,n3,n4,n7} OPTIONAL, + scs-120kHz-r18 ENUMERATED {n1,n2,n3,n4,n7} OPTIONAL + } OPTIONAL, + maxNumberTotalLayerOverlapping-r18 INTEGER (2..4) + } OPTIONAL, + -- R1 40-6-6: Out-of-order operation for multi-DCI based STx2P PUSCH+PUSCH + twoPUSCH-MultiDCI-STx2P-OutOfOrder-r18 ENUMERATED {supported} OPTIONAL, + + codebookParameter8TxPUSCH-r18 SEQUENCE { + -- R1 40-7-1: Basic features for Codebook-based 8Tx PUSCH + codebook-8TxBasic-r18 SEQUENCE { + maxNumberPUSCH-MIMO-Layer-r18 INTEGER (1..8), + maxNumberSRS-Resource-r18 INTEGER (1..2), + srs-8TxPorts-r18 ENUMERATED {noTDM, both} + }, + -- R1 40-7-1a: Codebook-based 8Tx PUSCH-codebook1 + codebook1-8TxPUSCH-r18 SEQUENCE { + codebookN1N4-r18 ENUMERATED {ng1n4n1,ng1n2n2,both} OPTIONAL, + srs-8TxPorts-r18 ENUMERATED {noTDM, both} + }, + -- R1 40-7-1b: Codebook-based 8Tx PUSCH-codebook2 + codebook2-8TxPUSCH-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-7-1c: Codebook-based 8Tx PUSCH-codebook3 + codebook3-8TxPUSCH-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-7-1d: Codebook-based 8Tx PUSCH-codebook4 + codebook4-8TxPUSCH-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-7-1e: UL full power transmission mode 0 + ul-FullPwrTransMode0-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-7-1f: UL full power transmission mode 1 + ul-FullPwrTransMode1-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-7-1g: UL full power transmission mode 2 with 1/2/4 resources + ul-FullPwrTransMode2-r18 ENUMERATED {n1,n2,n4} OPTIONAL, + -- R1 40-7-1g-1: SRS resources for UL full power transmission mode 2 + ul-SRS-TransMode2-r18 BIT STRING (SIZE(3)) OPTIONAL, + -- R1 40-7-1g-2: TPMI group(s) which delivers full power for codebook2 + tpmi-FullPwrCodebook2-r18 ENUMERATED {first, second} OPTIONAL + } OPTIONAL, + -- R1 40-7-2: Basic features for Non-Codebook-based 8Tx PUSCH + nonCodebook-8TxPUSCH-r18 SEQUENCE { + maxNumberPUSCH-MIMO-Layer-r18 INTEGER (1..8), + maxNumberSRS-Resource-r18 INTEGER (1..8), + maxNumberSimultaneousSRS-r18 INTEGER (1..8) + } OPTIONAL, + -- R1 40-7-2a: Association between CSI-RS and SRS for non-codebook case + nonCodebook-CSI-RS-SRS-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-7-3: CBG based 2 CWs PUSCH with rank >4 + cgb-2CW-PUSCH-r18 ENUMERATED {supported} OPTIONAL +} + -- TAG-FEATURESETUPLINKPERCC-STOP -- TAG-FEATURESETUPLINKPERCC-ID-START @@ -13987,6 +17660,17 @@ MAC-ParametersCommon ::= SEQUENCE { extendedDRX-CycleInactive-r17 ENUMERATED {supported} OPTIONAL, simultaneousSR-PUSCH-DiffPUCCH-groups-r17 ENUMERATED {supported} OPTIONAL, lastTransmissionUL-r17 ENUMERATED {supported} OPTIONAL + ]], + [[ + harq-RTT-TimerDL-ForNTN-MulticastMBS-r17 ENUMERATED {supported} OPTIONAL + ]], + [[ + sr-TriggeredByTA-ReportATG-r18 ENUMERATED {supported} OPTIONAL, + extendedDRX-CycleInactive-r18 ENUMERATED {supported} OPTIONAL, + additionalBS-Table-r18 ENUMERATED {supported} OPTIONAL, + delayStatusReport-r18 ENUMERATED {supported} OPTIONAL, + cg-RetransmissionMonitoringDisabling-r18 ENUMERATED {supported} OPTIONAL, + non-IntegerDRX-r18 ENUMERATED {supported} OPTIONAL ]] } @@ -14029,6 +17713,10 @@ MAC-ParametersXDD-Diff ::= SEQUENCE { [[ enhancedSkipUplinkTxDynamic-r16 ENUMERATED {supported} OPTIONAL, enhancedSkipUplinkTxConfigured-r16 ENUMERATED {supported} OPTIONAL + ]], + [[ + ptm-Retransmission-r18 ENUMERATED {supported} OPTIONAL, + ptm-RetransmissionInactive-r18 ENUMERATED {supported} OPTIONAL ]] } @@ -14160,6 +17848,42 @@ MeasAndMobParametersCommon ::= SEQUENCE { [[ interSatMeas-r17 ENUMERATED {supported} OPTIONAL, deriveSSB-IndexFromCellInterNon-NCSG-r17 ENUMERATED {supported} OPTIONAL + ]], + [[ + -- R4 31-1 Enhanced L3 measurement reporting for unknown SCell activation if the valid L3 measurement results are available + l3-MeasUnknownSCellActivation-r18 ENUMERATED {supported} OPTIONAL, + -- R4 31-3 Shorter measurement interval for unknown SCell activation + shortMeasInterval-r18 ENUMERATED {supported} OPTIONAL, + nr-NeedForInterruptionReport-r18 ENUMERATED {supported} OPTIONAL, + measSequenceConfig-r18 ENUMERATED {supported} OPTIONAL, + cellIndividualOffsetPerMeasEvent-r18 ENUMERATED {supported} OPTIONAL, + eventD2-MeasReportTrigger-r18 ENUMERATED {supported} OPTIONAL, + -- R4 32-1: Concurrent gaps with Pre-MG in a FR + concurrentMeasGapsPreMG-r18 ENUMERATED {supported} OPTIONAL, + -- R4 32-2: Support for dynamic collisions + dynamicCollision-r18 ENUMERATED {supported} OPTIONAL, + -- R4 32-3: Concurrent gaps with NCSG in a FR + concurrentMeasGapsNCSG-r18 ENUMERATED {supported} OPTIONAL, + -- R4 32-4: Inter-RAT EUTRAN measurements without gap and outside active DL BWP + eutra-NoGapMeasurementOutsideBWP-r18 ENUMERATED {supported} OPTIONAL, + -- R4 32-5: Inter-RAT EUTRAN measurement without gap and within active DL BWP + eutra-NoGapMeasurementInsideBWP-r18 ENUMERATED {supported} OPTIONAL, + -- R4 32-6: Effective measurement window for inter-RAT EUTRAN measurements + eutra-MeasEMW-r18 BIT STRING (SIZE(6)) OPTIONAL, + -- R4 32-7: Simultaneous reception of NR data and EUTRAN CRS with different numerology + concurrentMeasCRS-InsideBWP-EUTRA-r18 ENUMERATED {supported} OPTIONAL, + -- R4 39-2a: SSB based inter-frequency L1-RSRP measurements with measurement gaps + ltm-InterFreqMeasGap-r18 ENUMERATED {supported} OPTIONAL, + -- R4 39-7: Faster UE processing time during cell switch + ltm-FastUE-Processing-r18 SEQUENCE { + fr1-r18 ENUMERATED {ms10, ms15}, + fr2-r18 ENUMERATED {ms10, ms15}, + fr1-AndFR2-r18 ENUMERATED {ms20, ms30} + } OPTIONAL, + rach-LessHandoverInterFreq-r18 ENUMERATED {supported} OPTIONAL, + enterAndLeaveCellReport-r18 ENUMERATED {supported} OPTIONAL, + bestCellChangeReport-r18 ENUMERATED {supported} OPTIONAL, + secondBestCellChangeReport-r18 ENUMERATED {supported} OPTIONAL ]] } @@ -14252,6 +17976,10 @@ MeasAndMobParametersMRDC-v1730 ::= SEQUENCE { measAndMobParametersMRDC-Common-v1730 MeasAndMobParametersMRDC-Common-v1730 OPTIONAL } +MeasAndMobParametersMRDC-v1810 ::= SEQUENCE { + measAndMobParametersMRDC-Common-v1810 MeasAndMobParametersMRDC-Common-v1810 OPTIONAL +} + MeasAndMobParametersMRDC-Common ::= SEQUENCE { independentGapConfig ENUMERATED {supported} OPTIONAL } @@ -14289,6 +18017,18 @@ MeasAndMobParametersMRDC-Common-v1730 ::= SEQUENCE { } } +MeasAndMobParametersMRDC-Common-v1810 ::= SEQUENCE { + mn-ConfiguredMN-TriggerSCPAC-r18 ENUMERATED {supported} OPTIONAL, + mn-ConfiguredSN-TriggerSCPAC-r18 ENUMERATED {supported} OPTIONAL, + sn-ConfiguredSCPAC-r18 ENUMERATED {supported} OPTIONAL, + mn-ConfiguredMN-TriggerSCPAC-afterSCG-release-r18 ENUMERATED {supported} OPTIONAL, + mn-ConfiguredReferenceConfigSCPAC-r18 ENUMERATED {supported} OPTIONAL, + sn-ConfiguredReferenceConfigSCPAC-r18 ENUMERATED {supported} OPTIONAL, + condHandoverWithCandSCG-Addition-r18 ENUMERATED {supported} OPTIONAL, + condHandoverWithCandSCG-FR1-FR2-Change-r18 ENUMERATED {supported} OPTIONAL, + condHandoverWithCandSCG-FDD-TDD-Change-r18 ENUMERATED {supported} OPTIONAL +} + MeasAndMobParametersMRDC-XDD-Diff ::= SEQUENCE { sftd-MeasPSCell ENUMERATED {supported} OPTIONAL, sftd-MeasNR-Cell ENUMERATED {supported} OPTIONAL @@ -14712,6 +18452,202 @@ MIMO-ParametersPerBand ::= SEQUENCE { ]], [[ supportRepNumPDSCH-TDRA-DCI-1-2-r17 ENUMERATED {n2, n3, n4, n5, n6, n7, n8, n16} OPTIONAL + ]], + [[ + codebookParametersetype2DopplerCSI-r18 CodebookParametersetype2DopplerCSI-r18 OPTIONAL, + codebookParametersfetype2DopplerCSI-r18 CodebookParametersfetype2DopplerCSI-r18 OPTIONAL, + codebookParametersetype2CJT-r18 CodebookParametersetype2CJT-r18 OPTIONAL, + codebookParametersfetype2CJT-r18 CodebookParametersfetype2CJT-r18 OPTIONAL, + codebookComboParametersCJT-r18 CodebookComboParametersCJT-r18 OPTIONAL, + codebookParametersHARQ-ACK-PUSCH-r18 CodebookParametersHARQ-ACK-PUSCH-r18 OPTIONAL, + -- R1 40-1-1: Unified TCI with joint DL/UL TCI update for single-DCI based intra-cell multi-TRP with single activated TCI + -- codepoint per CC + tci-JointTCI-UpdateSingleActiveTCI-PerCC-r18 SEQUENCE { + maxNumberConfigJointTCIPerCC-PerBWP-r18 ENUMERATED {n8,n12,n16,n24,n32,n48,n64,n128}, + maxNumberActiveJointTCI-AcrossCC-r18 ENUMERATED {n2,n4,n6,n8,n16,n32} + } OPTIONAL, + -- R1 40-1-1a: Unified TCI with joint DL/UL TCI update for single-DCI based intra-cell multi-TRP with multiple activated TCI + -- codepoints per CC + tci-JointTCI-UpdateMultiActiveTCI-PerCC-r18 SEQUENCE { + tci-StateInd-r18 ENUMERATED {withAssignment, withoutAssignment}, + maxNumberActiveJointTCI-PerCC-r18 INTEGER (2..8) + } OPTIONAL, + -- R1 40-1-1c: DCI format 1_1 and if supported 1_2 configured with TCI selection field + tci-SelectionDCI-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-1-2: Unified TCI with separate DL/UL TCI update for single-DCI based intra-cell multi-TRP with single activated TCI + -- codepoint per CC + tci-SeparateTCI-UpdateSingleActiveTCI-PerCC-r18 SEQUENCE { + maxNumConfigDL-TCI-PerCC-PerBWP-r18 ENUMERATED {n4, n8, n12, n16, n24, n32, n48, n64, n128}, + maxNumConfigUL-TCI-PerCC-PerBWP-r18 ENUMERATED {n4, n8, n12, n16, n24, n32, n48, n64}, + maxNumActiveDL-TCI-AcrossCC-r18 ENUMERATED {n2, n4, n8, n16}, + maxNumActiveUL-TCI-AcrossCC-r18 ENUMERATED {n2, n4, n8, n16} + } OPTIONAL, + -- R1 40-1-2a: Unified TCI with separate DL/UL TCI update for single-DCI based intra-cell multi-TRP with multiple + -- activated TCI codepoints per CC + tci-SeparateTCI-UpdateMultiActiveTCI-PerCC-r18 SEQUENCE { + maxNumActiveDL-TCI-AcrossCC-r18 ENUMERATED {n2, n4, n8, n16}, + maxNumActiveUL-TCI-AcrossCC-r18 ENUMERATED {n2, n4, n8, n16} + } OPTIONAL, + -- R1 40-1-3: Per aperiodic CSI-RS resource/resource set configuration for TCI selection in S-DCI based MTRP + tci-SelectionAperiodicCSI-RS-r18 ENUMERATED {perResource, perResourceSet, both} OPTIONAL, + -- R1 40-1-3a: Per aperiodic CSI-RS resource/resource set configuration for TCI selection in M-DCI based MTRP + tci-SelectionAperiodicCSI-RS-M-DCI-r18 ENUMERATED {perResource, perResourceSet, both} OPTIONAL, + -- R1 40-1-4: Two TCI states for CJT Tx scheme for PDSCH + twoTCI-StatePDSCH-CJT-TxScheme-r18 ENUMERATED {cjtSchemeA, cjtSchemeB, both} OPTIONAL, + -- R1 40-1-7: Unified TCI with joint DL/UL TCI update for multi-DCI based multi-TRP with single activated TCI + -- codepoint per CORESETPoolIndex per CC + tci-JointTCI-UpdateSingleActiveTCI-PerCC-PerCORESET-r18 SEQUENCE { + mTRP-Operation-r18 ENUMERATED {intraCell, intraCellAndInterCell}, + maxNumberConfigJointTCIPerCC-PerBWP-r18 ENUMERATED {n8,n12,n16,n24,n32,n48,n64,n128}, + maxNumberActiveJointTCIAcrossCC-PerCORESET-r18 ENUMERATED {n1,n2,n4,n8,n16} + } OPTIONAL, + -- R1 40-1-7a: Unified TCI with joint DL/UL TCI update for multi-DCI based multi-TRP with multiple activated TCI + -- codepoints per CORESETPoolIndex per CC + tci-JointTCI-UpdateMultiActiveTCI-PerCC-PerCORESET-r18 INTEGER (2..8) OPTIONAL, + -- R1 40-1-8: TRP-specific BFR with unified TCI framework with Unified TCI + tci-TRP-BFR-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-1-9: Unified TCI with separate DL/UL TCI update for multi-DCI based multi-TRP with single activated TCI + -- codepoint per CORESETPoolIndex per CC + tci-SeparateTCI-UpdateSingleActiveTCI-PerCC-PerCORESET-r18 SEQUENCE { + mTRP-Operation-r18 ENUMERATED {intraCell, intraCellAndInterCell}, + maxNumConfigDL-TCI-PerCC-PerBWP-r18 ENUMERATED {n8, n12, n16, n24, n32, n48, n64, n128}, + maxNumConfigUL-TCI-PerCC-PerBWP-r18 ENUMERATED {n8, n12, n16, n24, n32, n48, n64}, + maxNumActiveDL-TCI-AcrossCC-r18 ENUMERATED {n1, n2, n4, n8, n16}, + maxNumActiveUL-TCI-AcrossCC-r18 ENUMERATED {n1, n2, n4, n8, n16} + } OPTIONAL, + -- R1 40-1-9a: Unified TCI with separate DL/UL TCI update for multi-DCI based multi-TRP with multiple activated TCI + -- codepoints per CORESETPoolIndex per CC + tci-SeparateTCI-UpdateMultiActiveTCI-PerCC-PerCORESET-r18 SEQUENCE { + maxNumConfigDL-TCI-PerCC-PerBWP-r18 INTEGER (1..8), + maxNumConfigUL-TCI-PerCC-PerBWP-r18 INTEGER (1..8) + } OPTIONAL, + -- R1 40-1-12: Common multi-CC TCI state ID update and activation for single-DCI based multi-TRP + commonTCI-SingleDCI-r18 INTEGER (1..4) OPTIONAL, + -- R1 40-1-13: Common multi-CC TCI state ID update and activation for multi-DCI based multi-TRP + commonTCI-MultiDCI-r18 INTEGER (1..4) OPTIONAL, + -- R1 40-1-14: Two PHR reporting for STx2P + twoPHR-Reporting-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-2-3: TAG ID indication via absolute TA command MAC CE + spCell-TAG-Ind-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-2-4: PDCCH order sent by one TRP triggers RACH procedure (specifically PRACH) towards a different TRP based on CFRA for + -- inter-cell + interCellCrossTRP-PDCCH-OrderCFRA-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-2-4a: PDCCH order sent by one TRP triggers RACH procedure (specifically PRACH) towards a different TRP based on CFRA for + -- intra-cell + intraCellCrossTRP-PDCCH-OrderCFRA-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-2-9: Overlapping UL transmission reduction + overlapUL-TransReduction-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-3-2-12: Supported maximum periodicity of CMR when configured as periodic CSI-RS + maxPeriodicityCMR-r18 ENUMERATED {sl4, sl5, sl8, sl10, sl20} OPTIONAL, + -- R1 40-3-3-1: TDCP (Time Domain Channel Properties) report + tdcp-Report-r18 SEQUENCE { + valueX-r18 INTEGER (1..2), + maxNumberActiveResource-r18 INTEGER (2..32) + } OPTIONAL, + -- R1 40-3-3-5: Number of CSI-RS resources for TDCP + tdcp-Resource-r18 SEQUENCE { + maxNumberConfigPerCC-r18 ENUMERATED {n2,n4,n6,n8,n10,n12}, + maxNumberConfigAcrossCC-r18 INTEGER (1..32), + maxNumberSimultaneousPerCC-r18 ENUMERATED {n2, n4, n6, n8, n12, n16, n20, n24, n28, n32} + } OPTIONAL, + -- R1 40-3-1-24: Timeline for regular eType-II-CJT CSI, or for port selection FeType-II-CJT CSI + timelineRelax-CJT-CSI-r18 ENUMERATED {n0,n2} OPTIONAL, + -- R1 40-4-11: Joint configuration of Rel.18 DMRS ports and Rel.18 dynamic switching between DFT-S-OFDM and CP-OFDM for PUSCH + jointConfigDMRSPortDynamicSwitching-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-5-1: SRS comb offset hopping + srs-combOffsetHopping-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-5-1a: Comb offset hopping time-domain behavior when repetition factor R>1 + srs-combOffsetInTime-r18 ENUMERATED {srs, rsrs, both} OPTIONAL, + -- R1 40-5-1b: SRS comb offset hopping combined with group/sequence hopping + srs-combOffsetCombinedGroupSequence-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-5-1c: Comb offset hopping within a subset + srs-combOffsetHoppingWithinSubset-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-5-2: SRS cyclic shift hopping + srs-cyclicShiftHopping-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-5-2a: Smaller cyclic shift granularity for cyclic shift hopping + srs-cyclicShiftHoppingSmallGranularity-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-5-2b: SRS cyclic shift hopping combined with group/sequence hopping + srs-cyclicShiftCombinedGroupSequence-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-5-2c: Cyclic shift hopping within a subset + cyclicShiftHoppingWithinSubset-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-5-3: SRS cyclic shift hopping combined with SRS comb offset hopping + srs-cyclicShiftCombinedCombOffset-r18 ENUMERATED {supported} OPTIONAL, + + -- R1 40-6-1-1: 2 PTRS ports for single-DCI based STx2P SDM scheme for PUSCH-codebook + pusch-CB-2PTRS-SingleDCI-STx2P-SDM-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-1a-1: 2 PTRS ports for single-DCI based STx2P SDM scheme for PUSCH-noncodebook + pusch-NonCB-2PTRS-SingleDCI-STx2P-SDM-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-1b: Association between CSI-RS and SRS for noncodebook single-DCI based STx2P SDM scheme for PUSCH + pusch-NonCB-SingleDCI-STx2P-SDM-CSI-RS-SRS-r18 SEQUENCE { + maxNumberPeriodicSRS-Resource-PerBWP-r18 INTEGER (1..8), + maxNumberAperiodicSRS-Resource-PerBWP-r18 INTEGER (1..8), + maxNumberSemiPersistentSRS-ResourcePerBWP-r18 INTEGER (0..8), + valueY-SRS-ResourceAssociate-r18 INTEGER (1..16), + valueX-CSI-RS-ResourceAssociate-r18 INTEGER (1..2) + } OPTIONAL, + -- R1 40-6-3b-1: Associated CSI-RS resources for noncodebook multi-DCI based STx2P PUSCH+PUSCH + twoPUSCH-NonCB-Multi-DCI-STx2P-CSI-RS-Resource-r18 SEQUENCE { + maxNumberPeriodicSRS-r18 INTEGER (1..8), + maxNumberAperiodicSRS-r18 INTEGER (1..8), + maxNumberSemiPersistentSRS-r18 INTEGER (0..8), + simultaneousSRS-PerCC-r18 INTEGER (1..16), + simultaneousCSI-RS-NonCB-r18 INTEGER (1..2) + } OPTIONAL, + -- R1 40-6-1-2: New UL DMRS port entry for single-DCI based SDM scheme for Rel-15 DMRS port and/or Rel-18 DMRS port + dmrs-PortEntrySingleDCI-SDM-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-2-1: 2 PTRS ports for single-DCI based STx2P SFN scheme for PUSCH-codebook + pusch-CB-2PTRS-SingleDCI-STx2P-SFN-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-2a-1: 2 PTRS ports for single-DCI based STx2P SFN scheme for PUSCH-codebook + pusch-NonCB-2PTRS-SingleDCI-STx2P-SFN-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-2b: Association between CSI-RS and SRS for noncodebook single-DCI based STx2P SFN scheme for PUSCH + pusch-NonCB-SingleDCI-STx2P-SFN-CSI-RS-SRS-r18 SEQUENCE { + maxNumberPeriodicSRS-Resource-PerBWP-r18 INTEGER (1..8), + maxNumberAperiodicSRS-Resource-PerBWP-r18 INTEGER (1..8), + maxNumberSemiPersistentSRS-ResourcePerBWP-r18 INTEGER (0..8), + valueY-SRS-ResourceAssociate-r18 INTEGER (1..16), + valueX-CSI-RS-ResourceAssociate-r18 INTEGER (1..2) + } OPTIONAL, + -- R1 40-6-3c: Codebook multi-DCI based STx2P PUSCH+PUSCH - Fully overlapping PUSCHs in time and fully overlapping in frequency + twoPUSCH-CB-MultiDCI-STx2P-FullTimeFullFreqOverlap-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-3d: Codebook multi-DCI based STx2P PUSCH+PUSCH - Fully overlapping PUSCHs in time and partially overlapping in frequency + twoPUSCH-CB-MultiDCI-STx2P-FullTimePartialFreqOverlap-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-3e: Codebook multi-DCI based STx2P PUSCH+PUSCH - Partially overlapping PUSCHs in time and fully overlapping in frequency + twoPUSCH-CB-MultiDCI-STx2P-PartialTimeFullFreqOverlap-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-3f: Codebook multi-DCI based STx2P PUSCH+PUSCH - Partially overlapping PUSCHs in time, partially overlapping in frequency + twoPUSCH-CB-MultiDCI-STx2P-PartialTimePartialFreqOverlap-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-3g: Codebook multi-DCI based STx2P PUSCH+PUSCH - Partially overlapping PUSCHs in time, partially or non-overlapping + -- in frequency + twoPUSCH-CB-MultiDCI-STx2P-PartialTimeNonFreqOverlap-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-3h: Codebook multi-DCI based STx2P PUSCH+PUSCH for CG+CG + twoPUSCH-CB-MultiDCI-STx2P-CG-CG-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-3i: Codebook multi-DCI based STx2P PUSCH+PUSCH for DG+CG + twoPUSCH-CB-MultiDCI-STx2P-CG-DG-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-3j: Noncodebook multi-DCI based STx2P PUSCH+PUSCH - Fully overlapping PUSCHs in time and fully overlapping in frequency + twoPUSCH-NonCB-MultiDCI-STx2P-FullTimeFullFreqOverlap-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-3k: Noncodebook multi-DCI based STx2P PUSCH+PUSCH - Fully overlapping PUSCHs in time and partially overlapping in + -- frequency + twoPUSCH-NonCB-MultiDCI-STx2P-FullTimePartialFreqOverlap-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-3l: Noncodebook multi-DCI based STx2P PUSCH+PUSCH - Partially overlapping PUSCHs in time and fully overlapping in + -- frequency + twoPUSCH-NonCB-MultiDCI-STx2P-PartialTimeFullFreqOverlap-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-3m: Noncodebook multi-DCI based STx2P PUSCH+PUSCH - Partially overlapping PUSCHs in time, partially overlapping in + -- frequency + twoPUSCH-NonCB-MultiDCI-STx2P-PartialTimePartialFreqOverlap-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-3n: Noncodebook multi-DCI based STx2P PUSCH+PUSCH - Partially overlapping PUSCHs in time, non-overlapping in frequency + twoPUSCH-NonCB-MultiDCI-STx2P-PartialTimeNonFreqOverlap-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-3o: Noncodebook multi-DCI based STx2P PUSCH+PUSCH for CG+CG + twoPUSCH-NonCB-MultiDCI-STx2P-CG-CG-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-3p: Noncodebook multi-DCI based STx2P PUSCH+PUSCH for DG+CG + twoPUSCH-NonCB-MultiDCI-STx2P-CG-DG-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-4a: Dynamic indication of repetition number for SFN scheme for PUCCH + pucch-RepetitionDynamicIndicationSFN-r18 ENUMERATED {supported} OPTIONAL, + -- R1 40-6-5: Support grouped-based beam reporting for STx2P + groupBeamReporting-STx2P-r18 SEQUENCE { + groupL1-RSRP-Reporting-r18 ENUMERATED {jointULandDL, ulOnly, both}, + maxNumberBeamGroups-r18 INTEGER (1..4), + maxNumberResWithinSlotAcrossCC-r18 ENUMERATED {n2,n3,n4,n8,n16,n32,n64}, + maxNumberResAcrossCC-r18 ENUMERATED {n8,n16,n32,n64,n128} + } OPTIONAL ]] } @@ -14848,6 +18784,10 @@ MRDC-Parameters-v15g0 ::= SEQUENCE { simultaneousRxTxInterBandENDCPerBandPair SimultaneousRxTxPerBandPair OPTIONAL } +MRDC-Parameters-v15n0 ::= SEQUENCE { + intraBandENDC-Support-UL ENUMERATED {non-contiguous, both} OPTIONAL +} + MRDC-Parameters-v1620 ::= SEQUENCE { maxUplinkDutyCycle-interBandENDC-TDD-PC2-r16 SEQUENCE{ eutra-TDD-Config0-r16 ENUMERATED {n20, n40, n50, n60, n70, n80, n90, n100} OPTIONAL, @@ -14885,7 +18825,26 @@ MRDC-Parameters-v1700 ::= SEQUENCE { scg-ActivationDeactivationResumeENDC-r17 ENUMERATED {supported} OPTIONAL } +MRDC-Parameters-v1770 ::= SEQUENCE { + -- R4 26-1: Higher Power Limit CA DC + higherPowerLimitMRDC-r17 ENUMERATED {supported} OPTIONAL +} + +MRDC-Parameters-v1790 ::= SEQUENCE { + intraBandENDC-Support-v1790 ENUMERATED {non-contiguous, both} OPTIONAL, + intraBandENDC-Support-UL-v1790 ENUMERATED {non-contiguous, both} OPTIONAL +} + -- TAG-MRDC-PARAMETERS-STOP +-- TAG-NCR-PARAMETERS-START + +NCR-Parameters-r18::= SEQUENCE { + inactiveStateNCR-r18 ENUMERATED {supported} OPTIONAL, + supportedNumberOfDRBs-NCR-r18 ENUMERATED {n1,n16} OPTIONAL, + nonDRB-NCR-r18 ENUMERATED {supported} OPTIONAL +} + +-- TAG-NCR-PARAMETERS-STOP -- TAG-NRDC-PARAMETERS-START NRDC-Parameters ::= SEQUENCE { @@ -14933,6 +18892,10 @@ NTN-Parameters-r17 ::= SEQUENCE { son-ParametersNTN-r17 SON-Parameters-r16 OPTIONAL } +NTN-Parameters-v1820 ::= SEQUENCE { + fr2-Add-UE-NR-CapabilitiesNTN-r18 UE-NR-CapabilityAddFRX-Mode OPTIONAL +} + -- TAG-NTN-PARAMETERS-STOP -- TAG-OLPC-SRS-POS-START @@ -14944,6 +18907,22 @@ OLPC-SRS-Pos-r16 ::= SEQUENCE { } --TAG-OLPC-SRS-POS-STOP +-- TAG-PDCCHRACHDLINFO-START + +PDCCH-RACH-DL-Info-r18 ::= CHOICE { + notSupported NULL, + supported SEQUENCE { + -- R4 39-4: Interruption on DL slot(s) due to PDCCH- ordered RACH transmission + pdcch-RACH-AffectedBands-r18 ENUMERATED {noIntrruption, interruption}, + -- R4 39-4a: Interruption on DL slot(s) due to PDCCH- ordered RACH transmission + pdcch-RACH-SwitchingTimeList-r18 ENUMERATED {ms0, ms0dot25, ms0dot5 , ms1, ms2} OPTIONAL, + -- R4 39-5: the RF/BB preparation time for PDCCH ordered RACH of which the resources are not fully contained + -- in any of UE's configured UL BWP(s) of active serving cells + pdcch-RACH-PrepTime-r18 ENUMERATED {ms1, ms3, ms5, ms10} OPTIONAL + } +} + +-- TAG-PDCCHRACHDLINFO-STOP -- TAG-PDCP-PARAMETERS-START PDCP-Parameters ::= SEQUENCE { @@ -14990,6 +18969,12 @@ PDCP-Parameters ::= SEQUENCE { continueUDC-r17 ENUMERATED {supported} OPTIONAL, supportOfBufferSize-r17 ENUMERATED {kbyte4, kbyte8} OPTIONAL } OPTIONAL + ]], + [[ + longSN-NCR-r18 ENUMERATED {supported} OPTIONAL, + supportOfPDU-SetDiscard-r18 ENUMERATED {supported} OPTIONAL, + psi-BasedDiscard-r18 ENUMERATED {supported} OPTIONAL, + supportOfSN-GapReport-r18 ENUMERATED {supported} OPTIONAL ]] } @@ -15203,7 +19188,7 @@ Phy-ParametersCommon ::= SEQUENCE { cg-TimeDomainAllocationExtension-r17 ENUMERATED {supported} OPTIONAL ]], [[ - -- R1 25-20: Propagation delay compensation based on legacy TA procedure for TN and licensed + -- R1 25-20: Propagation delay compensation based on Rel-15 TA procedure for TN and licensed ta-BasedPDC-TN-NonSharedSpectrumChAccess-r17 ENUMERATED {supported} OPTIONAL, -- R1 31-11: Directional Collision Handling in DC operation directionalCollisionDC-IAB-r17 ENUMERATED {supported} OPTIONAL @@ -15215,6 +19200,62 @@ Phy-ParametersCommon ::= SEQUENCE { dummy4 ENUMERATED {supported} OPTIONAL, srs-AdditionalRepetition-r17 ENUMERATED {supported} OPTIONAL, pusch-Repetition-CG-SDT-r17 ENUMERATED {supported} OPTIONAL + ]], + [[ + multiPDSCH-PerSlotType1-CB-Support-r17 ENUMERATED {supported} OPTIONAL + ]], + [[ + -- R1 42-6: Joint operation of power domain and spatial domain adaptation + jointPowerSpatialAdaptation-r18 ENUMERATED {supported} OPTIONAL, + -- R1 43-3: Aperiodic beam indication for access link + ncr-AperiodicBeamInd-AccessLink-r18 SEQUENCE { + scs-15kHz-r18 INTEGER (0..1) OPTIONAL, + scs-30kHz-r18 INTEGER (0..1) OPTIONAL, + scs-60kHz-r18 INTEGER (0..2) OPTIONAL, + scs-120kHz-r18 INTEGER (0..2) OPTIONAL + } OPTIONAL, + -- R1 43-4: Semi-persistent beam indication for access link + ncr-Semi-PersistentBeamInd-AccessLink-r18 ENUMERATED {supported} OPTIONAL, + -- R1 43-5: Simulatenous UL transmission of backhaul link and C-Link + ncr-SimultaneousUL-BackhaulAndC-Link-r18 ENUMERATED {supported} OPTIONAL, + -- R1 43-6: Dedicated signalling for backhaul link beam indication + ncr-BackhaulBeamInd-r18 ENUMERATED {nonUnifiedTCI, unifiedTCI, both} OPTIONAL, + -- R1 43-8: Adaptive beam for NCR backhaul link/C-link + ncr-AdaptiveBeamBackhaulAndC-Link-r18 ENUMERATED {nonUnifiedTCI, unifiedTCI, both} OPTIONAL, + + -- R1 49-4a: Nominal RBG size of Configuration 3 for FDRA type 0 for DCI format 1_3 + nominalRBG-SizeOfConfig-3-FDRA-Type-0-DCI-1-3-r18 ENUMERATED {supported} OPTIONAL, + -- R1 49-4b: Nominal RBG size of Configuration 3 for FDRA type 0 for DCI format 0_3 + nominalRBG-SizeOfConfig-3-FDRA-Type-0-DCI-0-3-r18 ENUMERATED {supported} OPTIONAL, + -- R1 49-4c: Configurable Type-1A fields for DCI format 0_3/1_3 + configurableType-1A-FieldsForDCI-0-3-And-1-3-r18 ENUMERATED {supported} OPTIONAL, + -- R1 49-4d: FDRA Type 1 granularity of 2, 4, 8, or 16 consecutive RBs based RIV for DCI format 1_3/0_3 + fdra-Type-1-Gty-2-4-8-16-RBs-RIV-DCI-1-3-And-0-3-r18 ENUMERATED {supported} OPTIONAL, + -- R1 49-6b: DL priority indication in DCI with mixed DCI formats including DCI format 1_3 + priorityIndicationDL-r18 ENUMERATED {supported} OPTIONAL, + -- R1 49-7a: UL priority indication in DCI with mixed DCI formats including DCI format 0_3 + priorityIndicationUL-r18 ENUMERATED {supported} OPTIONAL, + -- R1 49-10: Dynamic indication of applicable minimum scheduling restriction by DCI format 0_3/1_3 + dynamicIndicationSchedulingRestriction-r18 ENUMERATED {supported} OPTIONAL, + -- R1 49-11: PHY priority indication for one-shot HARQ-ACK feedback triggered by DCI format 1_3 + priorityIndicationOneSlotHARQ-r18 ENUMERATED {supported} OPTIONAL, + -- R1 50-1c: Multi-PUSCHs Type 2 configured grant release by DCI format 0_1 + multiPUSCH-DCI-0-1-r18 ENUMERATED {supported} OPTIONAL, + -- R1 50-1d: Multi-PUSCHs Type 2 configured grant release by DCI format 0_2 + multiPUSCH-DCI-0-2-r18 ENUMERATED {supported} OPTIONAL, + + -- R1 55-1: Additional SR periodicities + additionalSR-Periodicities-r18 SEQUENCE { + scs-30kHz-r18 ENUMERATED {supported} OPTIONAL, + scs-120kHz-r18 ENUMERATED {supported} OPTIONAL + } OPTIONAL, + -- R1 55-5: Enable MAC CE based pathloss RS updates for Type 1 CG-PUSCH + pathlossRS-UpdateForType1CG-PUSCH-r18 ENUMERATED {supported} OPTIONAL, + -- R4 38-9: Dormant BWP switching on multiple CCs RRM requirements with DCI 0-3/1-3 + bwp-SwitchingMultiDormancyCC-DCI-0-3-And-1-3-r18 CHOICE { + type1-r18 ENUMERATED {us100, us200}, + type2-r18 ENUMERATED {us200, us400, us800, us1000} + } OPTIONAL ]] } @@ -15335,6 +19376,9 @@ Phy-ParametersFRX-Diff ::= SEQUENCE { [[ -- R1 25-11: 4-bits subband CQI for TN and licensed cqi-4-BitsSubbandTN-NonSharedSpectrumChAccess-r17 ENUMERATED {supported} OPTIONAL + ]], + [[ + multipleCORESET-RedCap-r17 ENUMERATED {supported} OPTIONAL ]] } @@ -15352,6 +19396,24 @@ Phy-ParametersFR1 ::= SEQUENCE { -- R1 22-12: PDCCH monitoring with a single span of three contiguous OFDM symbols that is within the first four OFDM symbols in a -- slot pdcch-MonitoringSingleSpanFirst4Sym-r16 ENUMERATED {supported} OPTIONAL + ]], + [[ + -- R1 56-4: K1 range extension defined for ATG as well + k1-RangeExtensionATG-r18 ENUMERATED {supported} OPTIONAL, + -- R1 56-3: Increasing the number of HARQ processes defined for ATG as well + maxHARQ-ProcessNumberATG-r18 ENUMERATED {u16d32, u32d16, u32d32} OPTIONAL, + -- R1 56-1: Uplink Time and Frequency pre-compensation and timing relationship enhancements defined for ATG as well + uplinkPreCompensationATG-r18 ENUMERATED {supported} OPTIONAL, + -- R1 56-2: UE reporting of TA information + uplinkTA-ReportingATG-r18 ENUMERATED {supported} OPTIONAL, + -- R4 36-1: MU-MIMO Interference Mitigation advanced receiver + advReceiver-MU-MIMO-r18 ENUMERATED {supported} OPTIONAL, + -- R4 41-1: Support of delta PPowerClass reporting mechanism + deltaPowerClassReporting-r18 ENUMERATED {type1, type2} OPTIONAL, + -- R1 51-2b: Support 12 PRB CORESET0 with an associated SS/PBCH block located at GSCN 41637 + support12PRB-CORESET0-GSCN-41637-r18 ENUMERATED {supported} OPTIONAL, + -- R1 51-3: Support 5 MHz channel bandwidth with 20 PRB CORESET0 + support5MHz-ChannelBW-20PRB-CORESET0-r18 ENUMERATED {supported} OPTIONAL ]] } @@ -15370,6 +19432,10 @@ Phy-ParametersFR2 ::= SEQUENCE { -- R1 16-1d: Support of spatial relation update for AP-SRS via MAC CE spatialRelationUpdateAP-SRS-r16 ENUMERATED {supported} OPTIONAL, maxNumberSRS-PosSpatialRelationsAllServingCells-r16 ENUMERATED {n0, n1, n2, n4, n8, n16} OPTIONAL + ]], + [[ + -- R4 30-3: Supports Indication of multi-Rx operation preference + multiRxPreferenceIndication-r18 ENUMERATED {supported} OPTIONAL ]] } @@ -15446,6 +19512,28 @@ Phy-ParametersSharedSpectrumChAccess-r16 ::= SEQUENCE { } -- TAG-PHY-PARAMETERSSHAREDSPECTRUMCHACCESS-STOP +-- TAG-POSSRS-BWA-RRC-INACTIVE-START + +PosSRS-BWA-RRC-Inactive-r18 ::= SEQUENCE { + numOfCarriersIntraBandContiguous-r18 ENUMERATED {two, three, twoandthree}, + maximumAggregatedBW-TwoCarriersFR1-r18 ENUMERATED { mhz20, mhz40, mhz50, mhz80, mhz100, mhz160, + mhz180, mhz190, mhz200} OPTIONAL, + maximumAggregatedBW-TwoCarriersFR2-r18 ENUMERATED {mhz50, mhz100, mhz200, mhz400, mhz600, mhz800} OPTIONAL, + maximumAggregatedBW-ThreeCarriersFR1-r18 ENUMERATED {mhz80, mhz100, mhz160, mhz200, mhz240, mhz300} OPTIONAL, + maximumAggregatedBW-ThreeCarriersFR2-r18 ENUMERATED {mhz50, mhz100, mhz200, mhz300, mhz400, mhz600, + mhz800, mhz1000, mhz1200} OPTIONAL, + maximumAggregatedResourceSet-r18 ENUMERATED {n1, n2, n4, n8, n12, n16}, + maximumAggregatedResourcePeriodic-r18 ENUMERATED {n1, n2, n4, n8, n16, n32, n64}, + maximumAggregatedResourceSemi-r18 ENUMERATED {n0, n1, n2, n4, n8, n16, n32, n64}, + maximumAggregatedResourcePeriodicPerSlot-r18 ENUMERATED {n1, n2, n3, n4, n5, n6, n8, n10, n12, n14}, + maximumAggregatedResourceSemiPerSlot-r18 ENUMERATED {n0, n1, n2, n3, n4, n5, n6, n8, n10, n12, n14}, + guardPeriod-r18 ENUMERATED {n0, n30, n100, n140, n200}, + powerClassForTwoAggregatedCarriers-r18 ENUMERATED {pc2, pc3} OPTIONAL, + powerClassForThreeAggregatedCarriers-r18 ENUMERATED {pc2, pc3} OPTIONAL, + ... +} + +-- TAG-POSSRS-BWA-RRC-INACTIVE-STOP -- TAG-POSSRS-RRC-INACTIVE-OUTSIDEINITIALUL-BWP-START PosSRS-RRC-Inactive-OutsideInitialUL-BWP-r17::= SEQUENCE { @@ -15469,6 +19557,39 @@ PosSRS-RRC-Inactive-OutsideInitialUL-BWP-r17::= SEQUENCE { } -- TAG-POSSRS-RRC-INACTIVE-OUTSIDEINITIALUL-BWP-STOP +-- TAG-POSSRS-TXFREQUENCYHOPPINGRRCCONNECTED-START + +PosSRS-TxFrequencyHoppingRRC-Connected-r18 ::= SEQUENCE { + maximumSRS-BandwidthAcrossAllHopsFR1-r18 ENUMERATED {mhz40, mhz50, mhz80, mhz100} OPTIONAL, + maximumSRS-BandwidthAcrossAllHopsFR2-r18 ENUMERATED {mhz100, mhz200, mhz400} OPTIONAL, + maximumTxFH-Hops-r18 ENUMERATED {n2, n3, n4, n5, n6} OPTIONAL, + rf-TxRetunTimeFR1-r18 ENUMERATED {n70, n140, n210} OPTIONAL, + rf-TxRetunTimeFR2-r18 ENUMERATED {n35, n70, n140} OPTIONAL, + switchTimeBetweenActiveBWP-FrequencyHop-r18 ENUMERATED {n100, n140, n200, n300, n500} OPTIONAL, + numOfOverlappingPRB-r18 ENUMERATED {n0, n1, n2, n4} OPTIONAL, + maximumSRS-ResourcePeriodic-r18 ENUMERATED {n1, n2, n4, n8, n16, n32, n64} OPTIONAL, + maximumSRS-ResourceAperiodic-r18 ENUMERATED {n0,n1, n2, n4, n8, n16, n32, n64} OPTIONAL, + maximumSRS-ResourceSemipersistent-r18 ENUMERATED {n0,n1, n2, n4, n8, n16, n32, n64} OPTIONAL, + ... +} + +-- TAG-POSSRS-TXFREQUENCYHOPPINGRRCCONNECTED-STOP +-- TAG-POSSRS-TXFREQUENCYHOPPINGRRCINACTIVE-START + +PosSRS-TxFrequencyHoppingRRC-Inactive-r18 ::= SEQUENCE { + maximumSRS-BandwidthAcrossAllHops-FR1-r18 ENUMERATED {mhz40, mhz50, mhz80, mhz100} OPTIONAL, + maximumSRS-BandwidthAcrossAllHops-FR2-r18 ENUMERATED {mhz100, mhz200, mhz400} OPTIONAL, + maximumTxFH-Hops-r18 ENUMERATED {n2, n3, n4, n5, n6} OPTIONAL, + rf-TxRetunTimeFR1-r18 ENUMERATED {n70, n140, n210} OPTIONAL, + rf-TxRetunTimeFR2-r18 ENUMERATED {n35, n70, n140} OPTIONAL, + switchTimeBetweenActiveBWP-FrequencyHop ENUMERATED {n100, n140, n200, n300, n500} OPTIONAL, + numOfOverlappingPRB-r18 ENUMERATED {n0, n1, n2, n4} OPTIONAL, + maximumSRS-Resource-Periodic-r18 ENUMERATED {n1, n2, n4, n8, n16, n32, n64} OPTIONAL, + maximumSRS-Resource-Semipersistent-r18 ENUMERATED {n0, n1, n2, n4, n8, n16, n32, n64} OPTIONAL, + ... +} + +-- TAG-POSSRS-TXFREQUENCYHOPPINGRRCCINACTIVE-STOP -- TAG-POWSAV-PARAMETERS-START PowSav-Parameters-r16 ::= SEQUENCE { @@ -15639,6 +19760,27 @@ RF-Parameters ::= SEQUENCE { [[ supportedBandCombinationList-v1740 BandCombinationList-v1740 OPTIONAL, supportedBandCombinationList-UplinkTxSwitch-v1740 BandCombinationList-UplinkTxSwitch-v1740 OPTIONAL + ]], + [[ + supportedBandCombinationList-v1760 BandCombinationList-v1760 OPTIONAL, + supportedBandCombinationList-UplinkTxSwitch-v1760 BandCombinationList-UplinkTxSwitch-v1760 OPTIONAL + ]], + [[ + dummy1 BandCombinationList-v1770 OPTIONAL, + dummy2 BandCombinationList-UplinkTxSwitch-v1770 OPTIONAL + ]], + [[ + supportedBandCombinationList-v1780 BandCombinationList-v1780 OPTIONAL, + supportedBandCombinationList-UplinkTxSwitch-v1780 BandCombinationList-UplinkTxSwitch-v1780 OPTIONAL + ]], + [[ + supportedBandCombinationList-v1800 BandCombinationList-v1800 OPTIONAL, + supportedBandCombinationList-UplinkTxSwitch-v1800 BandCombinationList-UplinkTxSwitch-v1800 OPTIONAL, + supportedBandCombinationListSL-U2U-Relay-r18 SEQUENCE { + supportedBandCombinationListSL-U2U-RelayDiscovery-r18 OCTET STRING OPTIONAL, -- Contains PC5 + -- BandCombinationListSidelinkNR-r16 + supportedBandCombinationListSL-U2U-DiscoveryExt BandCombinationListSL-Discovery-r17 OPTIONAL + } OPTIONAL ]] } @@ -15918,7 +20060,7 @@ BandNR ::= SEQUENCE { aperiodicCSI-RS-AdditionalBandwidth-r17 ENUMERATED {addBW-Set1, addBW-Set2} OPTIONAL, -- R1 28-1a: RRC-configured DL BWP without CD-SSB or NCD-SSB bwp-WithoutCD-SSB-OrNCD-SSB-RedCap-r17 ENUMERATED {supported} OPTIONAL, - -- R1 28-3: Half-duplex FDD operation type A for RedCap UE + -- R1 28-3: Half-duplex FDD operation type A for (e)RedCap UE halfDuplexFDD-TypeA-RedCap-r17 ENUMERATED {supported} OPTIONAL, -- R1 27-15b: Positioning SRS transmission in RRC_INACTIVE state configured outside initial UL BWP posSRS-RRC-Inactive-OutsideInitialUL-BWP-r17 PosSRS-RRC-Inactive-OutsideInitialUL-BWP-r17 OPTIONAL, @@ -15954,7 +20096,7 @@ BandNR ::= SEQUENCE { cqi-4-BitsSubbandNTN-SharedSpectrumChAccess-r17 ENUMERATED {supported} OPTIONAL, -- R1 25-16: HARQ-ACK with different priorities multiplexing on a PUCCH/PUSCH mux-HARQ-ACK-DiffPriorities-r17 ENUMERATED {supported} OPTIONAL, - -- R1 25-20a: Propagation delay compensation based on legacy TA procedure for NTN and unlicensed + -- R1 25-20a: Propagation delay compensation based on Rel-15 TA procedure for NTN and unlicensed ta-BasedPDC-NTN-SharedSpectrumChAccess-r17 ENUMERATED {supported} OPTIONAL, -- R1 33-2b: DCI-based enabling/disabling ACK/NACK-based feedback for dynamic scheduling for multicast ack-NACK-FeedbackForMulticastWithDCI-Enabler-r17 ENUMERATED {supported} OPTIONAL, @@ -15983,8 +20125,8 @@ BandNR ::= SEQUENCE { pdsch-1024QAM-2MIMO-FR1-r17 ENUMERATED {supported} OPTIONAL, -- R4 14-3 PRS measurement without MG prs-MeasurementWithoutMG-r17 ENUMERATED {cpLength, quarterSymbol, halfSymbol, halfSlot} OPTIONAL, - -- R4 25-7: The number of target LEO satellites the UE can monitor per carrier - maxNumber-LEO-SatellitesPerCarrier-r17 INTEGER (3..4) OPTIONAL, + -- R4 25-7: The number of target NGSO satellites the UE can monitor per carrier + maxNumber-NGSO-SatellitesPerCarrier-r17 INTEGER (3..4) OPTIONAL, -- R1 27-3-3 DL PRS Processing Capability outside MG - buffering capability prs-ProcessingCapabilityOutsideMGinPPW-r17 SEQUENCE (SIZE(1..3)) OF PRS-ProcessingCapabilityOutsideMGinPPWperType-r17 OPTIONAL, -- R1 27-15a: Positioning SRS transmission in RRC_INACTIVE state for initial UL BWP with semi-persistent SRS @@ -16034,6 +20176,333 @@ BandNR ::= SEQUENCE { multiPUCCH-HARQ-ACK-ForMulticastUnicast-r17 ENUMERATED {supported} OPTIONAL, -- R1 33-9: Supporting unicast PDCCH to release SPS group-common PDSCH releaseSPS-MulticastWithCS-RNTI-r17 ENUMERATED {supported} OPTIONAL + ]], + [[ + -- R1 41-3-1a UE automomous TA adjustment when cell-reselection happens + posUE-TA-AutoAdjustment-r18 ENUMERATED {supported} OPTIONAL, + -- R1 41-3-1: SRS for positioning configuration in multiple cells for UEs in RRC_INACTIVE state for initial UL BWP + posSRS-ValidityAreaRRC-InactiveInitialUL-BWP-r18 ENUMERATED {supported} OPTIONAL, + -- R1 41-3-2: SRS for positioning configuration in multiple cells for UEs in RRC_INACTIVE state for configured outside + -- initial UL BWP + posSRS-ValidityAreaRRC-InactiveOutsideInitialUL-BWP-r18 ENUMERATED {supported} OPTIONAL, + -- R1 41-5-1:PRS measurement with Rx frequency hopping within a MG and measurement reporting RRC_CONNECTED for RedCap UEs + dl-PRS-MeasurementWithRxFH-RRC-ConnectedForRedCap-r18 DL-PRS-MeasurementWithRxFH-RRC-Connected-r18 OPTIONAL, + -- R1 41-5-2: Support of positioning SRS with Tx frequency hopping in RRC_CONNECTED for RedCap UEs + posSRS-TxFH-RRC-ConnectedForRedCap-r18 PosSRS-TxFrequencyHoppingRRC-Connected-r18 OPTIONAL, + -- R1 41-5-2a: Support of positioning SRS with Tx frequency hopping in RRC_INACTIVE for RedCap UEs + posSRS-TxFH-RRC-InactiveForRedCap-r18 PosSRS-TxFrequencyHoppingRRC-Inactive-r18 OPTIONAL, + -- R1 41-4-8: Support of Positioning SRS bandwidth aggregation in RRC_INACTIVE + posSRS-BWA-RRC-Inactive-r18 PosSRS-BWA-RRC-Inactive-r18 OPTIONAL, + -- R1 41-4-6a support a Rel-17 single DCI scheduling positioning SRS resource sets across the linked carriers + -- for SRS bandwidth aggregation in RRC_CONNECTED state + posJointTriggerBySingleDCI-RRC-Connected-r18 ENUMERATED {supported} OPTIONAL, + -- R1 41-5-1a PRS measurement with Rx frequency hopping in RRC_INACTIVE for RedCap UEs + dl-PRS-MeasurementWithRxFH-RRC-InactiveforRedCap-r18 ENUMERATED {supported} OPTIONAL, + -- R1 41-5-1b PRS measurement with Rx frequency hopping in RRC_IDLE for RedCap UEs + dl-PRS-MeasurementWithRxFH-RRC-IdleforRedCap-r18 ENUMERATED {supported} OPTIONAL, + -- R1 42-1: Spatial domain adaptation with CSI feedback based on CSI report sub-configuration(s) for periodic CSI reporting + spatialAdaptation-CSI-Feedback-r18 SEQUENCE { + csiFeedbackType-r18 ENUMERATED {sdType1, sdType2, both}, + maxNumberLmax-r18 INTEGER (2..4), + maxNumberCSI-ResourcePerCC-r18 SEQUENCE { + sdType1-Resource-r18 INTEGER (1..32), + sdType2-Resource-r18 INTEGER (1..32) + }, + maxNumberTotalCSI-ResourcePerCC-r18 SEQUENCE { + sdType1-Resource-r18 ENUMERATED {n8, n16, n24, n32, n64, n128}, + sdType2-Resource-r18 ENUMERATED {n8, n16, n24, n32, n64, n128} + }, + totalNumberCSI-Reporting-r18 INTEGER (2..4) + } OPTIONAL, + -- R1 42-1a: Spatial domain adaptation with CSI feedback based on CSI report sub-configuration(s) for periodic CSI + -- reporting on PUSCH + spatialAdaptation-CSI-FeedbackPUSCH-r18 SEQUENCE { + csiFeedbackType-r18 ENUMERATED {sdType1, sdType2, both}, + maxNumberLmax-r18 INTEGER (2..8), + subReportCSI-r18 INTEGER (2..4), + maxNumberCSI-ResourcePerCC-r18 INTEGER (1..32), + maxNumberTotalCSI-ResourcePerCC-r18 ENUMERATED {n8, n16, n24, n32, n64, n128}, + totalNumberCSI-Reporting-r18 INTEGER (2..12) + } OPTIONAL, + -- R1 42-1b: Spatial domain adaptation with CSI feedback based on CSI report sub-configuration(s) for aperiodic CSI reporting + spatialAdaptation-CSI-FeedbackAperiodic-r18 SEQUENCE { + csiFeedbackType-r18 ENUMERATED {sdType1, sdType2, both}, + maxNumberLmax-r18 INTEGER (2..8), + subReportCSI-r18 INTEGER (2..4), + maxNumberCSI-ResourcePerCC-r18 SEQUENCE { + sdType1-Resource-r18 INTEGER (1..32), + sdType2-Resource-r18 INTEGER (1..32) + }, + maxNumberTotalCSI-ResourcePerCC-r18 SEQUENCE { + sdType1-Resource-r18 ENUMERATED {n8, n16, n24, n32, n64, n128}, + sdType2-Resource-r18 ENUMERATED {n8, n16, n24, n32, n64, n128} + }, + totalNumberCSI-Reporting-r18 INTEGER (2..12) + } OPTIONAL, + -- R1 42-1c: Spatial domain adaptation with CSI feedback based on CSI report sub-configuration(s) for semi-persistent + -- CSI reporting on PUCCH + spatialAdaptation-CSI-FeedbackPUCCH-r18 SEQUENCE { + csiFeedbackType-r18 ENUMERATED {sdType1, sdType2, both}, + maxNumberLmax-r18 INTEGER (2..4), + subReportCSI-r18 INTEGER (2..4), + maxNumberCSI-ResourcePerCC-r18 INTEGER (1..32), + maxNumberTotalCSI-ResourcePerCC-r18 ENUMERATED {n8, n16, n24, n32, n64, n128}, + totalNumberCSI-Reporting-r18 INTEGER (2..4) + } OPTIONAL, + -- R1 42-2: Power domain adaptation with CSI feedback based on CSI report sub-configuration(s) for periodic CSI reporting + powerAdaptation-CSI-Feedback-r18 SEQUENCE { + maxNumberLmax-r18 INTEGER (2..4), + maxNumberCSI-ResourcePerCC-r18 INTEGER (1..32), + maxNumberTotalCSI-ResourcePerCC-r18 ENUMERATED {n8, n16, n24, n32, n64, n128}, + totalNumberCSI-Reporting-r18 INTEGER (2..4) + } OPTIONAL, + -- R1 42-2a: Power domain adaptation with CSI feedback based on CSI report sub-configuration(s) for semi-persistent CSI + -- reporting on PUSCH + powerAdaptation-CSI-FeedbackPUSCH-r18 SEQUENCE { + maxNumberLmax-r18 INTEGER (2..8), + subReportCSI-r18 INTEGER (2..4), + maxNumberCSI-ResourcePerCC-r18 INTEGER (1..32), + maxNumberTotalCSI-ResourcePerCC-r18 ENUMERATED {n8, n16, n24, n32, n64, n128}, + totalNumberCSI-Reporting-r18 INTEGER (2..12) + } OPTIONAL, + -- R1 42-2b: Power domain adaptation with CSI feedback based on CSI report sub-configuration(s) for aperiodic CSI reporting + powerAdaptation-CSI-FeedbackAperiodic-r18 SEQUENCE { + maxNumberLmax-r18 INTEGER (2..8), + subReportCSI-r18 INTEGER (2..4), + maxNumberCSI-ResourcePerCC-r18 INTEGER (1..32), + maxNumberTotalCSI-ResourcePerCC-r18 ENUMERATED {n8, n16, n24, n32, n64, n128}, + totalNumberCSI-Reporting-r18 INTEGER (2..12) + } OPTIONAL, + -- R1 42-2c: Power domain adaptation with CSI feedback based on CSI report sub-configuration(s) for semi-persistent CSI + -- reporting on PUCCH + powerAdaptation-CSI-FeedbackPUCCH-r18 SEQUENCE { + maxNumberLmax-r18 INTEGER (2..4), + subReportCSI-r18 INTEGER (2..4), + maxNumberCSI-ResourcePerCC-r18 INTEGER (1..32), + maxNumberTotalCSI-ResourcePerCC-r18 ENUMERATED {n8, n16, n24, n32, n64, n128}, + totalNumberCSI-Reporting-r18 INTEGER (2..4) + } OPTIONAL, + -- R1 42-4: Cell DTX and/or DRX operation based on RRC configuration + nes-CellDTX-DRX-r18 ENUMERATED {cellDTXonly, cellDRXonly, both} OPTIONAL, + -- R1 42-5: Cell DTX/DRX operation triggered by DCI format 2_9 + nes-CellDTX-DRX-DCI2-9-r18 ENUMERATED {supported} OPTIONAL, + -- R1 42-7: Mixed codebook combination for spatial domain adaptation with CSI feedback based on CSI report sub-configuration(s), + -- each containing one port subset configuration + mixCodeBookSpatialAdaptation-r18 ENUMERATED {supported} OPTIONAL, + -- R1 42-8: the number of CSI report(s) for which the UE can measure and process reference signals simultaneously in a CC of the + -- band for which this capability is provided. + simultaneousCSI-SubReportsPerCC-r18 INTEGER (1..8) OPTIONAL, + -- R1 44-2: NTN DMRS bundling enhancement for PUSCH in NGSO scenarios + ntn-DMRS-BundlingNGSO-r18 ENUMERATED {n4, n8, n16, n32} OPTIONAL, + -- R1 45-3: Beam indication with joint DL/UL LTM TCI states + ltm-BeamIndicationJointTCI-r18 SEQUENCE { + maxNumberJointTCI-PerCell-r18 ENUMERATED {n8,n12,n16,n24,n32,n48,n64,n128}, + qcl-Resource-r18 ENUMERATED {srs, trs, both}, + maxNumberJointTCI-AcrossCells-r18 INTEGER (1..128), + maxNumberCells-r18 INTEGER (1..8) + } OPTIONAL, + -- R1 45-3a: MAC-CE activated joint LTM TCI states + ltm-MAC-CE-JointTCI-r18 SEQUENCE { + qcl-Resource-r18 ENUMERATED {ssb, trs, both}, + maxNumberJointTCI-PerCell-r18 INTEGER (1..16), + maxNumberJointTCI-AcrossCells-r18 ENUMERATED {n1,n2,n3,n4,n8,n16,n32} + } OPTIONAL, + -- R1 45-4: Beam indication with separate DL/UL LTM TCI states + ltm-BeamIndicationSeparateTCI-r18 SEQUENCE { + maxNumberDL-TCI-PerCell-r18 ENUMERATED {n4,n8,n12,n16,n24,n32,n48,n64,n128}, + maxNumberUL-TCI-PerCell-r18 ENUMERATED {n4,n8,n12,n16,n24,n32,n48,n64}, + qcl-Resource-r18 ENUMERATED {ssb, trs, both}, + maxNumberDL-TCI-AcrossCells-r18 INTEGER (1..128), + maxNumberUL-TCI-AcrossCells-r18 INTEGER (1..64), + maxNumberCells-r18 INTEGER (1..8) + } OPTIONAL, + -- R1 45-4a: MAC-CE activated DL/UL LTM TCI states + ltm-MAC-CE-SeparateTCI-r18 SEQUENCE { + qcl-Resource-r18 ENUMERATED {ssb, trs, both}, + maxNumberDL-TCI-PerCell-r18 INTEGER (1..8), + maxNumberUL-TCI-PerCell-r18 INTEGER (1..8), + maxNumberDL-TCI-AcrossCells-r18 ENUMERATED {n1,n2,n4,n8,n16}, + maxNumberUL-TCI-AcrossCells-r18 ENUMERATED {n1,n2,n4,n8,n16} + } OPTIONAL, + -- R1 45-5: RACH-based early TA acquisition + rach-EarlyTA-Measurement-r18 INTEGER (1..8) OPTIONAL, + -- R1 45-6: UE-based TA measurement + ue-TA-Measurement-r18 INTEGER (1..8) OPTIONAL, + -- R1 45-7: TA indication in cell switch command + ta-IndicationCellSwitch-r18 ENUMERATED {supported} OPTIONAL, + -- R1 49-8: Triggered HARQ-ACK codebook re-transmission for DCI format 1_3 + triggeredHARQ-CodebookRetxDCI-1-3-r18 SEQUENCE { + minHARQ-Retx-Offset-r18 ENUMERATED {n-7, n-5, n-3, n-1, n1}, + maxHARQ-Retx-Offset-r18 ENUMERATED {n4, n6, n8, n10, n12, n14, n16, n18, n20, n22, n24} + } OPTIONAL, + -- R1 49-12: Unified TCI with joint DL/UL TCI update by DCI format 1_3 for intra-cell beam management with more than + -- one MAC-CE activated joint TCI state per CC + unifiedJointTCI-MultiMAC-CE-IntraCell-r18 SEQUENCE { + minBeamApplicationTime-r18 CHOICE { + fr1-r18 SEQUENCE { + scs-15kHz-r18 ENUMERATED {sym1, sym2, sym4, sym7, sym14, sym28, sym42, sym56, sym70} OPTIONAL, + scs-30kHz-r18 ENUMERATED {sym1, sym2, sym4, sym7, sym14, sym28, sym42, sym56, sym70} OPTIONAL, + scs-60kHz-r18 ENUMERATED {sym1, sym2, sym4, sym7, sym14, sym28, sym42, sym56, sym70} OPTIONAL + }, + fr2-r18 SEQUENCE { + scs-60kHz-r18 ENUMERATED {sym1, sym2, sym4, sym7, sym14, sym28, sym42, sym56, sym70, + sym84, sym98, sym112, sym224, sym336} OPTIONAL, + scs-120kHz-r18 ENUMERATED {sym1, sym2, sym4, sym7, sym14, sym28, sym42, sym56, sym70, + sym84, sym98, sym112, sym224, sym336} OPTIONAL + } + }, + maxActivatedTCI-PerCC-r18 INTEGER (2..8) OPTIONAL + } OPTIONAL, + -- R1 49-12a: Unified TCI with separate DL/UL TCI update by DCI format 1_3 for intra-cell beam management with more than + -- one MAC-CE activated separate TCI state per CC + unifiedSeparateTCI-MultiMAC-CE-IntraCell-r18 SEQUENCE { + minBeamApplicationTime-r18 CHOICE { + fr1-r18 SEQUENCE { + scs-15kHz-r18 ENUMERATED {sym1, sym2, sym4, sym7, sym14, sym28, sym42, sym56, sym70, + sym84, sym98, sym112, sym224, sym336} OPTIONAL, + scs-30kHz-r18 ENUMERATED {sym1, sym2, sym4, sym7, sym14, sym28, sym42, sym56, sym70, + sym84, sym98, sym112, sym224, sym336} OPTIONAL, + scs-60kHz-r18 ENUMERATED {sym1, sym2, sym4, sym7, sym14, sym28, sym42, sym56, sym70, + sym84, sym98, sym112, sym224, sym336} OPTIONAL + }, + fr2-r18 SEQUENCE { + scs-60kHz-r18 ENUMERATED {sym1, sym2, sym4, sym7, sym14, sym28, sym42, sym56, sym70, + sym84, sym98, sym112, sym224, sym336} OPTIONAL, + scs-120kHz-r18 ENUMERATED {sym1, sym2, sym4, sym7, sym14, sym28, sym42, sym56, sym70, + sym84, sym98, sym112, sym224, sym336} OPTIONAL + } + }, + maxActivatedDL-TCI-PerCC-r18 INTEGER (2..8) OPTIONAL, + maxActivatedUL-TCI-PerCC-r18 INTEGER (2..8) OPTIONAL + } OPTIONAL, + -- R1 50-1: Multi-PUSCHs for Configured Grant + multiPUSCH-CG-r18 ENUMERATED {n16, n32} OPTIONAL, + -- R1 50-1a: Multiple active multi-PUSCHs configured grant configurations for a BWP of a serving cell + multiPUSCH-ActiveConfiguredGrant-r18 SEQUENCE { + maxNumberConfigsPerBWP ENUMERATED {n1, n2, n4, n8, n12}, + maxNumberConfigsAllCC-FR1 INTEGER (2..32), + maxNumberConfigsAllCC-FR2 INTEGER (2..32) + } OPTIONAL, + -- R1 50-1b: Joint release in a DCI for two or more configured grant Type 2 configurations, including multi-PUSCH CG + -- configuration(s), for a given BWP of a serving cell + jointReleaseDCI-r18 ENUMERATED {supported} OPTIONAL, + -- R1 50-2: UCI indication of unused CG-PUSCH transmission occasions + cg-PUSCH-UTO-UCI-Ind-r18 ENUMERATED {supported} OPTIONAL, + -- R1 50-3: PDCCH monitoring resumption after UL NACK + pdcch-MonitoringResumptionAfterUL-NACK-r18 ENUMERATED {supported} OPTIONAL, + + -- R1 51-1: Support for 3 MHz symmetric channel bandwidth in DL and UL + support3MHz-ChannelBW-Symmetric-r18 ENUMERATED {supported} OPTIONAL, + -- R1 51-1a: Support for 3 MHz channel bandwidth in uplink with larger than 3 MHz channel BW in DL + support3MHz-ChannelBW-Asymmetric-r18 ENUMERATED {supported} OPTIONAL, + -- R1 51-2a: support 12 PRB CORESET0 + support12PRB-CORESET0-r18 ENUMERATED {supported} OPTIONAL, + + -- R1 52-1: Reception of NR PDCCH candidates overlapping with LTE CRS REs + nr-PDCCH-OverlapLTE-CRS-RE-r18 SEQUENCE { + overlapInRE-r18 ENUMERATED {oneSymbolNoOverlap, someOrAllSymOverlap}, + overlapInSymbol-r18 ENUMERATED {symbol2,symbol1And2} + } OPTIONAL, + -- Editor's Note: someOrAllSymOverlap considers to be supported in overlapInRE-r18 only if RAN4 performance requirements for + -- someOrAllSymOverlap are not defined + -- R1 52-1a: Reception of NR PDCCH candidates overlapping with LTE CRS REs with multiple non-overlapping CRS rate matching patterns + nr-PDCCH-OverlapLTE-CRS-RE-MultiPatterns-r18 ENUMERATED {supported} OPTIONAL, + -- R1 52-1b: NR PDCCH reception that overlaps with LTE CRS within a single span of 3 consecutive OFDM symbols that is within the + -- first 4 OFDM symbols in a slot + nr-PDCCH-OverlapLTE-CRS-RE-Span-3-4-r18 ENUMERATED {supported} OPTIONAL, + -- R1 52-2: Two LTE-CRS overlapping rate matching patterns within NR 15 kHz carrier overlapping with LTE carrier (regardless of + -- support or configuration of multi-TRP) + twoRateMatchingEUTRA-CRS-patterns-3-4-r18 SEQUENCE { + maxNumberPatterns-r18 INTEGER (2..6), + maxNumberNon-OverlapPatterns-r18 INTEGER (1..3) + } OPTIONAL, + -- R1 52-2a: Two LTE-CRS overlapping rate matching patterns with two different values of coresetPoolIndex within NR 15 kHz carrier + -- overlapping with LTE carrier + overlapRateMatchingEUTRA-CRS-Patterns-3-4-Diff-CS-Pool-r18 ENUMERATED {supported} OPTIONAL, + + + -- R1 53-3: Support RLM/BM/BFD measurements based on NCD-SSB within active BWP + ncd-SSB-BWP-Wor-r18 ENUMERATED {supported} OPTIONAL, + -- R1 53-4: Support Support RLM/BM/BFD measurements based on CSI-RS when CD-SSB is outside active BWP + rlm-BM-BFD-CSI-RS-OutsideActiveBWP-r18 ENUMERATED {supported} OPTIONAL, + -- R1 54-1: PRACH coverage enhancements + prach-CoverageEnh-r18 ENUMERATED {supported} OPTIONAL, + -- R1 54-1a: PRACH repetitions with less than N symbols gap + prach-Repetition-r18 ENUMERATED {supported} OPTIONAL, + -- R1 54-3: Dynamic waveform switching + dynamicWaveformSwitch-r18 ENUMERATED {supported} OPTIONAL, + -- R1 54-3a: PHR enhancement for dynamic waveform switching + dynamicWaveformSwitchPHR-r18 ENUMERATED {supported} OPTIONAL, + -- R1 54-3b: Dynamic waveform switching for intra-band UL CA + dynamicWaveformSwitchIntraCA-r18 INTEGER (2..8) OPTIONAL, + + -- R1 55-3: Multiple PUSCHs scheduling by single DCI for non-consecutive slots in FR1 + multiPUSCH-SingleDCI-NonConsSlots-r18 ENUMERATED {supported} OPTIONAL, + -- R1 55-2d: single-symbol DL-PRS used in RTT-based Propagation delay compensation + pdc-maxNumberPRS-ResourceProcessedPerSlot-r18 SEQUENCE { + fr1-r18 SEQUENCE { + scs-15kHz-r18 ENUMERATED {n1, n2, n4, n6, n8, n12, n16, n24, n32, n48, n64} OPTIONAL, + scs-30kHz-r18 ENUMERATED {n1, n2, n4, n6, n8, n12, n16, n24, n32, n48, n64} OPTIONAL, + scs-60kHz-r18 ENUMERATED {n1, n2, n4, n6, n8, n12, n16, n24, n32, n48, n64} OPTIONAL + }, + fr2-r18 SEQUENCE { + scs-60kHz-r18 ENUMERATED {n1, n2, n4, n6, n8, n12, n16, n24, n32, n48, n64} OPTIONAL, + scs-120kHz-r18 ENUMERATED {n1, n2, n4, n6, n8, n12, n16, n24, n32, n48, n64} OPTIONAL + } + } OPTIONAL, + -- R1 57-2: Intra-slot TDM-ed unicast PDSCH and group-common PDSCH for multicast in RRC_INACTIVE state + intraSlot-PDSCH-MulticastInactive-r18 BOOLEAN OPTIONAL, + -- R1 57-1: Dynamic scheduling for multicast in RRC_INACTIVE state + multicastInactive-r18 ENUMERATED {supported} OPTIONAL, + thresholdBasedMulticastResume-r18 ENUMERATED {supported} OPTIONAL, + + -- R4 27-2: LowerMSD for inter-band NR CA and EN-DC + lowerMSD-r18 SEQUENCE (SIZE (1..maxLowerMSD-r18)) OF LowerMSD-r18 OPTIONAL, + lowerMSD-ENDC-r18 SEQUENCE (SIZE (1..maxLowerMSD-r18)) OF LowerMSD-r18 OPTIONAL, + -- R4 28-1: Enhanced channel raster + enhancedChannelRaster-r18 ENUMERATED {supported} OPTIONAL, + -- R4 30-2: Fast beam sweeping for layer-1 measurement when the UE is in multi-Rx operation + fastBeamSweepingMultiRx-r18 ENUMERATED {n2,n4,n6} OPTIONAL, + + -- R4 31-2 Beam sweeping factor reduction for FR2 unknown SCell activation + beamSweepingFactorReduction-r18 SEQUENCE { + reduceForCellDetection ENUMERATED {n1, n2, n4, n6}, + reduceForSSB-L1-RSRP-Meas INTEGER (0..7) + } OPTIONAL, + -- R4 34-1: Support of NR FR2 HST with simultaneous DL reception with two different QCL TypeD RSs + simultaneousReceptionTwoQCL-r18 ENUMERATED {supported} OPTIONAL, + -- R4 34-2: Enhanced FR2 HST RRM requirements for intra-band CA and inter-frequency measurements in connected mode + measEnhCAInterFreqFR2-r18 ENUMERATED {supported} OPTIONAL, + -- R4 34-4: Support of enhanced MAC CE for TCI state switch indication for FR2 HST + tci-StateSwitchInd-r18 ENUMERATED {supported} OPTIONAL, + -- R4 35-2: the requirements defined for ATG UE with antenna array or omni-direction antenna requirements. + antennaArrayType-r18 ENUMERATED {supported} OPTIONAL, + locationBasedCondHandoverATG-r18 ENUMERATED {supported} OPTIONAL, + -- R4 35-3: rated maximum output power value range from 23dBm to 40dBm with 1dB as granularity at maximum modulation order and full + -- PRB configurations. + maxOutputPowerATG-r18 INTEGER (1..18) OPTIONAL, + -- R4 39-6: Fast processing of LTM candidate cell RRC configuration + ltm-FastProcessingConfig-r18 SEQUENCE { + maxNumberStoredConfigCells-r18 ENUMERATED {n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n16}, + maxNumberConfigs-r18 INTEGER (1..4) + } OPTIONAL, + -- R4 39-8: Measurement validation based on EMR measurement during connection setup/resume + measValidationReportEMR-r18 ENUMERATED {supported} OPTIONAL, + -- R4 39-9: Measurement validation based on reselection measurement during connection setup/resume + measValidationReportReselectionMeasurements-r18 ENUMERATED {supported} OPTIONAL, + + eventA4BasedCondHandoverNES-r18 ENUMERATED {supported} OPTIONAL, + nesBasedCondHandoverWithDCI-r18 ENUMERATED {supported} OPTIONAL, + rach-LessHandoverCG-r18 ENUMERATED {supported} OPTIONAL, + rach-LessHandoverDG-r18 ENUMERATED {supported} OPTIONAL, + locationBasedCondHandoverEMC-r18 ENUMERATED {supported} OPTIONAL, + mt-CG-SDT-r18 ENUMERATED {supported} OPTIONAL, + posSRS-PreconfigureRRC-InactiveInitialUL-BWP-r18 ENUMERATED {supported} OPTIONAL, + posSRS-PreconfigureRRC-InactiveOutsideInitialUL-BWP-r18 ENUMERATED {supported} OPTIONAL, + cg-SDT-PeriodicityExt-r18 ENUMERATED {supported} OPTIONAL, + -- R2: 2Rx XR UEs + supportOf2RxXR-r18 ENUMERATED {supported} OPTIONAL, + condHandoverWithCandSCG-change-r18 ENUMERATED {supported} OPTIONAL ]] } @@ -16042,6 +20511,22 @@ BandNR-v16c0 ::= SEQUENCE { ... } +LowerMSD-r18 ::= SEQUENCE { + aggressorband1-r18 CHOICE { + nr FreqBandIndicatorNR, + eutra FreqBandIndicatorEUTRA + }, + aggressorband2-r18 FreqBandIndicatorNR OPTIONAL, + msd-Information-r18 SEQUENCE (SIZE (1..maxLowerMSDInfo-r18)) OF MSD-Information-r18 +} + +MSD-Information-r18 ::= SEQUENCE { + msd-Type-r18 ENUMERATED {harmonic, harmonicMixing, crossBandIsolation, imd2, imd3, imd4, imd5, all, spare8, spare7, + spare6, spare5,spare4, spare3, spare2, spare1}, + msd-PowerClass-r18 ENUMERATED {pc1dot5, pc2, pc3}, + msd-Class-r18 ENUMERATED {classI, classII, classIII, classIV, classV, classVI, classVII, classVIII } +} + -- TAG-RF-PARAMETERS-STOP -- TAG-RF-PARAMETERSMRDC-START @@ -16117,7 +20602,25 @@ RF-ParametersMRDC ::= SEQUENCE { supportedBandCombinationList-v1740 BandCombinationList-v1740 OPTIONAL, supportedBandCombinationListNEDC-Only-v1740 BandCombinationList-v1740 OPTIONAL, supportedBandCombinationList-UplinkTxSwitch-v1740 BandCombinationList-UplinkTxSwitch-v1740 OPTIONAL + ]], + [[ + dummy1 BandCombinationList-v1770 OPTIONAL, + dummy2 BandCombinationList-UplinkTxSwitch-v1770 OPTIONAL + ]], + [[ + supportedBandCombinationList-v1780 BandCombinationList-v1780 OPTIONAL, + supportedBandCombinationListNEDC-Only-v1780 BandCombinationList-v1780 OPTIONAL, + supportedBandCombinationList-UplinkTxSwitch-v1780 BandCombinationList-UplinkTxSwitch-v1780 OPTIONAL + ]], + [[ + supportedBandCombinationList-v1790 BandCombinationList-v1790 OPTIONAL, + supportedBandCombinationList-UplinkTxSwitch-v1790 BandCombinationList-UplinkTxSwitch-v1790 OPTIONAL + ]], + [[ + supportedBandCombinationList-v1800 BandCombinationList-v1800 OPTIONAL, + supportedBandCombinationList-UplinkTxSwitch-v1800 BandCombinationList-UplinkTxSwitch-v1800 OPTIONAL ]] + } RF-ParametersMRDC-v15g0 ::= SEQUENCE { @@ -16125,6 +20628,14 @@ RF-ParametersMRDC-v15g0 ::= SEQUENCE { supportedBandCombinationListNEDC-Only-v15g0 BandCombinationList-v15g0 OPTIONAL } +RF-ParametersMRDC-v15n0 ::= SEQUENCE { +supportedBandCombinationList-v15n0 BandCombinationList-v15n0 OPTIONAL +} + +RF-ParametersMRDC-v16e0 ::= SEQUENCE { +supportedBandCombinationList-UplinkTxSwitch-v16e0 BandCombinationList-UplinkTxSwitch-v16e0 OPTIONAL +} + -- TAG-RF-PARAMETERSMRDC-STOP -- TAG-RLC-PARAMETERS-START @@ -16139,6 +20650,9 @@ RLC-Parameters ::= SEQUENCE { ]], [[ am-WithLongSN-RedCap-r17 ENUMERATED {supported} OPTIONAL + ]], + [[ + am-WithLongSN-NCR-r18 ENUMERATED {supported} OPTIONAL ]] } @@ -16146,16 +20660,177 @@ RLC-Parameters ::= SEQUENCE { -- TAG-SDAP-PARAMETERS-START SDAP-Parameters ::= SEQUENCE { - as-ReflectiveQoS ENUMERATED {true} OPTIONAL, + as-ReflectiveQoS ENUMERATED {true} OPTIONAL, ..., [[ sdap-QOS-IAB-r16 ENUMERATED {supported} OPTIONAL, sdapHeaderIAB-r16 ENUMERATED {supported} OPTIONAL + ]], + [[ + sdap-QOS-NCR-r18 ENUMERATED {supported} OPTIONAL, + sdap-HeaderNCR-r18 ENUMERATED {supported} OPTIONAL ]] - } -- TAG-SDAP-PARAMETERS-STOP +-- TAG-SHAREDSPECTRUMCHACCESSPARAMSPERBAND-START + +SharedSpectrumChAccessParamsPerBand-r16 ::= SEQUENCE { + + -- R1 10-1: UL channel access for dynamic channel access mode + ul-DynamicChAccess-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-1a: UL channel access for semi-static channel access mode + ul-Semi-StaticChAccess-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-2: SSB-based RRM for dynamic channel access mode + ssb-RRM-DynamicChAccess-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-2a: SSB-based RRM for semi-static channel access mode + ssb-RRM-Semi-StaticChAccess-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-2b: MIB reading on unlicensed cell + mib-Acquisition-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-2c: SSB-based RLM for dynamic channel access mode + ssb-RLM-DynamicChAccess-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-2d: SSB-based RLM for semi-static channel access mode + ssb-RLM-Semi-StaticChAccess-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-2e: SIB1 reception on unlicensed cell + sib1-Acquisition-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-2f: Support monitoring of extended RAR window + extRA-ResponseWindow-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-2g: SSB-based BFD/CBD for dynamic channel access mode + ssb-BFD-CBD-dynamicChannelAccess-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-2h: SSB-based BFD/CBD for semi-static channel access mode + ssb-BFD-CBD-semi-staticChannelAccess-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-2i: CSI-RS-based BFD/CBD for NR-U + csi-RS-BFD-CBD-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-7: UL channel access for 10 MHz SCell + ul-ChannelBW-SCell-10mhz-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-10: RSSI and channel occupancy measurement and reporting + rssi-ChannelOccupancyReporting-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-11:SRS starting position at any OFDM symbol in a slot + srs-StartAnyOFDM-Symbol-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-20: Support search space set configuration with freqMonitorLocation-r16 + searchSpaceFreqMonitorLocation-r16 INTEGER (1..5) OPTIONAL, + -- R1 10-20a: Support coreset configuration with rb-Offset + coreset-RB-Offset-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-23:CGI reading on unlicensed cell for ANR functionality + cgi-Acquisition-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-25: Enable configured UL transmissions when DCI 2_0 is configured but not detected + configuredUL-Tx-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-27: Wideband PRACH + prach-Wideband-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-29: Support available RB set indicator field in DCI 2_0 + dci-AvailableRB-Set-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-30: Support channel occupancy duration indicator field in DCI 2_0 + dci-ChOccupancyDuration-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-8: Type B PDSCH length {3, 5, 6, 8, 9, 10, 11, 12, 13} without DMRS shift due to CRS collision + typeB-PDSCH-length-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-9: Search space set group switching with explicit DCI 2_0 bit field trigger or with implicit PDCCH decoding with DCI 2_0 monitoring + searchSpaceSwitchWithDCI-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-9b: Search space set group switching with implicit PDCCH decoding without DCI 2_0 monitoring + searchSpaceSwitchWithoutDCI-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-9d: Support Search space set group switching capability 2 + searchSpaceSwitchCapability2-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-14: Non-numerical PDSCH to HARQ-ACK timing + non-numericalPDSCH-HARQ-timing-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-15: Enhanced dynamic HARQ codebook + enhancedDynamicHARQ-codebook-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-16: One-shot HARQ ACK feedback + oneShotHARQ-feedback-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-17: Multi-PUSCH UL grant + multiPUSCH-UL-grant-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-26: CSI-RS based RLM for NR-U + csi-RS-RLM-r16 ENUMERATED {supported} OPTIONAL, + dummy ENUMERATED {supported} OPTIONAL, + -- R1 10-31: Support of P/SP-CSI-RS reception with CSI-RS-ValidationWith-DCI-r16 configured + periodicAndSemi-PersistentCSI-RS-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-3: PRB interlace mapping for PUSCH + pusch-PRB-interlace-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-3a: PRB interlace mapping for PUCCH + pucch-F0-F1-PRB-Interlace-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-12: OCC for PRB interlace mapping for PF2 and PF3 + occ-PRB-PF2-PF3-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-13a: Extended CP range of more than one symbol for CG-PUSCH + extCP-rangeCG-PUSCH-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-18: Configured grant with retransmission in CG resources + configuredGrantWithReTx-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-21a: Support using ED threshold given by gNB for UL to DL COT sharing + ed-Threshold-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-21b: Support UL to DL COT sharing + ul-DL-COT-Sharing-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-24: CG-UCI multiplexing with HARQ ACK + mux-CG-UCI-HARQ-ACK-r16 ENUMERATED {supported} OPTIONAL, + -- R1 10-28: Configured grant with Rel-16 enhanced resource configuration + cg-resourceConfig-r16 ENUMERATED {supported} OPTIONAL +} + +SharedSpectrumChAccessParamsPerBand-v1630 ::= SEQUENCE { + -- R4 4-1: DL reception in intra-carrier guardband + dl-ReceptionIntraCellGuardband-r16 ENUMERATED {supported} OPTIONAL, + -- R4 4-2: DL reception when gNB does not transmit on all RB sets of a carrier as a result of LBT + dl-ReceptionLBT-subsetRB-r16 ENUMERATED {supported} OPTIONAL +} + +SharedSpectrumChAccessParamsPerBand-v1640 ::= SEQUENCE { + -- 10-26b(1-4): CSI-RS based RRM measurement with associated SS-block + csi-RSRP-AndRSRQ-MeasWithSSB-r16 ENUMERATED {supported} OPTIONAL, + -- 10-26c(1-5): CSI-RS based RRM measurement without associated SS-block + csi-RSRP-AndRSRQ-MeasWithoutSSB-r16 ENUMERATED {supported} OPTIONAL, + -- 10-26d(1-6): CSI-RS based RS-SINR measurement + csi-SINR-Meas-r16 ENUMERATED {supported} OPTIONAL, + -- 10-26e(1-8): RLM based on a mix of SS block and CSI-RS signals within active BWP + ssb-AndCSI-RS-RLM-r16 ENUMERATED {supported} OPTIONAL, + -- 10-26f(1-9): CSI-RS based contention free RA for HO + csi-RS-CFRA-ForHO-r16 ENUMERATED {supported} OPTIONAL +} + +SharedSpectrumChAccessParamsPerBand-v1650 ::= SEQUENCE { + -- Extension of R1 10-9 capability to configure up to 16 instead of 4 cells or cell groups, respectively + extendedSearchSpaceSwitchWithDCI-r16 ENUMERATED {supported} OPTIONAL +} + +SharedSpectrumChAccessParamsPerBand-v1710 ::= SEQUENCE { + -- R1 25-12: UE initiated semi-static channel occupancy with dependent configurations + ul-Semi-StaticChAccessDependentConfig-r17 ENUMERATED {supported} OPTIONAL, + -- R1 25-13: UE initiated semi-static channel occupancy with independent configurations + ul-Semi-StaticChAccessIndependentConfig-r17 ENUMERATED {supported} OPTIONAL +} + +-- TAG-SHAREDSPECTRUMCHACCESSPARAMSPERBAND-STOP +-- TAG-SHAREDSPECTRUMCHACCESSPARAMSSIDELINKPERBAND-START + +SharedSpectrumChAccessParamsSidelinkPerBand-r18 ::= SEQUENCE { + -- R1 47-k1: SL channel access for dynamic channel access mode + sl-DynamicChannelAccess-r18 ENUMERATED {supported} OPTIONAL, + -- R1 47-k2: SL multi-channel access for dynamic channel access mode + sl-DynamicMultiChannelAccess-r18 INTEGER (2..5) OPTIONAL, + -- R1 47-k6: Type1 LBT blocking Option 1 + sl-LBT-Option1-r18 ENUMERATED {supported} OPTIONAL, + -- R1 47-k7: Type1 LBT blocking Option 2 + sl-LBT-Option2-r18 ENUMERATED {supported} OPTIONAL, + -- R1 47-k9: Sidelink mode 1 resource allocation in shared spectrum + sl-ResourceAllocMode1-r18 ENUMERATED {supported} OPTIONAL, + -- R1 47-m1: Interlace RB-based SL transmission/reception + sl-Interlace-RB-TxRx-r18 ENUMERATED {supported} OPTIONAL, + -- R1 47-m5: Multiple PSFCH occasions per PSCCH/PSSCH + sl-PSFCH-MultiOccasion-r18 INTEGER (1..4) OPTIONAL, + -- R1 47-m10: Contiguous RB-based PSCCH/PSSCH transmission/reception + sl-ContiguousRB-TxRx-r18 ENUMERATED {supported} OPTIONAL, + -- R1 47-m11: PSFCH transmissions in multiple contiguous RB sets + sl-PSFCH-MultiContiguousRB-r18 ENUMERATED {supported} OPTIONAL, + -- R1 47-m11a: PSFCH transmissions in multiple non-contiguous RB sets + sl-PSFCH-MultiNonContiguousRB-r18 ENUMERATED {supported} OPTIONAL, + -- R1 47-m13: Transmissions/receptions of multiple dedicated PRBs in common interlace-based PSFCH + sl-MultiplePRB-CommonInterlacePSFCH-r18 SEQUENCE { + tx-TotalPRB-PSFCH-r18 ENUMERATED {n4, n5, n8, n15, n16, n20}, + rx-TotalPRB-PSFCH-r18 ENUMERATED {n5, n6, n15, n16, n25, n26, n32, n35, n45, n46, n50, n64, n65} + } OPTIONAL, + -- R1 47-m13a: Transmissions/receptions of multiple interlaces in dedicated interlace-based PSFCH + sl-MultiplePRB-DedicatedInterlacePSFCH-r18 SEQUENCE { + tx-TotalPRB-PSFCH-r18 INTEGER (1..3), + rx-TotalPRB-PSFCH-r18 INTEGER (1..5) + } OPTIONAL +} + +-- TAG-SHAREDSPECTRUMCHACCESSPARAMSSIDELINKPERBAND-STOP -- TAG-SIDELINKPARAMETERS-START SidelinkParameters-r16 ::= SEQUENCE { @@ -16176,6 +20851,20 @@ SidelinkParametersNR-r16 ::= SEQUENCE { [[ -- R1 32-x: Use of new P0 parameters for open loop power control p0-OLPC-Sidelink-r17 ENUMERATED {supported} OPTIONAL + ]], + [[ + pdcp-ParametersSidelink-r18 PDCP-ParametersSidelink-r18 OPTIONAL, + --R1 41-1-1a: Common SL-PRS processing capability + sl-PRS-CommonProcCapabilityPerUE-r18 SEQUENCE { + maxNumOfActiveSL-PRS-Resources-r18 SEQUENCE { + fr1-r18 ENUMERATED {n1, n2, n4, n6, n8, n12, n16, n24} OPTIONAL, + fr2-r18 ENUMERATED {n1, n2, n4, n6, n8, n12, n16, n24, n32, n48, n64, n128} OPTIONAL + }, + maxNumOfSlotswithActiveSL-PRS-Resources-r18 SEQUENCE { + fr1-r18 ENUMERATED {n1, n2, n3, n4, n6, n8} OPTIONAL, + fr2-r18 ENUMERATED {n1, n2, n4, n8, n12, n16, n24, n32, n48, n64} OPTIONAL + } + } OPTIONAL ]] } @@ -16209,6 +20898,9 @@ MAC-ParametersSidelinkCommon-r16 ::= SEQUENCE { ..., [[ drx-OnSidelink-r17 ENUMERATED {supported} OPTIONAL + ]], + [[ + sl-LBT-FailureDectectionRecovery-r18 ENUMERATED {supported} OPTIONAL ]] } @@ -16304,7 +20996,7 @@ BandSidelink-r16 ::= SEQUENCE { sl-Rx-256QAM-r16 ENUMERATED {supported} OPTIONAL ]], [[ - ue-PowerClassSidelink-r16 ENUMERATED {pc2, pc3, spare6, spare5, spare4, spare3, spare2, spare1} + ue-PowerClassSidelink-r16 ENUMERATED {pc2, pc3, pc5-v1820, spare5, spare4, spare3, spare2, spare1} OPTIONAL ]], [[ @@ -16323,7 +21015,7 @@ BandSidelink-r16 ::= SEQUENCE { } } OPTIONAL, extendedCP-Mode2Random-r17 ENUMERATED {supported} OPTIONAL, - dl-openLoopPC-Sidelink-r17 ENUMERATED {supported} OPTIONAL + dl-openLoopPC-Sidelink-r17 ENUMERATED {supported} OPTIONAL } OPTIONAL, --32-4b sync-Sidelink-v1710 SEQUENCE { @@ -16344,13 +21036,95 @@ BandSidelink-r16 ::= SEQUENCE { rx-IUC-Scheme1-SCI-r17 ENUMERATED {supported} OPTIONAL, --32-6-2 rx-IUC-Scheme1-SCI-ExplicitReq-r17 ENUMERATED {supported} OPTIONAL + ]], + [[ + sharedSpectrumChAccessParamsSidelinkPerBand-r18 SharedSpectrumChAccessParamsSidelinkPerBand-r18 OPTIONAL, + --R1 41-1-1 Common SL-PRS processing capability in a SL BWP + sl-PRS-CommonProcCapabilityPerBand-r18 SEQUENCE { + maxSL-PRS-Bandwidth-r18 CHOICE { + fr1-r18 ENUMERATED {mhz5, mhz10, mhz20, mhz40, mhz50, mhz80, mhz100}, + fr2-r18 ENUMERATED {mhz50, mhz100, mhz200, mhz400} + }, + maxNumOfActiveSL-PRS-ResourcesInOneSlot-r18 CHOICE { + fr1-r18 ENUMERATED {n1, n2, n4, n6, n8, n12, n16, n24}, + fr2-r18 ENUMERATED {n1, n2, n4, n6, n8, n12, n16, n24, n32, n48, n64, n128} + }, + maxNumOfSlotsWithActiveSL-PRS-Resources-r18 CHOICE { + fr1-r18 ENUMERATED {n1, n2, n3, n4, n6, n8}, + fr2-r18 ENUMERATED {n1, n2, n4, n8, n12, n16, n24, n32, n48, n64} + }, + minTimeAfterEndofSlotCarryActiveSL-PRS-Resources-r18 ENUMERATED {ms20, ms30, ms40, ms50, ms80, ms100, ms160} + } OPTIONAL, + + -- R1 41-1-2: Receiving SL-PRS in a shared resource pool + sl-PRS-RxInSharedResourcePool-r18 ENUMERATED {supported} OPTIONAL, + -- R1 41-1-3: Receiving SL-PRS in a dedicated resource pool + sl-PRS-RxInDedicatedResourcePool-r18 SEQUENCE { + numOfSupportedRxPSCCH-PerSlot-r18 ENUMERATED {value1, value2}, + supportedCP-TypeFor60kHzSCS-r18 ENUMERATED {ncp, ncpAndECP} + } OPTIONAL, + -- R1 41-1-4a: Transmitting SL-PRS in a shared resource pool + sl-PRS-TxInSharedResourcePool-r18 ENUMERATED {supported} OPTIONAL, + -- R1 41-1-4b: Transmitting SL-PRS scheme 1 in a dedicated resource pool + sl-PRS-TxScheme1InDedicatedResourcePool-r18 ENUMERATED {supported} OPTIONAL, + -- R1 41-1-4c: Transmitting SL-PRS mode 2 in a dedicated resource pool + sl-PRS-TxScheme2InDedicatedResourcePool-r18 ENUMERATED {supported} OPTIONAL, + -- R1 41-1-5: SL-PRS congestion control in a dedicated resource pool + sl-PRS-CongestionCtrl-r18 ENUMERATED {cpt1, cpt2, cpt3} OPTIONAL, + -- R1 41-1-8: Support of random selection in a dedicated resource pool + sl-PRS-TxRandomSelection-r18 ENUMERATED {supported} OPTIONAL, + -- R1 41-1-10: Support of full sensing in a dedicated resource pool + sl-PRS-TxUsingFullSensing-r18 ENUMERATED {value1, value2} OPTIONAL, + -- R1 41-1-20: Supports SL PRS Rx for a band configured with SL CA + sl-PRS-RxForBandWithSL-CA-r18 ENUMERATED {supported} OPTIONAL, + -- R1 41-1-21: Supports SL PRS Tx for a band configured with SL CA + sl-PRS-TxForBandWithSL-CA-r18 ENUMERATED {supported} OPTIONAL, + -- R1 47-s1: Transmission/Reception using dynamic resource pool sharing + sl-DynamicSharingTxRx-r18 ENUMERATED {supported} OPTIONAL, + -- R1 47-v1: NR SL communication with SL CA + sl-CA-Communication-r18 SEQUENCE { + numberOfCarriers-r18 INTEGER (2..8), + numberOfPSCCH-DecodeValueZ-r18 INTEGER (1..2), + totalBandwidth-r18 ENUMERATED {mhz20,mhz30,mhz40,mhz50,mhz60,mhz70} + } OPTIONAL, + -- R1 47-v2: Synchronization for SL CA + sl-CA-Synchronization-r18 ENUMERATED {supported} OPTIONAL, + -- R1 47-v3: PSFCH for SL CA + sl-CA-PSFCH-r18 SEQUENCE { + rx-PSFCH-Resource-r18 ENUMERATED {n5,n15,n25,n32,n35,n45,n50,n64,n100}, + tx-PSFCH-Resource-r18 ENUMERATED {n4,n8,n16,n24} + } OPTIONAL, + -- R4 45-2: SL reception in intra-carrier guard band + sl-ReceptionIntraCarrierGuardBand-r18 ENUMERATED {supported} OPTIONAL ]] } RelayParameters-r17 ::= SEQUENCE { - relayUE-Operation-L2-r17 ENUMERATED {supported} OPTIONAL, - remoteUE-Operation-L2-r17 ENUMERATED {supported} OPTIONAL, - remoteUE-PathSwitchToIdleInactiveRelay-r17 ENUMERATED {supported} OPTIONAL, + relayUE-Operation-L2-r17 ENUMERATED {supported} OPTIONAL, + remoteUE-Operation-L2-r17 ENUMERATED {supported} OPTIONAL, + remoteUE-PathSwitchToIdleInactiveRelay-r17 ENUMERATED {supported} OPTIONAL, + ..., + [[ + relayUE-U2U-OperationL2-r18 ENUMERATED {supported} OPTIONAL, + remoteUE-U2U-OperationL2-r18 ENUMERATED {supported} OPTIONAL, + remoteUE-U2N-PathSwitchOperationL2-r18 ENUMERATED {supported} OPTIONAL, + multipathRemoteUE-PC5L2-r18 ENUMERATED {supported} OPTIONAL, + multipathRelayUE-N3C-r18 ENUMERATED {supported} OPTIONAL, + multipathRemoteUE-N3C-r18 ENUMERATED {supported} OPTIONAL, + remoteUE-IndirectPathAddChangeToIdleInactiveRelay-r18 ENUMERATED {supported} OPTIONAL, + pdcp-DuplicationMoreThanOneUuRLC-r18 ENUMERATED {supported} OPTIONAL, + pdcp-CADuplicationDirectpath-DRB-r18 ENUMERATED {supported} OPTIONAL, + pdcp-CADuplicationDirectpath-SRB-r18 ENUMERATED {supported} OPTIONAL, + pdcp-DuplicationMP-SplitDRB-r18 ENUMERATED {supported} OPTIONAL, + pdcp-DuplicationMP-SplitSRB-r18 ENUMERATED {supported} OPTIONAL, + directpathRLF-RecoveryViaSRB1-r18 ENUMERATED {supported} OPTIONAL, + splitDRB-WithUL-BothDirectIndirect-r18 ENUMERATED {supported} OPTIONAL + ]] +} + +PDCP-ParametersSidelink-r18 ::= SEQUENCE { + pdcp-DuplicationSRB-sidelink-r18 ENUMERATED {supported} OPTIONAL, + pdcp-DuplicationDRB-sidelink-r18 ENUMERATED {supported} OPTIONAL, ... } @@ -16372,6 +21146,14 @@ SON-Parameters-r16 ::= SEQUENCE { twoStepRACH-Report-r17 ENUMERATED {supported} OPTIONAL, pscell-MHI-Report-r17 ENUMERATED {supported} OPTIONAL, onDemandSI-Report-r17 ENUMERATED {supported} OPTIONAL + ]], + [[ + cef-ReportRedCap-r17 ENUMERATED {supported} OPTIONAL, + rlf-ReportRedCap-r17 ENUMERATED {supported} OPTIONAL + ]], + [[ + spr-Report-r18 ENUMERATED {supported} OPTIONAL, + successIRAT-HO-Report-r18 ENUMERATED {supported} OPTIONAL ]] } @@ -16421,6 +21203,18 @@ SRS-SwitchingTimeEUTRA ::= SEQUENCE { OPTIONAL } -- TAG-SRS-SWITCHINGTIMEEUTRA-STOP +-- TAG-SUPPORTEDAGGBANDWIDTH-START + +SupportedAggBandwidth-r17 ::= CHOICE { + fr1-r17 ENUMERATED {mhz20, mhz30, mhz35, mhz40, mhz50, mhz60, mhz70, mhz80, mhz90, mhz100, mhz110, mhz120, mhz130, mhz140, + mhz150, mhz160, mhz180, mhz200, mhz220, mhz230, mhz250, mhz280, mhz290, mhz300, mhz350, mhz400, mhz450, + mhz500, mhz600, mhz700, mhz800, spare1}, + fr2-r17 ENUMERATED {mhz200, mhz300, mhz400, mhz500, mhz600, mhz700, mhz800, mhz900, mhz1000, mhz1100, mhz1200, mhz1300, mhz1400, + mhz1500, mhz1600, mhz1700, mhz1800, mhz1900, mhz2000, mhz2100, mhz2200, mhz2300, mhz2400, spare9, spare8, + spare7, spare6, spare5, spare4, spare3, spare2, spare1} +} + +-- TAG-SUPPORTEDAGGBANDWIDTH-STOP -- TAG-SUPPORTEDBANDWIDTH-START SupportedBandwidth ::= CHOICE { @@ -16453,6 +21247,10 @@ UE-BasedPerfMeas-Parameters-r16 ::= SEQUENCE { multipleCEF-Report-r17 ENUMERATED {supported} OPTIONAL, excessPacketDelay-r17 ENUMERATED {supported} OPTIONAL, earlyMeasLog-r17 ENUMERATED {supported} OPTIONAL + ]], + [[ + loggedMDT-PNI-NPN-r18 ENUMERATED {supported} OPTIONAL, + loggedMDT-SNPN-r18 ENUMERATED {supported} OPTIONAL ]] } @@ -16501,6 +21299,13 @@ UE-CapabilityRequestFilterCommon ::= SEQUENCE { ]], [[ fallbackGroupFiveRequest-r17 ENUMERATED {true} OPTIONAL -- Need N + ]], + [[ + lowerMSDRequest-r18 SEQUENCE { + pc1dot5-r18 ENUMERATED {true} OPTIONAL, -- Need N + pc2-r18 ENUMERATED {true} OPTIONAL, -- Need N + pc3-r18 ENUMERATED {true} OPTIONAL -- Need N + } OPTIONAL -- Need N ]] } @@ -16510,6 +21315,7 @@ CellGrouping-r16 ::= SEQUENCE { mode-r16 ENUMERATED {sync, async} } + -- TAG-UE-CAPABILITYREQUESTFILTERCOMMON-STOP -- TAG-UE-CAPABILITYREQUESTFILTERNR-START @@ -16569,12 +21375,31 @@ UE-MRDC-Capability-v1700 ::= SEQUENCE { UE-MRDC-Capability-v1730 ::= SEQUENCE { measAndMobParametersMRDC-v1730 MeasAndMobParametersMRDC-v1730 OPTIONAL, + nonCriticalExtension UE-MRDC-Capability-v1800 OPTIONAL +} + +UE-MRDC-Capability-v1800 ::= SEQUENCE { + -- R4 33-2: Support network control of requirementnetwork applicability for UE supporting interBandMRDC-WithOverlapDL-Bands-r16 + requirementTypeIndication-r18 ENUMERATED {supported} OPTIONAL, + measAndMobParametersMRDC-v1810 MeasAndMobParametersMRDC-v1810 OPTIONAL, nonCriticalExtension SEQUENCE {} OPTIONAL } -- Late non-critical extensions: UE-MRDC-Capability-v15g0 ::= SEQUENCE { rf-ParametersMRDC-v15g0 RF-ParametersMRDC-v15g0 OPTIONAL, + nonCriticalExtension UE-MRDC-Capability-v15n0 OPTIONAL +} + +UE-MRDC-Capability-v15n0 ::= SEQUENCE { + rf-ParametersMRDC-v15n0 RF-ParametersMRDC-v15n0 OPTIONAL, +-- Following field is only for REL-15 late non-critical extensions + lateNonCriticalExtension OCTET STRING OPTIONAL, + nonCriticalExtension UE-MRDC-Capability-v16e0 OPTIONAL +} + +UE-MRDC-Capability-v16e0 ::= SEQUENCE { + rf-ParametersMRDC-v16e0 RF-ParametersMRDC-v16e0 OPTIONAL, nonCriticalExtension SEQUENCE {} OPTIONAL } @@ -16775,7 +21600,34 @@ UE-NR-Capability-v1740 ::= SEQUENCE { UE-NR-Capability-v1750 ::= SEQUENCE { crossCarrierSchedulingConfigurationRelease-r17 ENUMERATED {supported} OPTIONAL, - nonCriticalExtension SEQUENCE {} OPTIONAL + nonCriticalExtension UE-NR-Capability-v1800 OPTIONAL +} + +-- Regular non-critical Rel-18 extensions: +UE-NR-Capability-v1800 ::= SEQUENCE { + airToGroundNetwork-r18 ENUMERATED {supported} OPTIONAL, + eRedCapParameters-r18 ERedCapParameters-r18 OPTIONAL, + ncr-Parameters-r18 NCR-Parameters-r18 OPTIONAL, + softSatelliteSwitchResyncNTN-r18 ENUMERATED {supported} OPTIONAL, + hardSatelliteSwitchResyncNTN-r18 ENUMERATED {supported} OPTIONAL, + mt-SDT-r18 ENUMERATED {supported} OPTIONAL, + mt-SDT-NTN-r18 ENUMERATED {supported} OPTIONAL, + inDeviceCoexIndAutonomousDenial-r18 ENUMERATED {supported} OPTIONAL, + inDeviceCoexIndFDM-r18 ENUMERATED {supported} OPTIONAL, + inDeviceCoexIndTDM-r18 ENUMERATED {supported} OPTIONAL, + musim-GapPriorityPreference-r18 ENUMERATED {supported} OPTIONAL, + musim-CapabilityRestriction-r18 ENUMERATED {supported} OPTIONAL, + multiRx-FR2-Preference-r18 ENUMERATED {supported} OPTIONAL, + ra-InsteadCG-SDT-r18 ENUMERATED {supported} OPTIONAL, + resumeAfterSDT-Release-r18 ENUMERATED {supported} OPTIONAL, + ul-TrafficInfo-r18 ENUMERATED {supported} OPTIONAL, + aerialParameters-r18 AerialParameters-r18 OPTIONAL, + --R4 40-2: beam steering + ntn-VSAT-AntennaType-r18 ENUMERATED {electronic, mechanical} OPTIONAL, + --R4 40-1: VSAT UE type in NTN + ntn-VSAT-MobilityType-r18 ENUMERATED {fixed, mobile} OPTIONAL, + ntn-Parameters-v1820 NTN-Parameters-v1820 OPTIONAL, + nonCriticalExtension SEQUENCE{} OPTIONAL } UE-NR-CapabilityAddXDD-Mode ::= SEQUENCE { @@ -16826,140 +21678,51 @@ UE-RadioPagingInfo-r17 ::= SEQUENCE { } -- TAG-UE-RADIOPAGINGINFO-STOP --- TAG-SHAREDSPECTRUMCHACCESSPARAMSPERBAND-START - -SharedSpectrumChAccessParamsPerBand-r16 ::= SEQUENCE { +-- TAG-ABSOLUTETIMEINFO-START - -- R1 10-1: UL channel access for dynamic channel access mode - ul-DynamicChAccess-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-1a: UL channel access for semi-static channel access mode - ul-Semi-StaticChAccess-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-2: SSB-based RRM for dynamic channel access mode - ssb-RRM-DynamicChAccess-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-2a: SSB-based RRM for semi-static channel access mode - ssb-RRM-Semi-StaticChAccess-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-2b: MIB reading on unlicensed cell - mib-Acquisition-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-2c: SSB-based RLM for dynamic channel access mode - ssb-RLM-DynamicChAccess-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-2d: SSB-based RLM for semi-static channel access mode - ssb-RLM-Semi-StaticChAccess-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-2e: SIB1 reception on unlicensed cell - sib1-Acquisition-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-2f: Support monitoring of extended RAR window - extRA-ResponseWindow-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-2g: SSB-based BFD/CBD for dynamic channel access mode - ssb-BFD-CBD-dynamicChannelAccess-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-2h: SSB-based BFD/CBD for semi-static channel access mode - ssb-BFD-CBD-semi-staticChannelAccess-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-2i: CSI-RS-based BFD/CBD for NR-U - csi-RS-BFD-CBD-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-7: UL channel access for 10 MHz SCell - ul-ChannelBW-SCell-10mhz-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-10: RSSI and channel occupancy measurement and reporting - rssi-ChannelOccupancyReporting-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-11:SRS starting position at any OFDM symbol in a slot - srs-StartAnyOFDM-Symbol-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-20: Support search space set configuration with freqMonitorLocation-r16 - searchSpaceFreqMonitorLocation-r16 INTEGER (1..5) OPTIONAL, - -- R1 10-20a: Support coreset configuration with rb-Offset - coreset-RB-Offset-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-23:CGI reading on unlicensed cell for ANR functionality - cgi-Acquisition-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-25: Enable configured UL transmissions when DCI 2_0 is configured but not detected - configuredUL-Tx-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-27: Wideband PRACH - prach-Wideband-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-29: Support available RB set indicator field in DCI 2_0 - dci-AvailableRB-Set-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-30: Support channel occupancy duration indicator field in DCI 2_0 - dci-ChOccupancyDuration-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-8: Type B PDSCH length {3, 5, 6, 8, 9, 10, 11, 12, 13} without DMRS shift due to CRS collision - typeB-PDSCH-length-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-9: Search space set group switching with explicit DCI 2_0 bit field trigger or with implicit PDCCH decoding with DCI 2_0 monitoring - searchSpaceSwitchWithDCI-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-9b: Search space set group switching with implicit PDCCH decoding without DCI 2_0 monitoring - searchSpaceSwitchWithoutDCI-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-9d: Support Search space set group switching capability 2 - searchSpaceSwitchCapability2-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-14: Non-numerical PDSCH to HARQ-ACK timing - non-numericalPDSCH-HARQ-timing-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-15: Enhanced dynamic HARQ codebook - enhancedDynamicHARQ-codebook-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-16: One-shot HARQ ACK feedback - oneShotHARQ-feedback-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-17: Multi-PUSCH UL grant - multiPUSCH-UL-grant-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-26: CSI-RS based RLM for NR-U - csi-RS-RLM-r16 ENUMERATED {supported} OPTIONAL, - dummy ENUMERATED {supported} OPTIONAL, - -- R1 10-31: Support of P/SP-CSI-RS reception with CSI-RS-ValidationWith-DCI-r16 configured - periodicAndSemi-PersistentCSI-RS-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-3: PRB interlace mapping for PUSCH - pusch-PRB-interlace-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-3a: PRB interlace mapping for PUCCH - pucch-F0-F1-PRB-Interlace-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-12: OCC for PRB interlace mapping for PF2 and PF3 - occ-PRB-PF2-PF3-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-13a: Extended CP range of more than one symbol for CG-PUSCH - extCP-rangeCG-PUSCH-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-18: Configured grant with retransmission in CG resources - configuredGrantWithReTx-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-21a: Support using ED threshold given by gNB for UL to DL COT sharing - ed-Threshold-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-21b: Support UL to DL COT sharing - ul-DL-COT-Sharing-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-24: CG-UCI multiplexing with HARQ ACK - mux-CG-UCI-HARQ-ACK-r16 ENUMERATED {supported} OPTIONAL, - -- R1 10-28: Configured grant with Rel-16 enhanced resource configuration - cg-resourceConfig-r16 ENUMERATED {supported} OPTIONAL -} +AbsoluteTimeInfo-r16 ::= BIT STRING (SIZE (48)) -SharedSpectrumChAccessParamsPerBand-v1630 ::= SEQUENCE { - -- R4 4-1: DL reception in intra-carrier guardband - dl-ReceptionIntraCellGuardband-r16 ENUMERATED {supported} OPTIONAL, - -- R4 4-2: DL reception when gNB does not transmit on all RB sets of a carrier as a result of LBT - dl-ReceptionLBT-subsetRB-r16 ENUMERATED {supported} OPTIONAL -} +-- TAG-ABSOLUTETIMEINFO-STOP +-- TAG-APPLAYERIDLEINACTIVECONFIG-START -SharedSpectrumChAccessParamsPerBand-v1640 ::= SEQUENCE { - -- 10-26b(1-4): CSI-RS based RRM measurement with associated SS-block - csi-RSRP-AndRSRQ-MeasWithSSB-r16 ENUMERATED {supported} OPTIONAL, - -- 10-26c(1-5): CSI-RS based RRM measurement without associated SS-block - csi-RSRP-AndRSRQ-MeasWithoutSSB-r16 ENUMERATED {supported} OPTIONAL, - -- 10-26d(1-6): CSI-RS based RS-SINR measurement - csi-SINR-Meas-r16 ENUMERATED {supported} OPTIONAL, - -- 10-26e(1-8): RLM based on a mix of SS block and CSI-RS signals within active BWP - ssb-AndCSI-RS-RLM-r16 ENUMERATED {supported} OPTIONAL, - -- 10-26f(1-9): CSI-RS based contention free RA for HO - csi-RS-CFRA-ForHO-r16 ENUMERATED {supported} OPTIONAL +AppLayerIdleInactiveConfig-r18 ::= SEQUENCE { + measConfigAppLayerId-r18 MeasConfigAppLayerId-r17, + serviceType-r18 ENUMERATED {streaming, mtsi, vr, spare5, spare4, spare3, spare2, spare1} OPTIONAL, -- Need M + appLayerMeasPriority-r18 INTEGER (1..16) OPTIONAL, -- Need M + qoe-Reference-r18 OCTET STRING (SIZE (6)) OPTIONAL, -- Need M + qoe-MeasurementType-r18 ENUMERATED {sbased, mbased} OPTIONAL, -- Need M + qoe-AreaScope-r18 Qoe-AreaScope-r18 OPTIONAL, -- Need M + mce-Id-r18 OCTET STRING (SIZE (1)) OPTIONAL, -- Need M + availableRAN-VisibleMetrics-r18 AvailableRAN-VisibleMetrics-r18 OPTIONAL, -- Need M + ... } -SharedSpectrumChAccessParamsPerBand-v1650 ::= SEQUENCE { - -- Extension of R1 10-9 capability to configure up to 16 instead of 4 cells or cell groups, respectively - extendedSearchSpaceSwitchWithDCI-r16 ENUMERATED {supported} OPTIONAL +Qoe-AreaScope-r18 ::= CHOICE { + cellGlobalIdList CellGlobalIdList-r16, + trackingAreaCodeList TrackingAreaCodeList-r16, + trackingAreaIdentityList TrackingAreaIdentityList-r16, + plmn-IdentityList PLMN-IdentityList2-r16, + ... } -SharedSpectrumChAccessParamsPerBand-v1710 ::= SEQUENCE { - -- R1 25-12: UE initiated semi-static channel occupancy with dependent configurations - ul-Semi-StaticChAccessDependentConfig-r17 ENUMERATED {supported} OPTIONAL, - -- R1 25-13: UE initiated semi-static channel occupancy with independent configurations - ul-Semi-StaticChAccessIndependentConfig-r17 ENUMERATED {supported} OPTIONAL +AvailableRAN-VisibleMetrics-r18 ::= SEQUENCE { + appLayerBufferLevelList-r18 ENUMERATED {true} OPTIONAL, -- Need M + playoutDelayForMediaStartup-r18 ENUMERATED {true} OPTIONAL, -- Need M + ... } --- TAG-SHAREDSPECTRUMCHACCESSPARAMSPERBAND-STOP --- TAG-ABSOLUTETIMEINFO-START - -AbsoluteTimeInfo-r16 ::= BIT STRING (SIZE (48)) - --- TAG-ABSOLUTETIMEINFO-STOP +-- TAG-APPLAYERIDLEINACTIVECONFIG-STOP -- TAG-APPLAYERMEASCONFIG-START AppLayerMeasConfig-r17 ::= SEQUENCE { measConfigAppLayerToAddModList-r17 SEQUENCE (SIZE (1..maxNrofAppLayerMeas-r17)) OF MeasConfigAppLayer-r17 OPTIONAL, -- Need N measConfigAppLayerToReleaseList-r17 SEQUENCE (SIZE (1..maxNrofAppLayerMeas-r17)) OF MeasConfigAppLayerId-r17 OPTIONAL, -- Need N - rrc-SegAllowed-r17 ENUMERATED {enabled} OPTIONAL, -- Need R - ... + rrc-SegAllowedSRB4-r17 ENUMERATED {enabled} OPTIONAL, -- Need R + ..., + [[ + rrc-SegAllowedSRB5-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + idleInactiveReportAllowed-r18 ENUMERATED {enabled} OPTIONAL -- Need R + ]] } MeasConfigAppLayer-r17 ::= SEQUENCE { @@ -16968,15 +21731,23 @@ MeasConfigAppLayer-r17 ::= SEQUENCE { serviceType-r17 ENUMERATED {streaming, mtsi, vr, spare5, spare4, spare3, spare2, spare1} OPTIONAL, -- Need M pauseReporting-r17 BOOLEAN OPTIONAL, -- Need M transmissionOfSessionStartStop-r17 BOOLEAN OPTIONAL, -- Need M - ran-VisibleParameters-r17 CHOICE {release NULL, setup RAN-VisibleParameters-r17} OPTIONAL, -- Cond ServiceType - ... + ran-VisibleParameters-r17 CHOICE {release NULL, setup RAN-VisibleParameters-r17} OPTIONAL, -- Cond ServiceType + ..., + [[ + reportingSRB-r18 ENUMERATED {srb4, srb5} OPTIONAL, -- Cond QoENRDC + appLayerMeasPriority-r18 INTEGER (1..16) OPTIONAL, -- Cond Need M + appLayerIdleInactiveConfig-r18 CHOICE {release NULL, setup AppLayerIdleInactiveConfig-r18} OPTIONAL -- Need M + ]] } RAN-VisibleParameters-r17 ::= SEQUENCE { ran-VisiblePeriodicity-r17 ENUMERATED {ms120, ms240, ms480, ms640, ms1024} OPTIONAL, -- Need S numberOfBufferLevelEntries-r17 INTEGER (1..8) OPTIONAL, -- Need R reportPlayoutDelayForMediaStartup-r17 BOOLEAN OPTIONAL, -- Need M - ... + ..., + [[ + ran-VisibleReportingSRB-r18 ENUMERATED {srb4, srb5} OPTIONAL -- Cond QoENRDC + ]] } -- TAG-APPLAYERMEASCONFIG-STOP @@ -16987,12 +21758,17 @@ AreaConfiguration-r16 ::= SEQUENCE { interFreqTargetList-r16 SEQUENCE(SIZE (1..maxFreq)) OF InterFreqTargetInfo-r16 OPTIONAL -- Need R } -AreaConfiguration-v1700 ::= SEQUENCE { +AreaConfiguration-r17 ::= SEQUENCE { areaConfig-r17 AreaConfig-r16 OPTIONAL, -- Need R interFreqTargetList-r17 SEQUENCE(SIZE (1..maxFreq)) OF InterFreqTargetInfo-r16 OPTIONAL -- Need R } -AreaConfig-r16 ::= CHOICE { +AreaConfiguration-v1800 ::= CHOICE { + cag-ConfigList-r18 CAG-ConfigList-r18, + snpn-ConfigList-r18 SNPN-ConfigList-r18 +} + +AreaConfig-r16 ::= CHOICE { cellGlobalIdList-r16 CellGlobalIdList-r16, trackingAreaCodeList-r16 TrackingAreaCodeList-r16, trackingAreaIdentityList-r16 TrackingAreaIdentityList-r16 @@ -17000,7 +21776,7 @@ AreaConfig-r16 ::= CHOICE { InterFreqTargetInfo-r16 ::= SEQUENCE { dl-CarrierFreq-r16 ARFCN-ValueNR, - cellList-r16 SEQUENCE (SIZE (1..32)) OF PhysCellId OPTIONAL -- Need R + cellList-r16 SEQUENCE (SIZE (1..32)) OF PhysCellId OPTIONAL -- Need R } CellGlobalIdList-r16 ::= SEQUENCE (SIZE (1..32)) OF CGI-Info-Logging-r16 @@ -17013,6 +21789,39 @@ TrackingAreaIdentity-r16 ::= SEQUENCE { plmn-Identity-r16 PLMN-Identity, trackingAreaCode-r16 TrackingAreaCode } +CAG-ConfigList-r18 ::= SEQUENCE (SIZE (1..maxNPN-r16)) OF CAG-Config-r18 + +CAG-Config-r18 ::= SEQUENCE { + plmn-Identity-r18 PLMN-Identity, + cag-IdentityList-r18 SEQUENCE (SIZE (1..maxNPN-r16)) OF BIT STRING (SIZE (32)) +} + +SNPN-ConfigList-r18 ::= CHOICE { + snpn-ConfigCellIdList-r18 SNPN-ConfigCellIdList-r18, + snpn-ConfigTAI-List-r18 SNPN-ConfigTAI-List-r18, + snpn-ConfigID-List-r18 SNPN-ConfigID-List-r18 +} + +SNPN-ConfigCellIdList-r18 ::= SEQUENCE (SIZE (1..maxSNPN-ConfigCellId-r18)) OF SNPN-ConfigCellId-r18 + +SNPN-ConfigCellId-r18 ::= SEQUENCE { + cgi-Identity-r18 CGI-Info-Logging-r16, + nid-IdentityList-r18 SEQUENCE (SIZE (1..maxNPN-r16)) OF NID-r16 +} + +SNPN-ConfigTAI-List-r18 ::= SEQUENCE (SIZE (1..maxSNPN-ConfigTAI-r18)) OF SNPN-ConfigTAI-r18 + +SNPN-ConfigTAI-r18 ::= SEQUENCE { + tai-Identity-r18 TrackingAreaIdentity-r16, + nid-IdentityList-r18 SEQUENCE (SIZE (1..maxNPN-r16)) OF NID-r16 +} + +SNPN-ConfigID-List-r18 ::= SEQUENCE (SIZE (1..maxSNPN-ConfigID-r18)) OF SNPN-ConfigID-r18 + +SNPN-ConfigID-r18 ::= SEQUENCE { + plmn-Identity-r18 PLMN-Identity, + nid-IdentityList-r18 SEQUENCE (SIZE (1..maxNPN-r16)) OF NID-r16 +} -- TAG-AREACONFIGURATION-STOP -- TAG-BTNAMELIST-START @@ -17061,6 +21870,16 @@ EUTRA-MultiBandInfo ::= SEQUENCE { } -- TAG-EUTRA-MULTIBANDINFOLIST-STOP +-- TAG-EUTRA-MULTIBANDINFOLISTAERIAL-START + +EUTRA-MultiBandInfoListAerial-r18 ::= SEQUENCE (SIZE (1..maxMultiBands)) OF EUTRA-MultiBandInfoAerial-r18 + +EUTRA-MultiBandInfoAerial-r18 ::= SEQUENCE { + eutra-FreqBandIndicator-r18 FreqBandIndicatorEUTRA, + eutra-NS-PmaxListAerial-r18 EUTRA-NS-PmaxList OPTIONAL -- Need R +} + +-- TAG-EUTRA-MULTIBANDINFOLISTAERIAL-STOP -- TAG-EUTRA-NS-PMAXLIST-START EUTRA-NS-PmaxList ::= SEQUENCE (SIZE (1..maxEUTRA-NS-Pmax)) OF EUTRA-NS-PmaxValue @@ -17230,6 +22049,29 @@ OtherConfig-v1700 ::= SEQUENCE { propDelayDiffReportConfig-r17 CHOICE {release NULL, setup PropDelayDiffReportConfig-r17} OPTIONAL -- Need M } +OtherConfig-v1800 ::= SEQUENCE { + idc-AssistanceConfig-v1800 CHOICE {release NULL, setup IDC-AssistanceConfig-v1800} OPTIONAL, -- Need M + multiRx-PreferenceReportingConfigFR2-r18 CHOICE {release NULL, setup MultiRx-PreferenceReportingConfigFR2-r18} OPTIONAL, -- Need M + aerial-FlightPathAvailabilityConfig-r18 ENUMERATED {true} OPTIONAL, -- Need R + ul-TrafficInfoReportingConfig-r18 CHOICE {release NULL, setup UL-TrafficInfoReportingConfig-r18} OPTIONAL, -- Need M + n3c-RelayUE-InfoReportConfig-r18 ENUMERATED {true} OPTIONAL, -- Need R + successPSCell-Config-r18 CHOICE {release NULL, setup SuccessPSCell-Config-r18} OPTIONAL, -- Need M + sn-InitiatedPSCellChange-r18 ENUMERATED {true} OPTIONAL, -- Need R + musim-GapPriorityAssistanceConfig-r18 ENUMERATED {true} OPTIONAL, -- Cond musimGapConfig + musim-CapabilityRestrictionConfig-r18 CHOICE {release NULL, setup MUSIM-CapabilityRestrictionConfig-r18} OPTIONAL -- Need M +} + +IDC-AssistanceConfig-v1800 ::= SEQUENCE { + idc-FDM-AssistanceConfig-r18 CHOICE {release NULL, setup IDC-FDM-AssistanceConfig-r18} OPTIONAL, -- Need M + idc-TDM-AssistanceConfig-r18 ENUMERATED {setup} OPTIONAL -- Cond FDM +} + +MultiRx-PreferenceReportingConfigFR2-r18 ::= SEQUENCE { + multiRx-PreferenceReportingConfigFR2ProhibitTimer-r18 ENUMERATED { + s0, s0dot5, s1, s2, s3, s4, s5, s6, s7, + s8, s9, s10, s20, s30, spare2, spare1} +} + CandidateServingFreqListNR-r16 ::= SEQUENCE (SIZE (1..maxFreqIDC-r16)) OF ARFCN-ValueNR MUSIM-GapAssistanceConfig-r17 ::= SEQUENCE { @@ -17240,6 +22082,15 @@ MUSIM-LeaveAssistanceConfig-r17 ::= SEQUENCE { musim-LeaveWithoutResponseTimer-r17 ENUMERATED {ms10, ms20, ms40, ms60, ms80, ms100, spare2, spare1} } +MUSIM-CapabilityRestrictionConfig-r18 ::= SEQUENCE { + musim-CandidateBandList-r18 MUSIM-CandidateBandList-r18 OPTIONAL, -- Need M + musim-WaitTimer-r18 ENUMERATED {ms10, ms20, ms40, ms60, ms80, ms100, spare2, spare1}, + musim-ProhibitTimer-r18 ENUMERATED {s0, s0dot1, s0dot2, s0dot3, s0dot4, s0dot5, s1, s2, s3, s4, s5, s6, s7, s8, + s9, s10} +} + +MUSIM-CandidateBandList-r18::= SEQUENCE (SIZE (1..maxCandidateBandIndex-r18)) OF FreqBandIndicatorNR + SuccessHO-Config-r17 ::= SEQUENCE { thresholdPercentageT304-r17 ENUMERATED {p40, p60, p80, spare5, spare4, spare3, spare2, spare1} OPTIONAL, --Need R thresholdPercentageT310-r17 ENUMERATED {p40, p60, p80, spare5, spare4, spare3, spare2, spare1} OPTIONAL, --Need R @@ -17248,6 +22099,14 @@ SuccessHO-Config-r17 ::= SEQUENCE { ... } +SuccessPSCell-Config-r18 ::= SEQUENCE { + thresholdPercentageT304-SCG-r18 ENUMERATED {p40, p60, p80, spare5, spare4, spare3, spare2, spare1} OPTIONAL, --Need R + thresholdPercentageT310-SCG-r18 ENUMERATED {p40, p60, p80, spare5, spare4, spare3, spare2, spare1} OPTIONAL, --Need R + thresholdPercentageT312-SCG-r18 ENUMERATED {p20, p40, p60, p80, spare4, spare3, spare2, spare1} OPTIONAL, --Need R + ... +} + + OverheatingAssistanceConfig ::= SEQUENCE { overheatingIndicationProhibitTimer ENUMERATED {s0, s0dot5, s1, s2, s5, s10, s20, s30, s60, s90, s120, s300, s600, spare3, spare2, spare1} @@ -17328,6 +22187,32 @@ epochTime-r17 EpochTime-r17, ephemerisInfo-r17 EphemerisInfo-r17 } +IDC-FDM-AssistanceConfig-r18 ::= SEQUENCE { + candidateServingFreqRangeListNR-r18 CandidateServingFreqRangeListNR-r18 OPTIONAL, -- Need R + ... +} + +CandidateServingFreqRangeListNR-r18 ::= SEQUENCE (SIZE (1..maxFreqIDC-r16)) OF CandidateServingFreqRangeNR-r18 + +CandidateServingFreqRangeNR-r18 ::= SEQUENCE { + candidateCenterFreq-r18 ARFCN-ValueNR, + candidateBandwidth-r18 ENUMERATED {khz200, khz400, khz600, khz800, mhz1, mhz2, mhz3, mhz4, mhz5, + mhz6, mhz8, mhz10, mhz20, mhz30, mhz40, mhz50, mhz60, mhz80, mhz100, + mhz200, mhz300, mhz400} OPTIONAL -- Need R +} + +UL-TrafficInfoReportingConfig-r18 ::= SEQUENCE { + pdu-SessionsToReportUL-TrafficInfoList-r18 SEQUENCE (SIZE (1.. maxNrofPDU-Sessions-r17)) OF PDU-SessionToReportUL-TrafficInfo-r18, + ul-TrafficInfoProhibitTimer-r18 ENUMERATED {s0, s0dot5, s1, s2, s5, s10, s20, s30, + s60, s90, s120, s300, s600, spare3, spare2, spare1} +} + + +PDU-SessionToReportUL-TrafficInfo-r18 ::= SEQUENCE { + pdu-SessionID PDU-SessionID, + qfi-ToReportUL-TrafficInfoList-r18 SEQUENCE (SIZE (1..maxNrofQFIs)) OF QFI +} + -- TAG-OTHERCONFIG-STOP -- TAG-PHYSCELLIDUTRA-FDD-START @@ -17368,7 +22253,11 @@ UE-MeasurementsAvailable-r16 ::= SEQUENCE { [[ successHO-InfoAvailable-r17 ENUMERATED {true} OPTIONAL, sigLogMeasConfigAvailable-r17 BOOLEAN OPTIONAL + ]], + [[ + successPSCell-InfoAvailable-r18 ENUMERATED {true} OPTIONAL ]] + } -- TAG-UE-MeasurementsAvailable-STOP @@ -17432,12 +22321,16 @@ WLAN-Name-r16 ::= OCTET STRING (SIZE (1..32)) SL-BWP-Config-r16 ::= SEQUENCE { sl-BWP-Id BWP-Id, - sl-BWP-Generic-r16 SL-BWP-Generic-r16 OPTIONAL, -- Need M - sl-BWP-PoolConfig-r16 SL-BWP-PoolConfig-r16 OPTIONAL, -- Need M + sl-BWP-Generic-r16 SL-BWP-Generic-r16 OPTIONAL, -- Need M + sl-BWP-PoolConfig-r16 SL-BWP-PoolConfig-r16 OPTIONAL, -- Need M ..., [[ - sl-BWP-PoolConfigPS-r17 CHOICE {release NULL, setup SL-BWP-PoolConfig-r16} OPTIONAL, -- Need M - sl-BWP-DiscPoolConfig-r17 CHOICE {release NULL, setup SL-BWP-DiscPoolConfig-r17} OPTIONAL -- Need M + sl-BWP-PoolConfigPS-r17 CHOICE {release NULL, setup SL-BWP-PoolConfig-r16} OPTIONAL, -- Need M + sl-BWP-DiscPoolConfig-r17 CHOICE {release NULL, setup SL-BWP-DiscPoolConfig-r17} OPTIONAL -- Need M + ]], + [[ + sl-BWP-PoolConfigA2X-r18 CHOICE {release NULL, setup SL-BWP-PoolConfig-r16} OPTIONAL, -- Need M + sl-BWP-PRS-PoolConfig-r18 CHOICE {release NULL, setup SL-BWP-PRS-PoolConfig-r18} OPTIONAL -- Need M ]] } @@ -17447,19 +22340,40 @@ SL-BWP-Generic-r16 ::= SEQUENCE { sl-StartSymbol-r16 ENUMERATED {sym0, sym1, sym2, sym3, sym4, sym5, sym6, sym7} OPTIONAL, -- Need M sl-PSBCH-Config-r16 CHOICE {release NULL, setup SL-PSBCH-Config-r16} OPTIONAL, -- Need M sl-TxDirectCurrentLocation-r16 INTEGER (0..3301) OPTIONAL, -- Need M - ... + ..., + [[ + sl-Unlicensed-r18 CHOICE {release NULL, setup SL-Unlicensed-r18 } OPTIONAL -- Need M + ]] +} + +SL-Unlicensed-r18 ::= SEQUENCE { + sl-LBT-FailureRecoveryConfig-r18 CHOICE {release NULL, setup SL-LBT-FailureRecoveryConfig-r18 } OPTIONAL, -- Need M + sl-StartingSymbolFirst-r18 ENUMERATED {sym0, sym1, sym2, sym3, sym4, sym5, sym6} OPTIONAL, -- Need M + sl-StartingSymbolSecond-r18 ENUMERATED {sym3, sym4, sym5, sym6, sym7} OPTIONAL, -- Need M + sl-TransmissionStructureForPSCCHandPSSCH-r18 ENUMERATED {contiguousRB, interlaceRB} OPTIONAL, -- Need M + sl-GapOfAdditionalSSSB-Occasion-r18 INTEGER (0..639) OPTIONAL, -- Need M + sl-AbsoluteFrequencySSB-NonAnchorList-r18 SEQUENCE (SIZE (1.. maxSL-NonAnchorRBsets)) OF ARFCN-ValueNR OPTIONAL, -- Need M + sl-CPE-StartingPositionS-SSB-r18 INTEGER (1..9) OPTIONAL, -- Need M + sl-CWS-ForPsschWithoutHarqAck-r18 ENUMERATED {t1, t8, t16, t32, infinity} OPTIONAL, -- Need M + sl-NumOfAdditionalSSSBOccasion-r18 INTEGER (0..4) OPTIONAL, -- Need M + sl-SSSBPowerOffsetOfAnchorRBSet-r18 ENUMERATED {value1, value2} OPTIONAL, -- Need M + sl-RBSetConfigList-r18 SEQUENCE (SIZE (1..5)) OF SL-RBSetConfig-r18 OPTIONAL, -- Need M + sl-IntraCellGuardBandsSL-List-r18 SEQUENCE (SIZE (1..maxSCSs)) OF IntraCellGuardBandsPerSCS-r16 OPTIONAL -- Need M } -- TAG-SL-BWP-CONFIG-STOP -- TAG-SL-BWP-CONFIGCOMMON-START SL-BWP-ConfigCommon-r16 ::= SEQUENCE { - sl-BWP-Generic-r16 SL-BWP-Generic-r16 OPTIONAL, -- Need R - sl-BWP-PoolConfigCommon-r16 SL-BWP-PoolConfigCommon-r16 OPTIONAL, -- Need R + sl-BWP-Generic-r16 SL-BWP-Generic-r16 OPTIONAL, -- Need R + sl-BWP-PoolConfigCommon-r16 SL-BWP-PoolConfigCommon-r16 OPTIONAL, -- Need R ..., [[ - sl-BWP-PoolConfigCommonPS-r17 SL-BWP-PoolConfigCommon-r16 OPTIONAL, -- Need R - sl-BWP-DiscPoolConfigCommon-r17 SL-BWP-DiscPoolConfigCommon-r17 OPTIONAL -- Need R + sl-BWP-PoolConfigCommonPS-r17 SL-BWP-PoolConfigCommon-r16 OPTIONAL, -- Need R + sl-BWP-DiscPoolConfigCommon-r17 SL-BWP-DiscPoolConfigCommon-r17 OPTIONAL -- Need R + ]], + [[ + sl-BWP-PoolConfigCommonA2X-r18 SL-BWP-PoolConfigCommon-r16 OPTIONAL -- Need R ]] } @@ -17513,6 +22427,38 @@ SL-BWP-PoolConfigCommon-r16 ::= SEQUENCE { } -- TAG-SL-BWP-POOLCONFIGCOMMON-STOP +-- TAG-SL-BWP-PRS-POOLCONFIG-START + +SL-BWP-PRS-PoolConfig-r18 ::= SEQUENCE { + sl-PRS-RxPool-r18 SEQUENCE (SIZE (1..maxNrofRXPool-r16)) OF SL-PRS-ResourcePool-r18 OPTIONAL, -- Cond HO + sl-PRS-TxPoolSelectedNormal-r18 SL-PRS-TxPoolDedicated-r18 OPTIONAL, -- Need M + sl-PRS-TxPoolScheduling-r18 SL-PRS-TxPoolDedicated-r18 OPTIONAL, -- Need M + sl-PRS-TxPoolExceptional-r18 SL-PRS-ResourcePoolConfig-r18 OPTIONAL -- Need R +} + +SL-PRS-TxPoolDedicated-r18 ::= SEQUENCE { + sl-PRS-PoolToReleaseList-r1 SEQUENCE (SIZE (1..maxNrofSL-PRS-TxPool-r18)) OF SL-PRS-ResourcePoolID-r18 OPTIONAL, -- Need N + sl-PRS-PoolToAddModList-r18 SEQUENCE (SIZE (1..maxNrofSL-PRS-TxPool-r18)) OF SL-PRS-ResourcePoolConfig-r18 OPTIONAL -- Need N +} + +SL-PRS-ResourcePoolConfig-r18 ::= SEQUENCE { + sl-PRS-ResourcePoolID-r18 SL-PRS-ResourcePoolID-r18, + sl-PRS-ResourcePool-r18 SL-PRS-ResourcePool-r18 OPTIONAL -- Need M +} + +SL-PRS-ResourcePoolID-r18 ::= INTEGER (1.. maxNrofSL-PRS-TxPool-r18) + +-- TAG-SL-BWP-PRS-POOLCONFIG-STOP +-- TAG-SL-BWP-PRS-POOLCONFIGCOMMON-START + +SL-BWP-PRS-PoolConfigCommon-r18 ::= SEQUENCE { + sl-PRS-RxPool-r18 SEQUENCE (SIZE (1..maxNrofRXPool-r16)) OF SL-PRS-ResourcePool-r18 OPTIONAL, -- Need R + sl-PRS-TxPoolSelectedNormal-r18 SEQUENCE (SIZE (1..maxNrofSL-PRS-TxPool-r18)) OF SL-PRS-ResourcePoolConfig-r18 OPTIONAL, -- Need R + sl-PRS-TxPoolExceptional-r18 SL-PRS-ResourcePoolConfig-r18 OPTIONAL, -- Need R + ... +} + +-- TAG-SL-BWP-PRSPOOLCONFIGCOMMON-STOP -- TAG-SL-CBR-PRIORITYTXCONFIGLIST-START SL-CBR-PriorityTxConfigList-r16 ::= SEQUENCE (SIZE (1..8)) OF SL-PriorityTxConfigIndex-r16 @@ -17550,6 +22496,26 @@ SL-CBR-PSSCH-TxConfig-r16 ::= SEQUENCE { SL-CBR-r16 ::= INTEGER (0..100) -- TAG-SL-CBR-COMMONTXCONFIGLIST-STOP +-- TAG- SL-CBR-COMMONTXDEDICATEDSL-PRS-RP-LIST-START + +SL-CBR-CommonTxDedicatedSL-PRS-RP-List-r18 ::= SEQUENCE { + sl-CBR-RangeDedicatedSL-PRS-RP-List-r18 SEQUENCE (SIZE (1..maxCBR-ConfigDedSL-PRS-1-r18)) OF SL-CBR-LevelsDedicatedSL-PRS-RP-r18 + OPTIONAL, -- Need M + sl-CBR-SL-PRS-TxConfigList-r18 SEQUENCE (SIZE (1.. maxNrofSL-PRS-TxConfig-r18)) OF SL-CBR-SL-PRS-TxConfig-r18 + OPTIONAL -- Need M +} + +SL-CBR-LevelsDedicatedSL-PRS-RP-r18 ::= SEQUENCE (SIZE (0..maxCBR-LevelDedSL-PRS-1-r18)) OF SL-CBR-Dedicated-SL-PRS-RP-r18 + +SL-CBR-SL-PRS-TxConfig-r18 ::= SEQUENCE { + sl-PRS-CR-Limit-r18 INTEGER(0..10000) OPTIONAL, -- Need M + sl-PRS-MaxTx-power-r18 INTEGER (-30..33) OPTIONAL, -- Need M + sl-PRS-MaxNum-Transmissions-r18 INTEGER(1..32) OPTIONAL -- Need M +} + +SL-CBR-Dedicated-SL-PRS-RP-r18 ::= INTEGER (0..100) + +-- TAG-SL-CBR-COMMONTXDEDICATEDSL-PRS-RP-LIST-STOP -- TAG-SL-CONFIGDEDICATEDNR-START SL-ConfigDedicatedNR-r16 ::= SEQUENCE { @@ -17563,6 +22529,9 @@ SL-ConfigDedicatedNR-r16 ::= SEQUENCE { [[ sl-PHY-MAC-RLC-Config-v1700 CHOICE {release NULL, setup SL-PHY-MAC-RLC-Config-v1700 } OPTIONAL, -- Need M sl-DiscConfig-r17 CHOICE {release NULL, setup SL-DiscConfig-r17} OPTIONAL -- Need M + ]], + [[ + sl-DiscConfig-v1800 SL-DiscConfig-v1800 OPTIONAL -- Need M ]] } @@ -17589,9 +22558,20 @@ SL-PHY-MAC-RLC-Config-v1700 ::= SEQUENCE { sl-DRX-Config-r17 SL-DRX-Config-r17 OPTIONAL, -- Need M sl-RLC-ChannelToReleaseList-r17 SEQUENCE (SIZE (1..maxSL-LCID-r16)) OF SL-RLC-ChannelID-r17 OPTIONAL, -- Cond L2U2N -- WS modification: define a dedicated type --- sl-RLC-ChannelToAddModList-r17 SEQUENCE (SIZE (1..maxSL-LCID-r16)) OF SL-RLC-ChannelConfig-r17 OPTIONAL, -- -- Cond L2U2N +-- sl-RLC-ChannelToAddModList-r17 SEQUENCE (SIZE (1..maxSL-LCID-r16)) OF SL-RLC-ChannelConfig-r17 OPTIONAL, Cond L2U2N sl-RLC-ChannelToAddModList-r17 SL-RLC-ChannelToAddModList-r17 OPTIONAL, -- Cond L2U2N - ... + ..., + [[ + sl-RLC-BearerToAddModListSizeExt-v1800 SEQUENCE (SIZE (1..maxSL-LCID-r16)) OF SL-RLC-BearerConfig-r16 OPTIONAL, -- Need N + sl-RLC-BearerToReleaseListSizeExt-v1800 SEQUENCE (SIZE (1..maxSL-LCID-r16)) OF SL-RLC-BearerConfigIndex-v1800 OPTIONAL, -- Need N + sl-FreqInfoToAddModListExt-v1800 SEQUENCE (SIZE (1..maxNrofFreqSL-r16)) OF SL-FreqConfigExt-v1800 OPTIONAL, -- Need N + sl-LBT-SchedulingRequestId-r18 CHOICE {release NULL, setup SchedulingRequestId} OPTIONAL, -- Need M + sl-SyncFreqList-r18 SEQUENCE (SIZE (1..maxNrofFreqSL-r16)) OF SL-Freq-Id-r16 OPTIONAL, -- Need M + sl-SyncTxMultiFreq-r18 ENUMERATED {true} OPTIONAL, -- Need R + sl-MaxTransPowerCA-r18 P-Max OPTIONAL, -- Need R + sl-SCCH-CarrierSetConfig-r18 CHOICE {release NULL, setup SL-SCCH-CarrierSetConfigList-r18} OPTIONAL, -- Need M + sl-PRS-SchedulingRequestId-r18 CHOICE {release NULL, setup SchedulingRequestId} OPTIONAL -- Need M + ]] } SL-DiscConfig-r17::= SEQUENCE { @@ -17599,6 +22579,20 @@ SL-DiscConfig-r17::= SEQUENCE { sl-RemoteUE-Config-r17 CHOICE {release NULL, setup SL-RemoteUE-Config-r17} OPTIONAL -- Cond L2RemoteUE } +SL-DiscConfig-v1800 ::= SEQUENCE { + sl-RelayUE-ConfigU2U-r18 CHOICE {release NULL, setup SL-RelayUE-ConfigU2U-r18} OPTIONAL, -- Cond U2URelayUE + sl-RemoteUE-ConfigU2U-r18 CHOICE {release NULL, setup SL-RemoteUE-ConfigU2U-r18} OPTIONAL -- Cond U2URemoteUE +} + +SL-SCCH-CarrierSetConfigList-r18 ::= SEQUENCE (SIZE (1..maxNrofSL-CarrierSetConfig-r18)) OF SL-SCCH-CarrierSetConfig-r18 + +SL-SCCH-CarrierSetConfig-r18 ::= SEQUENCE { + sl-DestinationList-r18 SEQUENCE (SIZE (1..maxNrofSL-Dest-r16)) OF SL-DestinationIdentity-r16, + sl-SRB-Identity-r18 SEQUENCE (SIZE (1..3)) OF SRB-Identity, + sl-AllowedCarrierFreqSet1-r18 SEQUENCE (SIZE (1..maxNrofFreqSL-r16)) OF INTEGER (1..maxNrofFreqSL-r16), + sl-AllowedCarrierFreqSet2-r18 SEQUENCE (SIZE (1..maxNrofFreqSL-r16)) OF INTEGER (1..maxNrofFreqSL-r16) +} + -- TAG-SL-CONFIGDEDICATEDNR-STOP -- TAG-SL-CONFIGUREDGRANTCONFIG-START @@ -17621,6 +22615,9 @@ SL-ConfiguredGrantConfig-r16 ::= SEQUENCE { ..., [[ sl-N1PUCCH-AN-Type2-r16 PUCCH-ResourceId OPTIONAL -- Need M + ]], + [[ + sl-StartRBsetCG-Type1-r18 INTEGER (0..4) OPTIONAL -- Need M ]] } @@ -17640,6 +22637,22 @@ SL-PeriodCG-r16 ::= CHOICE{ } -- TAG-SL-CONFIGUREDGRANTCONFIG-STOP +-- TAG-SL-CONFIGUREDGRANTCONFIGDEDICATEDSL-PRS-RP-START + +SL-ConfiguredGrantConfigDedicatedSL-PRS-RP-r18 ::= SEQUENCE { + sl-PRS-ConfigIndexCG-r18 SL-ConfigIndexCG-r16, + sl-PRS-PeriodCG-r18 SL-PeriodCG-r16 OPTIONAL, -- Need M + sl-PRS-ResourcePoolID-r18 SL-ResourcePoolID-r16 OPTIONAL, -- Need M + rrc-ConfiguredSidelinkGrantDedicated-SL-PRS-RP-r18 SEQUENCE { + sl-TimeOffsetCG-Type1-r18 INTEGER (0..7999) OPTIONAL, -- Need R + sl-TimeReferenceSFN-Type1-r18 ENUMERATED {sfn512} OPTIONAL, -- Need S + sl-TimeResourceCG-Type1-r18 INTEGER (0..496) OPTIONAL, -- Need M + sl-PRS-ResourceIndicationFirstType1-r18 INTEGER(0..11) OPTIONAL, -- Need M + sl-PRS-ResourceIndicationFutureType1-r18 INTEGER(0..143) OPTIONAL -- Need M + } +} + +-- TAG-SL-CONFIGUREDGRANTCONFIGDEDICATEDSL-PRS-RP-STOP -- TAG-SL-DESTINATIONIDENTITY-START SL-DestinationIdentity-r16 ::= BIT STRING (SIZE (24)) @@ -17799,22 +22812,69 @@ SL-FreqConfig-r16 ::= SEQUENCE { SL-Freq-Id-r16 ::= INTEGER (1.. maxNrofFreqSL-r16) +SL-FreqConfigExt-v1800 ::= SEQUENCE { + absenceOfAnyOtherTechnology-r18 ENUMERATED {true} OPTIONAL, -- Need M + sl-FreqSelectionConfigList-r18 SEQUENCE (SIZE (1..8)) OF SL-FreqSelectionConfig-r18 OPTIONAL, -- Need M + sl-SyncTxDisabled-r18 ENUMERATED {true} OPTIONAL, -- Need M + sl-EnergyDetectionConfig-r18 CHOICE { + sl-MaxEnergyDetectionThreshold-r18 INTEGER (-85..-52), + sl-EnergyDetectionThresholdOffset-r18 INTEGER (-13..20) + } OPTIONAL, -- Need M + ue-ToUE-COT-SharingED-Threshold-r18 INTEGER (-85..-52) OPTIONAL, -- Need M + harq-ACK-FeedbackRatioforCW-AdjustmentGC-Option2-r18 INTEGER (10..100) OPTIONAL, -- Need M + ... +} + -- TAG-SL-FREQCONFIG-STOP -- TAG-SL-FREQCONFIGCOMMON-START -SL-FreqConfigCommon-r16 ::= SEQUENCE { - sl-SCS-SpecificCarrierList-r16 SEQUENCE (SIZE (1..maxSCSs)) OF SCS-SpecificCarrier, - sl-AbsoluteFrequencyPointA-r16 ARFCN-ValueNR, - sl-AbsoluteFrequencySSB-r16 ARFCN-ValueNR OPTIONAL, -- Need R - frequencyShift7p5khzSL-r16 ENUMERATED {true} OPTIONAL, -- Cond V2X-SL-Shared - valueN-r16 INTEGER (-1..1), - sl-BWP-List-r16 SEQUENCE (SIZE (1..maxNrofSL-BWPs-r16)) OF SL-BWP-ConfigCommon-r16 OPTIONAL, -- Need R - sl-SyncPriority-r16 ENUMERATED {gnss, gnbEnb} OPTIONAL, -- Need R - sl-NbAsSync-r16 BOOLEAN OPTIONAL, -- Need R - sl-SyncConfigList-r16 SL-SyncConfigList-r16 OPTIONAL, -- Need R - ... +SL-FreqConfigCommon-r16 ::= SEQUENCE { + sl-SCS-SpecificCarrierList-r16 SEQUENCE (SIZE (1..maxSCSs)) OF SCS-SpecificCarrier, + sl-AbsoluteFrequencyPointA-r16 ARFCN-ValueNR, + sl-AbsoluteFrequencySSB-r16 ARFCN-ValueNR OPTIONAL, -- Need R + frequencyShift7p5khzSL-r16 ENUMERATED {true} OPTIONAL, -- Cond V2X-SL-Shared + valueN-r16 INTEGER (-1..1), + sl-BWP-List-r16 SEQUENCE (SIZE (1..maxNrofSL-BWPs-r16)) OF SL-BWP-ConfigCommon-r16 OPTIONAL, -- Need R + sl-SyncPriority-r16 ENUMERATED {gnss, gnbEnb} OPTIONAL, -- Need R + sl-NbAsSync-r16 BOOLEAN OPTIONAL, -- Need R + sl-SyncConfigList-r16 SL-SyncConfigList-r16 OPTIONAL, -- Need R + ..., + [[ + sl-UnlicensedFreqConfigCommon-r18 SEQUENCE { + absenceOfAnyOtherTechnology-r18 ENUMERATED {true} OPTIONAL, -- Need R + sl-FreqSelectionConfigList-r18 SEQUENCE (SIZE (1..8)) OF SL-FreqSelectionConfig-r18 OPTIONAL, -- Need R + sl-SyncTxDisabled-r18 ENUMERATED {true} OPTIONAL, -- Need R + sl-EnergyDetectionConfig-r18 CHOICE { + sl-MaxEnergyDetectionThreshold-r18 INTEGER (-85..-52), + sl-EnergyDetectionThresholdOffset-r18 INTEGER (-13..20) + } OPTIONAL, -- Need R + ue-ToUE-COT-SharingED-Threshold-r18 INTEGER (-85..-52) OPTIONAL, -- Need R + harq-ACK-FeedbackRatioforCW-AdjustmentGC-Option2-r18 INTEGER (10..100) OPTIONAL -- Need R + } OPTIONAL, -- Cond SIB12 + sl-PosBWP-List-r18 SEQUENCE ( SIZE (1..maxNrofSL-BWPs-r16)) OF SL-PosBWP-ConfigCommon-r18 OPTIONAL -- Cond SIB23 + ]] } -- TAG-SL-FREQCONFIGCOMMON-STOP +-- TAG-SL-FREQSELECTIONCONFIG-START + +SL-FreqSelectionConfig-r18 ::= SEQUENCE { + sl-priorityList-r18 SEQUENCE (SIZE (1..8)) OF INTEGER (1..8), + sl-threshCBR-FreqReselection-r18 SL-CBR-r16, + sl-threshCBR-FreqKeeping-r18 SL-CBR-r16 +} + +-- TAG-SL-FREQSELECTIONCONFIG-STOP +-- TAG-SL-INDIRECTPATHADDCHANGE-START + +SL-IndirectPathAddChange-r18 ::= SEQUENCE { + sl-IndirectPathRelayUE-Identity-r18 SL-SourceIdentity-r17, + sl-IndirectPathCellIdentity-r18 CellIdentity, + t421-r18 ENUMERATED {ms50, ms100, ms150, ms200, ms500, ms1000, ms2000, ms10000} OPTIONAL, -- Need M + + ... +} + +-- TAG-SL-INDIRECTPATHADDCHANGE-STOP -- TAG-SL-INTERUE-COORDINATIONCONFIG-START SL-InterUE-CoordinationConfig-r17 ::= SEQUENCE { @@ -17865,6 +22925,16 @@ SL-ThresholdRSRP-Condition1-B-1-r17 ::= SEQUENCE { } -- TAG-SL-INTERUE-COORDINATIONCONFIG-STOP +-- TAG-SL-LBT-FAILURERECOVERYCONFIG-START + +SL-LBT-FailureRecoveryConfig-r18 ::= SEQUENCE { + sl-LBT-FailureInstanceMaxCount-r18 ENUMERATED {n4, n8, n16, n32, n64, n128, spare2, spare1} OPTIONAL, -- Need M + sl-LBT-FailureDetectionTimer-r18 ENUMERATED {ms10, ms20, ms40, ms80, ms160, ms320, spare2, spare1} OPTIONAL, -- Need M + sl-LBT-RecoveryTimer-r18 ENUMERATED {ms10, ms20, ms40, ms80, ms160, ms320, spare2, spare1} OPTIONAL, -- Need M + ... +} + +-- TAG-SL-LBT-FAILURERECOVERYCONFIG-STOP -- TAG-SL-LOGICALCHANNELCONFIG-START SL-LogicalChannelConfig-r16 ::= SEQUENCE { @@ -17873,17 +22943,21 @@ SL-LogicalChannelConfig-r16 ::= SEQUENCE { kBps1024, kBps2048, kBps4096, kBps8192, kBps16384, kBps32768, kBps65536, infinity}, sl-BucketSizeDuration-r16 ENUMERATED {ms5, ms10, ms20, ms50, ms100, ms150, ms300, ms500, ms1000, spare7, spare6, spare5, spare4, spare3,spare2, spare1}, - sl-ConfiguredGrantType1Allowed-r16 ENUMERATED {true} OPTIONAL, -- Need R - sl-HARQ-FeedbackEnabled-r16 ENUMERATED {enabled, disabled } OPTIONAL, -- Need R + sl-ConfiguredGrantType1Allowed-r16 ENUMERATED {true} OPTIONAL, -- Need R + sl-HARQ-FeedbackEnabled-r16 ENUMERATED {enabled, disabled } OPTIONAL, -- Need R sl-AllowedCG-List-r16 SEQUENCE (SIZE (0.. maxNrofCG-SL-1-r16)) OF SL-ConfigIndexCG-r16 - OPTIONAL, -- Need R - sl-AllowedSCS-List-r16 SEQUENCE (SIZE (1..maxSCSs)) OF SubcarrierSpacing OPTIONAL, -- Need R + OPTIONAL, -- Need R + sl-AllowedSCS-List-r16 SEQUENCE (SIZE (1..maxSCSs)) OF SubcarrierSpacing OPTIONAL, -- Need R sl-MaxPUSCH-Duration-r16 ENUMERATED {ms0p02, ms0p04, ms0p0625, ms0p125, ms0p25, ms0p5, spare2, spare1} - OPTIONAL, -- Need R - sl-LogicalChannelGroup-r16 INTEGER (0..maxLCG-ID) OPTIONAL, -- Need R - sl-SchedulingRequestId-r16 SchedulingRequestId OPTIONAL, -- Need R - sl-LogicalChannelSR-DelayTimerApplied-r16 BOOLEAN OPTIONAL, -- Need R - ... + OPTIONAL, -- Need R + sl-LogicalChannelGroup-r16 INTEGER (0..maxLCG-ID) OPTIONAL, -- Need R + sl-SchedulingRequestId-r16 SchedulingRequestId OPTIONAL, -- Need R + sl-LogicalChannelSR-DelayTimerApplied-r16 BOOLEAN OPTIONAL, -- Need R + ..., + [[ + sl-ChannelAccessPriority-r18 INTEGER (1..4) OPTIONAL, -- Need R + sl-AllowedCarriers-r18 SEQUENCE (SIZE (1..maxNrofFreqSL-r16)) OF INTEGER (1..maxNrofFreqSL-r16) OPTIONAL -- Cond CONNECTED + ]] } -- TAG-SL-LOGICALCHANNELCONFIG-STOP -- TAG-SL-L2RELAYUE-CONFIG-START @@ -17891,12 +22965,29 @@ SL-LogicalChannelConfig-r16 ::= SEQUENCE { SL-L2RelayUE-Config-r17 ::= SEQUENCE { sl-RemoteUE-ToAddModList-r17 SEQUENCE (SIZE (1..maxNrofRemoteUE-r17)) OF SL-RemoteUE-ToAddMod-r17 OPTIONAL, -- Need N sl-RemoteUE-ToReleaseList-r17 SEQUENCE (SIZE (1..maxNrofRemoteUE-r17)) OF SL-DestinationIdentity-r16 OPTIONAL, -- Need N - ... + ..., + [[ + sl-U2U-RemoteUE-ToAddModList-r18 SEQUENCE (SIZE (1..maxNrofSL-Dest-r16)) OF SL-U2U-RemoteUE-Config-r18 OPTIONAL, -- Need N + sl-U2U-RemoteUE-ToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofSL-Dest-r16)) OF SL-DestinationIdentity-r16 OPTIONAL -- Need N + ]] } SL-RemoteUE-ToAddMod-r17 ::= SEQUENCE { sl-L2IdentityRemote-r17 SL-DestinationIdentity-r16, - sl-SRAP-ConfigRelay-r17 SL-SRAP-Config-r17 OPTIONAL, -- Need M + sl-SRAP-ConfigRelay-r17 SL-SRAP-Config-r17 OPTIONAL, -- Need M + ... +} + +SL-U2U-RemoteUE-Config-r18 ::= SEQUENCE { + sl-L2IdentityRemoteUE-r18 SL-DestinationIdentity-r16, + sl-SourceRemoteUE-ToAddModList-r18 SEQUENCE (SIZE (1..maxNrofSL-Dest-r16)) OF SL-SourceRemoteUE-Config-r18 OPTIONAL, -- Need N + sl-SourceRemoteUE-ToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofSL-Dest-r16)) OF SL-SourceIdentity-r17 OPTIONAL, -- Need N + ... +} + +SL-SourceRemoteUE-Config-r18 ::= SEQUENCE { + sl-SourceUE-Identity-r18 SL-SourceIdentity-r17, + sl-SRAP-ConfigU2U-r18 SL-SRAP-ConfigU2U-r18, ... } @@ -17906,8 +22997,26 @@ SL-RemoteUE-ToAddMod-r17 ::= SEQUENCE { SL-L2RemoteUE-Config-r17 ::= SEQUENCE { sl-SRAP-ConfigRemote-r17 SL-SRAP-Config-r17 OPTIONAL, --Need M sl-UEIdentityRemote-r17 RNTI-Value OPTIONAL, -- Cond FirstRRCReconfig + ..., + [[ + sl-U2U-RelayUE-ToAddModList-r18 SEQUENCE (SIZE (1..maxNrofSL-Dest-r16)) OF SL-U2U-RelayUE-Config-r18 OPTIONAL, -- Need N + sl-U2U-RelayUE-ToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofSL-Dest-r16)) OF SL-DestinationIdentity-r16 OPTIONAL -- Need N + ]] +} + +SL-U2U-RelayUE-Config-r18 ::= SEQUENCE { + sl-L2IdentityRelay-r18 SL-DestinationIdentity-r16, + sl-TargetRemoteUE-ToAddModList-r18 SEQUENCE (SIZE (1..maxNrofSL-Dest-r16)) OF SL-TargetRemoteUE-Config-r18 OPTIONAL, -- Need N + sl-TargetRemoteUE-ToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofSL-Dest-r16)) OF SL-DestinationIdentity-r16 OPTIONAL, -- Need N + ... +} + +SL-TargetRemoteUE-Config-r18 ::= SEQUENCE { + sl-TargetUE-Identity-r18 SL-DestinationIdentity-r16, + sl-SRAP-ConfigU2U-r18 SL-SRAP-ConfigU2U-r18, ... } + -- TAG-SL-L2REMOTEUE-CONFIG-STOP -- TAG-SL-MEASCONFIGCOMMON-START @@ -18015,6 +23124,100 @@ SL-PDCP-Config-r16 ::= SEQUENCE { } -- TAG-SL-PDCP-CONFIG-STOP +-- TAG-SL-POSBWP-CONFIGCOMMON + +SL-PosBWP-ConfigCommon-r18 ::= SEQUENCE { + sl-BWP-Generic-r18 SL-BWP-Generic-r16 OPTIONAL, -- Need R + sl-BWP-PRS-PoolConfigCommon-r18 SL-BWP-PRS-PoolConfigCommon-r18 OPTIONAL, -- Need R + ... +} + +-- TAG- SL-POSBWP-CONFIGCOMMON +-- TAG-SL-PRS-RESOURCEPOOL-START + +SL-PRS-ResourcePool-r18 ::= SEQUENCE { + sl-PRS-PSCCH-Config-r18 CHOICE {release NULL, setup SL-PSCCH-ConfigDedicatedSL-PRS-RP-r18} OPTIONAL, -- Need M + sl-StartRB-SubchannelDedicatedSL-PRS-RP-r18 INTEGER (0..265) OPTIONAL, -- Need M + sl-FilterCoefficient-r18 FilterCoefficient OPTIONAL, -- Need M + sl-ThreshS-RSSI-PRS-CBR-r18 INTEGER (0..45) OPTIONAL, -- Need M + sl-RB-Number-r18 INTEGER (10..275) OPTIONAL, -- Need M + sl-TimeResource-r18 BIT STRING (SIZE (10..160)) OPTIONAL, -- Need M + sl-PosAllowedResourceSelectionConfig-r18 ENUMERATED {c1, c2, c3} OPTIONAL, -- Need M + sl-PRS-ResourceReservePeriodList-r18 SEQUENCE (SIZE (1..16)) OF SL-ReservationPeriodAllowedDedicatedSL-PRS-RP-r18 + OPTIONAL, + sl-PRS-ResourcesDedicatedSL-PRS-RP-r18 SEQUENCE (SIZE (1..12)) OF SL-PRS-ResourceDedicatedSL-PRS-RP-r18 OPTIONAL, -- Need M + sl-PRS-PowerControl-r18 SL-PRS-PowerControl-r18 OPTIONAL, -- Need M + sl-SensingWindowDedicatedSL-PRS-RP-r18 ENUMERATED {ms100, ms1100} OPTIONAL, -- Need M + sl-TxPercentageDedicatedSL-PRS-RP-List-r18 SEQUENCE (SIZE (8)) OF SL-TxPercentageDedicatedSL-PRS-RP-Config-r18 OPTIONAL, -- Need M + sl-SCI-basedSL-PRS-TxTriggerSCI1-B-r18 BOOLEAN OPTIONAL, -- Need M + sl-NumSubchannelDedicatedSL-PRS-RP-r18 INTEGER (1..27) OPTIONAL, -- Need M + sl-SubchannelSizeDedicatedSL-PRS-RP-r18 ENUMERATED {n10, n12, n15, n20, n25, n50, n75, n100} OPTIONAL, -- Need M + sl-MaxNumPerReserveDedicatedSL-PRS-RP-r18 ENUMERATED {n2, n3} OPTIONAL, -- Need M + sl-NumReservedBitsSCI1B-DedicatedSL-PRS-RP-r18 INTEGER (0..20) OPTIONAL, -- Need R + sl-SRC-ID-LenDedicatedSL-PRS-RP-r18 ENUMERATED {n12, n24} OPTIONAL, -- Need M + sl-CBR-PriorityTxConfigDedicatedSL-PRS-RP-List-r18 SEQUENCE (SIZE (1..8)) OF SL-PriorityTxConfigIndexDedicatedSL-PRS-RP-r18 + OPTIONAL, -- Need M + sl-TimeWindowSizeCBR-DedicatedSL-PRS-RP-r18 ENUMERATED {ms100, slot100} OPTIONAL, -- Need M + sl-TimeWindowSizeCR-DedicatedSL-PRS-RP-r18 ENUMERATED {ms1000, slot1000} OPTIONAL, -- Need M + sl-CBR-CommonTxDedicatedSL-PRS-RP-List-r18 SL-CBR-CommonTxDedicatedSL-PRS-RP-List-r18 OPTIONAL, -- Need M + sl-PriorityThreshold-UL-URLLC-r18 INTEGER (1..9) OPTIONAL, -- Need M + sl-PriorityThreshold-r18 INTEGER (1..9) OPTIONAL, -- Need M + sl-SelectionWindowListDedicatedSL-PRS-RP-r18 SEQUENCE (SIZE (8)) OF SL-SelectionWindowConfigDedicated-SL-PRS-RP-r18 + OPTIONAL, -- Need M + sl-Thres-RSRP-ListDedicatedSL-PRS-RP-r18 SEQUENCE (SIZE (64)) OF SL-PRS-ThresRSRP-r18 OPTIONAL, -- Need M + sl-PreemptionEnableDedicatedSL-PRS-RP-r18 ENUMERATED {enabled, pl1, pl2, pl3, pl4, pl5, pl6, pl7, pl8} OPTIONAL -- Need R +} + +SL-PSCCH-ConfigDedicatedSL-PRS-RP-r18 ::= SEQUENCE { + timeResourcePSCCH-DedicatedSL-PRS-RP-r18 ENUMERATED {n2, n3} OPTIONAL, -- Need M + freqResourcePSCCH-DedicatedSL-PRS-RP-r18 ENUMERATED {n10,n12, n15, n20, n25} OPTIONAL, -- Need M + ... +} + +SL-ReservationPeriodAllowedDedicatedSL-PRS-RP-r18 ::= CHOICE { + sl-ResourceReservePeriod1-r18 ENUMERATED {ms0, ms100, ms160, ms200, ms300, ms320, ms400, ms500, ms600, ms640, + ms700, ms800, ms900, ms1000, ms1280, ms2560, ms5120, ms10240}, + sl-ResourceReservePeriod2-r18 INTEGER (1..99) +} + +SL-PRS-ResourceDedicatedSL-PRS-RP-r18::= SEQUENCE { + sl-PRS-ResourceID-r18 INTEGER (0..11) OPTIONAL, -- Need M + sl-NumberOfSymbols-r18 INTEGER (1..9) OPTIONAL, -- Need M + sl-CombSize-r18 ENUMERATED{n2,n4,n6} OPTIONAL, -- Need R + sl-PRS-starting-symbol-r18 INTEGER (4..12) OPTIONAL, -- Need M + sl-PRS-comb-offset-r18 INTEGER(1..5) OPTIONAL -- Need M +} + +SL-PRS-PowerControl-r18::= SEQUENCE { + dl-P0-SL-PRS-r18 INTEGER(-202..24) OPTIONAL, -- Need M + dl-Alpha-SL-PRS-r18 ENUMERATED {alpha0, alpha04, alpha05, alpha06, alpha07, alpha08, alpha09, alpha1} OPTIONAL, -- Need M + sl-P0-SL-PRS-r18 INTEGER(-202..24) OPTIONAL, -- Need M + sl-Alpha-SL-PRS-r18 ENUMERATED {alpha0, alpha04, alpha05, alpha06, alpha07, alpha08, alpha09, alpha1} OPTIONAL -- Need S +} + +SL-TxPercentageDedicatedSL-PRS-RP-Config-r18::= SEQUENCE { + sl-TxPercentageDedicatedSL-PRS-RP-r18 INTEGER (1..8) OPTIONAL, -- Need M + sl-Priority-DedicatedSL-PRS-RP ENUMERATED {p20, p35, p50} OPTIONAL -- Need M +} + +SL-PriorityTxConfigIndexDedicatedSL-PRS-RP-r18 ::= SEQUENCE { + sl-PriorityThresholdDedicatedSL-PRS-RP-r18 INTEGER (1..8) OPTIONAL, -- Need M + sl-DefaultTxConfigIndexDedicatedSL-PRS-RP-r18 INTEGER (0..maxCBR-LevelDedSL-PRS-1-r18) OPTIONAL, -- Need M + sl-CBR-ConfigIndexDedicatedSL-PRS-RP-r18 INTEGER (0..maxCBR-ConfigDedSL-PRS-1-r18) OPTIONAL, -- Need M + sl-PRS-TxConfigIndexList-r18 SEQUENCE (SIZE (1.. maxCBR-LevelDedSL-PRS-1-r18)) OF SL-PRS-TxConfigIndex-r18 + OPTIONAL -- Need M +} + +SL-PRS-TxConfigIndex-r18 ::= INTEGER (0.. maxNrofSL-PRS-TxConfig-r18) + +SL-SelectionWindowConfigDedicated-SL-PRS-RP-r18::= SEQUENCE { + sl-PRS-Priority-r18 INTEGER (1..8), + sl-PRS-SelectionWindow-r18 ENUMERATED {n1, n5, n10, n20} +} + +SL-PRS-ThresRSRP-r18 ::= INTEGER (0..66) + +-- TAG-SL-PRS-RESOURCEPOOL-STOP -- TAG-SL-PSBCH-CONFIG-START SL-PSBCH-Config-r16 ::= SEQUENCE { @@ -18105,6 +23308,20 @@ SL-RadioBearerConfig-r16 ::= SEQUENCE { } -- TAG-SL-RADIOBEARERCONFIG-STOP +-- TAG-SL-RBSETCONFIG-START + +SL-RBSetConfig-r18 ::= SEQUENCE { + sl-RBSetIndex-r18 INTEGER (0..4), + sl-NumOfSSSBRepetition-r18 INTEGER (2..9) OPTIONAL, -- Need R + sl-GapBetweenSSSBRepetition-r18 INTEGER (1..84) OPTIONAL -- Need R +} + +-- TAG-SL-RBSETCONFIG-STOP +-- TAG-SL-RELAYINDICATIONMP-START + +SL-RelayIndicationMP-r18 ::= ENUMERATED {support} + +-- TAG-SL-RELAYINDICATIONMP-STOP -- TAG-SL-RELAYUE-CONFIG-START SL-RelayUE-Config-r17::= SEQUENCE { @@ -18115,6 +23332,15 @@ SL-RelayUE-Config-r17::= SEQUENCE { } -- TAG-SL-RELAYUE-CONFIG-STOP +-- TAG-SL-RELAYUE-CONFIGU2U-START + +SL-RelayUE-ConfigU2U-r18::= SEQUENCE { + sl-RSRP-Thresh-DiscConfig-r18 SL-RSRP-Range-r16 OPTIONAL, -- Need R + sd-RSRP-ThreshDiscConfig-r18 SL-RSRP-Range-r16 OPTIONAL, -- Need R + sd-hystMaxRelay-r18 Hysteresis OPTIONAL -- Cond SD-RSRP-ThreshRelay +} + +-- TAG-SL-RELAYUE-CONFIGU2U-STOP -- TAG-SL-REMOTEUE-CONFIG-START SL-RemoteUE-Config-r17::= SEQUENCE { @@ -18130,6 +23356,17 @@ SL-ReselectionConfig-r17::= SEQUENCE { } -- TAG-SL-REMOTEUE-CONFIG-STOP +-- TAG-SL-REMOTEUE-CONFIGU2U-START + +SL-RemoteUE-ConfigU2U-r18::= SEQUENCE { + sl-RSRP-ThreshU2U-r18 SL-RSRP-Range-r16 OPTIONAL, -- Need R + sl-HystMinU2U-r18 Hysteresis OPTIONAL, -- Cond SL-RSRP-ThreshU2U + sd-RSRP-ThreshU2U-r18 SL-RSRP-Range-r16 OPTIONAL, -- Need R + sd-FilterCoefficientU2U-r18 FilterCoefficient OPTIONAL, -- Need R + sd-HystMinU2U-r18 Hysteresis OPTIONAL -- Cond SD-RSRP-ThreshU2U +} + +-- TAG-SL-REMOTEUE-CONFIGU2U-STOP -- TAG-SL-REPORTCONFIGLIST-START SL-ReportConfigList-r16 ::= SEQUENCE (SIZE (1..maxNrofSL-ReportConfigId-r16)) OF SL-ReportConfigInfo-r16 @@ -18194,7 +23431,7 @@ SL-MeasTriggerQuantity-r16 ::= CHOICE { ... } -SL-RS-Type-r16 ::= ENUMERATED {dmrs, spare3, spare2, spare1} +SL-RS-Type-r16 ::= ENUMERATED {dmrs, sl-prs, spare2, spare1} -- TAG-SL-REPORTCONFIGLIST-STOP -- TAG-SL-RESOURCEPOOL-START @@ -18235,9 +23472,42 @@ SL-ResourcePool-r16 ::= SEQUENCE { [[ sl-PBPS-CPS-Config-r17 CHOICE {release NULL, setup SL-PBPS-CPS-Config-r17 } OPTIONAL, -- Need M sl-InterUE-CoordinationConfig-r17 CHOICE {release NULL, setup SL-InterUE-CoordinationConfig-r17 } OPTIONAL -- Need M + ]], + [[ + sl-CPE-StartingPositionsPSCCH-PSSCH-InitiateCOT-List-r18 + CHOICE {release NULL, setup SL-CPE-StartingPositionsPSCCH-PSSCH-List-r18 } OPTIONAL, -- Need M + sl-CPE-StartingPositionsPSCCH-PSSCH-InitiateCOT-Default-r18 INTEGER (1..9) OPTIONAL, -- Need M + sl-CPE-StartingPositionsPSCCH-PSSCH-WithinCOT-List-r18 + CHOICE {release NULL, setup SL-CPE-StartingPositionsPSCCH-PSSCH-List-r18 } OPTIONAL, -- Need M + sl-CPE-StartingPositionsPSCCH-PSSCH-WithinCOT-Default-r18 INTEGER (1..9) OPTIONAL, -- Need M + sl-Type1-LBT-BlockingOption1-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + sl-Type1-LBT-BlockingOption2-r18 ENUMERATED {enabled} OPTIONAL, -- Need R + sl-NumInterlacePerSubchannel-r18 ENUMERATED {sc1, sc2} OPTIONAL, -- Need M + sl-NumReferencePRBs-OfInterlace-r18 ENUMERATED {prb10, prb11} OPTIONAL, -- Need M + sl-TransmissionStructureForPSFCH-r18 ENUMERATED {commonInterlace, dedicatedInterlace} OPTIONAL, -- Need M + sl-NumDedicatedPRBs-ForPSFCH-r18 ENUMERATED {prb1, prb2, prb5} OPTIONAL, -- Need M + sl-NumPSFCH-Occasions-r18 ENUMERATED {o1, o2, o3, o4} OPTIONAL, -- Need M + sl-PSFCH-CommonInterlaceIndex-r18 INTEGER (0..9) OPTIONAL, -- Need M + sl-CPE-StartingPositionPSFCH-r18 INTEGER (1..9) OPTIONAL, -- Need M + sl-NumRefSymbolLength-r18 ENUMERATED {sym7, sym8, sym9, sym10, sym11, sym12, sym13, sym14} OPTIONAL, -- Need M + sl-PSFCH-RB-SetList-r18 SEQUENCE (SIZE (1..4)) OF BIT STRING (SIZE (10..275)) OPTIONAL, -- Need M + sl-IUC-RB-SetList-r18 SEQUENCE (SIZE (1..4)) OF BIT STRING (SIZE (10..275)) OPTIONAL, -- Need M + sl-PSFCH-PowerOffset-r18 INTEGER (0..10) OPTIONAL, -- Need M + sl-RBSetIndexOfResourcePool-r18 SEQUENCE (SIZE (1..5)) OF INTEGER (0..4) OPTIONAL, -- Need M + sl-A2X-Service-r18 ENUMERATED {brid, daa, bridAndDAA, spare1} OPTIONAL, -- Cond A2X + sl-PRS-ResourcesSharedSL-PRS-RP-r18 SEQUENCE (SIZE (1..17)) OF SL-PRS-ResourceSharedSL-PRS-RP-r18 OPTIONAL, -- Need M + numSym-SL-PRS-2ndStageSCI-r18 INTEGER (1..4) OPTIONAL, -- Need M + sl-SCI-based-SL-PRS-Tx-Trigger-SCI2-D-r18 BOOLEAN OPTIONAL -- Need M ]] } +SL-CPE-StartingPositionsPSCCH-PSSCH-List-r18 ::= SEQUENCE (SIZE (8)) OF SL-CPE-StartingPositionsPSCCH-PSSCH-r18 + +SL-CPE-StartingPositionsPSCCH-PSSCH-r18 ::= SEQUENCE { + sl-Priority-r18 INTEGER (1..8), + sl-CPE-StartingPositions-r18 SEQUENCE (SIZE (1..9)) OF INTEGER (1..9) +} + SL-ZoneConfigMCR-r16 ::= SEQUENCE { sl-ZoneConfigMCR-Index-r16 INTEGER (0..15), sl-TransRange-r16 ENUMERATED {m20, m50, m80, m100, m120, m150, m180, m200, m220, m250, m270, m300, m350, @@ -18297,6 +23567,10 @@ SL-UE-SelectedConfigRP-r16 ::= SEQUENCE { ..., [[ sl-CBR-PriorityTxConfigList-v1650 SL-CBR-PriorityTxConfigList-v1650 OPTIONAL -- Need M + ]], + [[ + sl-NRPSSCH-EUTRA-ThresRSRP-List-r18 SL-Thres-RSRP-List-r16 OPTIONAL, -- Need S + sl-NRPSFCH-EUTRA-ThresRSRP-List-r18 SL-Thres-RSRP-List-r16 OPTIONAL -- Need S ]] } @@ -18345,6 +23619,17 @@ SL-PowerControl-r16 ::= SEQUENCE { ]] } +SL-PRS-ResourceSharedSL-PRS-RP-r18::= SEQUENCE { + sl-PRS-ResourceID-r18 INTEGER (0..16), + mNumberOfSymbols-r18 INTEGER (1..9), + sl-PRS-CombSizeN-AndReOffset-r18 CHOICE { + n2-r18 INTEGER (0..1), + n4-r18 INTEGER (0..3), + n6-r18 INTEGER (0..5), + ... + } OPTIONAL -- Need M +} + -- TAG-SL-RESOURCEPOOL-STOP -- TAG-SL-RLC-BEARERCONFIG-START @@ -18353,7 +23638,10 @@ SL-RLC-BearerConfig-r16 ::= SEQUENCE { sl-ServedRadioBearer-r16 SLRB-Uu-ConfigIndex-r16 OPTIONAL, -- Cond LCH-SetupOnly sl-RLC-Config-r16 SL-RLC-Config-r16 OPTIONAL, -- Cond LCH-Setup sl-MAC-LogicalChannelConfig-r16 SL-LogicalChannelConfig-r16 OPTIONAL, -- Cond LCH-Setup - ... + ..., + [[ + sl-RLC-BearerConfigIndex-v1800 SL-RLC-BearerConfigIndex-v1800 OPTIONAL -- Need R + ]] } -- TAG-SL-RLC-BEARERCONFIG-STOP @@ -18361,6 +23649,8 @@ SL-RLC-BearerConfig-r16 ::= SEQUENCE { SL-RLC-BearerConfigIndex-r16 ::= INTEGER (1..maxSL-LCID-r16) +SL-RLC-BearerConfigIndex-v1800 ::= INTEGER (maxSL-LCID-Plus1-r18..maxSL-LCID-r18) + -- TAG-RLC-BEARERCONFIGINDEX-STOP -- TAG-SL-RLC-RLC-CHANNEL-CONFIG-START @@ -18407,6 +23697,11 @@ SL-ScheduledConfig-r16 ::= SEQUENCE { ..., [[ sl-DCI-ToSL-Trans-r16 SEQUENCE (SIZE (1..8)) OF INTEGER (1..32) OPTIONAL -- Need M + ]], + [[ + sl-ConfiguredGrantConfigDedicated-SL-PRS-RP-List-r18 SL-ConfiguredGrantConfigDedicated-SL-PRS-RP-List-r18 OPTIONAL, -- Need M + sl-PRS-RNTI-r18 RNTI-Value OPTIONAL, -- Need M + sl-PRS-CS-RNTI-r18 RNTI-Value OPTIONAL -- Need M ]] } @@ -18422,6 +23717,13 @@ SL-ConfiguredGrantConfigList-r16 ::= SEQUENCE { sl-ConfiguredGrantConfigToAddModList-r16 SEQUENCE (SIZE (1..maxNrofCG-SL-r16)) OF SL-ConfiguredGrantConfig-r16 OPTIONAL -- Need N } +SL-ConfiguredGrantConfigDedicated-SL-PRS-RP-List-r18 ::= SEQUENCE { + sl-ConfiguredGrantConfigDedicated-SL-PRS-RPToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofCG-SL-r16)) OF SL-ConfigIndexCG-r16 + OPTIONAL, -- Need N + sl-ConfiguredGrantConfigDedicated-SL-PRS-RPToAddModList-r18 + SEQUENCE (SIZE (1..maxNrofCG-SL-r16)) OF SL-ConfiguredGrantConfigDedicatedSL-PRS-RP-r18 OPTIONAL -- Need N +} + -- TAG-SL-SCHEDULEDCONFIG-STOP -- TAG-SL-SDAP-CONFIG-START @@ -18478,6 +23780,20 @@ SL-RemoteUE-RB-Identity-r17 ::= CHOICE { } -- TAG-SL-SRAP-CONFIG-STOP +-- TAG-SL-SRAP-CONFIGU2U-START + +SL-SRAP-ConfigU2U-r18 ::= SEQUENCE { + sl-MappingToAddMod-U2U-List-r18 SEQUENCE (SIZE (1..maxSL-LCID-r16)) OF SL-MappingConfig-U2U-r18 OPTIONAL, -- Need N + sl-MappingToRelease-U2U-List-r18 SEQUENCE (SIZE (1..maxSL-LCID-r16)) OF SLRB-Uu-ConfigIndex-r16 OPTIONAL -- Need N +} + +SL-MappingConfig-U2U-r18 ::= SEQUENCE { + sl-RemoteUE-SLRB-Identity-r18 SLRB-Uu-ConfigIndex-r16, + sl-EgressRLC-ChannelPC5-r18 SL-RLC-ChannelID-r17, + ... +} + +-- TAG-SL-SRAP-CONFIGU2U-STOP -- TAG-SL-SYNCCONFIG-START SL-SyncConfigList-r16 ::= SEQUENCE (SIZE (1..maxSL-SyncConfig-r16)) OF SL-SyncConfig-r16 @@ -18485,7 +23801,7 @@ SL-SyncConfigList-r16 ::= SEQUENCE (SIZE (1..maxSL-SyncConfig-r16)) OF SL-SyncConfig-r16 ::= SEQUENCE { sl-SyncRefMinHyst-r16 ENUMERATED {dB0, dB3, dB6, dB9, dB12} OPTIONAL, -- Need R sl-SyncRefDiffHyst-r16 ENUMERATED {dB0, dB3, dB6, dB9, dB12, dBinf} OPTIONAL, -- Need R - sl-filterCoefficient-r16 FilterCoefficient OPTIONAL, -- Need R + sl-FilterCoefficient-r16 FilterCoefficient OPTIONAL, -- Need R sl-SSB-TimeAllocation1-r16 SL-SSB-TimeAllocation-r16 OPTIONAL, -- Need R sl-SSB-TimeAllocation2-r16 SL-SSB-TimeAllocation-r16 OPTIONAL, -- Need R sl-SSB-TimeAllocation3-r16 SL-SSB-TimeAllocation-r16 OPTIONAL, -- Need R @@ -18531,13 +23847,16 @@ SL-TypeTxSync-r16 ::= ENUMERATED {gnss, gnbEnb, ue} -- TAG-SL-UE-SELECTEDCONFIG-START SL-UE-SelectedConfig-r16 ::= SEQUENCE { - sl-PSSCH-TxConfigList-r16 SL-PSSCH-TxConfigList-r16 OPTIONAL, -- Need R + sl-PSSCH-TxConfigList-r16 SL-PSSCH-TxConfigList-r16 OPTIONAL, -- Cond SIB12 sl-ProbResourceKeep-r16 ENUMERATED {v0, v0dot2, v0dot4, v0dot6, v0dot8} OPTIONAL, -- Need R sl-ReselectAfter-r16 ENUMERATED {n1, n2, n3, n4, n5, n6, n7, n8, n9} OPTIONAL, -- Need R sl-CBR-CommonTxConfigList-r16 SL-CBR-CommonTxConfigList-r16 OPTIONAL, -- Need R ul-PrioritizationThres-r16 INTEGER (1..16) OPTIONAL, -- Need R sl-PrioritizationThres-r16 INTEGER (1..8) OPTIONAL, -- Need R - ... + ..., + [[ + sl-CBR-CommonTxDedicatedSL-PRS-RP-List-r18 SL-CBR-CommonTxDedicatedSL-PRS-RP-List-r18 OPTIONAL -- Cond notSIB12 + ]] } -- TAG-SL-UE-SELECTEDCONFIG-STOP @@ -18631,6 +23950,31 @@ MBS-NeighbourCell-r17 ::= SEQUENCE { } -- TAG-MBS-NEIGHBOURCELLLIST-STOP +-- TAG-MBS-NONSERVINGINFOLIST-START + +MBS-NonServingInfoList-r18 ::= SEQUENCE (SIZE (1..maxFreqMBS-r17)) OF NonServingInfo-r18 + +NonServingInfo-r18 ::= SEQUENCE { + freqInfoMBS-r18 FreqInfoMBS-r18 OPTIONAL, + cfr-InfoMBS-r18 CHOICE { + cfr-Bandwidth-r18 INTEGER (1..maxNrofPhysicalResourceBlocks), + cfr-LocationAndBW-r18 CFR-LocationAndBW-r18 + } OPTIONAL, + subcarrierSpacing-r18 SubcarrierSpacing OPTIONAL +} + +FreqInfoMBS-r18 ::= SEQUENCE { + carrierFreqMBS-r18 ARFCN-ValueNR, + freqBandIndicatorMBS-r18 FreqBandIndicatorNR +} + +CFR-LocationAndBW-r18 ::= SEQUENCE { + locationAndBandwidthMBS-r18 INTEGER (0..37949) OPTIONAL, + absoluteFrequencyPointA-MBS-r18 ARFCN-ValueNR OPTIONAL, + offsetToCarrierMBS-r18 INTEGER (0..2199) OPTIONAL +} + +-- TAG-MBS-NONSERVINGINFOLIST-STOP -- TAG-MBS-SERVICELIST-START MBS-ServiceList-r17 ::= SEQUENCE (SIZE (1..maxNrofMBS-ServiceListPerUE-r17)) OF MBS-ServiceInfo-r17 @@ -18691,6 +24035,63 @@ MRB-RLC-ConfigBroadcast-r17 ::= SEQUENCE { } -- TAG-MBS-SESSIONINFOLIST-STOP +-- TAG-MBS-SESSIONINFOLISTMULTICAST-START + +MBS-SessionInfoListMulticast-r18 ::= SEQUENCE (SIZE (1..maxNrofMBS-Session-r17)) OF MBS-SessionInfoMulticast-r18 + +-- WS modification: define a dedicated type +MTCH-NeighbourCell-r18 ::= BIT STRING (SIZE(maxNeighCellMBS-r17)) + +MBS-SessionInfoMulticast-r18 ::= SEQUENCE { + mbs-SessionId-r18 TMGI-r17, + g-RNTI-r18 RNTI-Value OPTIONAL, -- Need R + mrb-ListMulticast-r18 MRB-ListMulticast-r18 OPTIONAL, -- Need R + mtch-SchedulingInfo-r18 DRX-ConfigPTM-Index-r17 OPTIONAL, -- Need S +-- WS modification: define a dedicated type +-- mtch-NeighbourCell-r18 BIT STRING (SIZE(maxNeighCellMBS-r17)) OPTIONAL, Need S + mtch-NeighbourCell-r18 MTCH-NeighbourCell-r18 OPTIONAL, -- Need S + pdsch-ConfigIndex-r18 PDSCH-ConfigIndex-r17 OPTIONAL, -- Need S + mtch-SSB-MappingWindowIndex-r18 MTCH-SSB-MappingWindowIndex-r17 OPTIONAL, -- Cond MTCH-Mapping + thresholdIndex-r18 INTEGER (0..maxNrofThresholdMBS-1-r18) OPTIONAL, -- Need R + pdcp-SyncIndicator-r18 ENUMERATED {true} OPTIONAL, -- Cond RRCRelease + stopMonitoringRNTI-r18 ENUMERATED {true} OPTIONAL, -- Cond G-RNTI + ... +} + +MRB-ListMulticast-r18 ::= SEQUENCE (SIZE (1.. maxMRB-r17)) OF MRB-InfoMulticast-r18 + +MRB-InfoMulticast-r18 ::= SEQUENCE { + pdcp-Config-r18 MRB-PDCP-ConfigMulticast-r18, + rlc-Config-r18 MRB-RLC-ConfigMulticast-r18, + ... +} + +MRB-PDCP-ConfigMulticast-r18 ::= SEQUENCE { + pdcp-SN-SizeDL-r18 ENUMERATED {len12bits, len18bits}, + headerCompression-r18 CHOICE { + notUsed NULL, + rohc SEQUENCE { + maxCID-r18 INTEGER (1..16) DEFAULT 15, + profiles-r18 SEQUENCE { + profile0x0000-r18 BOOLEAN, + profile0x0001-r18 BOOLEAN, + profile0x0002-r18 BOOLEAN + } + } + }, + t-Reordering-r17 ENUMERATED {ms1, ms10, ms40, ms160, ms500, ms1000, ms1250, ms2750} OPTIONAL -- Need R +} + +MRB-RLC-ConfigMulticast-r18 ::= SEQUENCE { + logicalChannelIdentity-r18 CHOICE { + logicalChannelIdentitymulticast-r18 LogicalChannelIdentity, + logicalChannelIdentityExt-r18 LogicalChannelIdentityExt-r17 + }, + sn-FieldLength-r18 ENUMERATED {size6, size12}, + t-Reassembly-r18 T-Reassembly OPTIONAL -- Need R +} + +-- TAG-MBS-SESSIONINFOLISTMULTICAST-STOP -- TAG-MTCH-SSB-MAPPINGWINDOWLIST-START MTCH-SSB-MappingWindowList-r17 ::= SEQUENCE (SIZE (1..maxNrofMTCH-SSB-MappingWindow-r17)) OF MTCH-SSB-MappingWindowCycleOffset-r17 @@ -18740,7 +24141,9 @@ maxAdditionalRACH-r17 INTEGER ::= 256 -- Maximum number of maxAI-DCI-PayloadSize-r16 INTEGER ::= 128 --Maximum size of the DCI payload scrambled with ai-RNTI maxAI-DCI-PayloadSize-1-r16 INTEGER ::= 127 --Maximum size of the DCI payload scrambled with ai-RNTI minus 1 maxBandComb INTEGER ::= 65536 -- Maximum number of DL band combinations +maxBandComb-MUSIM-r18 INTEGER ::= 64 -- Maximum number of MUSIM bands and/or band combinations maxBandsUTRA-FDD-r16 INTEGER ::= 64 -- Maximum number of bands listed in UTRA-FDD UE caps +maxCandidateBandIndex-r18 INTEGER ::= 8 -- Maximum number of band entry index for MUSIM capability maxBH-RLC-ChannelID-r16 INTEGER ::= 65536 -- Maximum value of BH RLC Channel ID maxBT-IdReport-r16 INTEGER ::= 32 -- Maximum number of Bluetooth IDs to report maxBT-Name-r16 INTEGER ::= 4 -- Maximum number of Bluetooth name @@ -18755,6 +24158,8 @@ maxCBR-Config-1-r16 INTEGER ::= 7 -- Maximum number of -- congestion control minus 1 maxCBR-Level-r16 INTEGER ::= 16 -- Maximum number of CBR levels maxCBR-Level-1-r16 INTEGER ::= 15 -- Maximum number of CBR levels minus 1 +maxCellATG-r18 INTEGER ::= 8 -- Maximum number of ATG neighbour cells for which assistance information is + -- provided maxCellExcluded INTEGER ::= 16 -- Maximum number of NR exclude-listed cell ranges in SIB3, SIB4 maxCellGroupings-r16 INTEGER ::= 32 -- Maximum number of cell groupings for NR-DC maxCellHistory-r16 INTEGER ::= 16 -- Maximum number of visited PCells reported @@ -18784,13 +24189,27 @@ maxNrofServingCells INTEGER ::= 32 -- Max number of ser maxNrofServingCells-1 INTEGER ::= 31 -- Max number of serving cells (SpCells + SCells) minus 1 maxNrofAggregatedCellsPerCellGroup INTEGER ::= 16 maxNrofAggregatedCellsPerCellGroupMinus4-r16 INTEGER ::= 12 +maxNrofAperiodicFwdTimeResource-r18 INTEGER ::= 112 -- Max number of aperiodic fowarding time resources for NCR +maxNrofAperiodicFwdTimeResource-1-r18 INTEGER ::= 111 -- Max number of aperiodic fowarding time resources for NCR minus 1 maxNrofDUCells-r16 INTEGER ::= 512 -- Max number of cells configured on the collocated IAB-DU maxNrofAppLayerMeas-r17 INTEGER ::= 16 -- Max number of simultaneous application layer measurements maxNrofAppLayerMeas-1-r17 INTEGER ::= 15 -- Max number of simultaneous application layer measurements minus 1 + +maxNrofAppLayerReports-r18 INTEGER ::= 16 -- Max number of application layer measurement reports with the same + -- measConfigAppLayerId included in the same + -- MeasurementReportAppLayerMessage maxNrofAvailabilityCombinationsPerSet-r16 INTEGER ::= 512 -- Max number of AvailabilityCombinationId used in the DCI format 2_5 maxNrofAvailabilityCombinationsPerSet-1-r16 INTEGER ::= 511 -- Max number of AvailabilityCombinationId used in the DCI format 2_5 minus 1 maxNrofIABResourceConfig-r17 INTEGER ::= 65536 -- Max number of IAB-ResourceConfigID used in MAC CE maxNrofIABResourceConfig-1-r17 INTEGER ::= 65535 -- Max number of IAB-ResourceConfigID used in MAC CE minus 1 +maxNrofPeriodicFwdResourceSet-r18 INTEGER ::= 32 -- Max number of periodic fowarding resource sets for NCR +maxNrofPeriodicFwdResourceSet-1-r18 INTEGER ::= 31 -- Max number of periodic fowarding resource sets for NCR minus 1 +maxNrofPeriodicFwdResource-r18 INTEGER ::= 1024 -- Max number of periodic fowarding resources for NCR +maxNrofPeriodicFwdResource-1-r18 INTEGER ::= 1023 -- Max number of periodic fowarding resources for NCR minus 1 +maxNrofSemiPersistentFwdResourceSet-r18 INTEGER ::= 32 -- Max number of semi-persistent fowarding resource sets for NCR +maxNrofSemiPersistentFwdResourceSet-1-r18 INTEGER ::= 31 -- Max number of semi-persistent fowarding resource sets for NCR minus 1 +maxNrofSemiPersistentFwdResource-r18 INTEGER ::= 128 -- Max number of semi-persistent fowarding resources for NCR +maxNrofSemiPersistentFwdResource-1-r18 INTEGER ::= 127 -- Max number of semi-persistent fowarding resources for NCR minus 1 maxNrofSCellActRS-r17 INTEGER ::= 255 -- Max number of RS configurations per SCell for SCell activation maxNrofSCells INTEGER ::= 31 -- Max number of secondary serving cells per cell group maxNrofCellMeas INTEGER ::= 32 -- Maximum number of entries in each of the cell lists in a measurement object @@ -18810,8 +24229,10 @@ maxNrofCSI-RS-ResourcesToAverage INTEGER ::= 16 -- Max number for th maxNrofDL-Allocations INTEGER ::= 16 -- Maximum number of PDSCH time domain resource allocations maxNrofDL-AllocationsExt-r17 INTEGER ::= 64 -- Maximum number of PDSCH time domain resource allocations for multi-PDSCH -- scheduling +maxNrofDL-Allocations-1-r18 INTEGER ::= 15 -- Maximum number of PDSCH time domain resource allocations minus 1 maxNrofPDU-Sessions-r17 INTEGER ::= 256 -- Maximum number of PDU Sessions maxNrofSR-ConfigPerCellGroup INTEGER ::= 8 -- Maximum number of SR configurations per cell group +maxNrofLCGs-r18 INTEGER ::= 8 -- Maximum number of LCGs maxLCG-ID INTEGER ::= 7 -- Maximum value of LCG ID maxLCG-ID-IAB-r17 INTEGER ::= 255 -- Maximum value of LCG ID for IAB-MT maxLC-ID INTEGER ::= 32 -- Maximum value of Logical Channel ID @@ -18853,6 +24274,7 @@ maxNrofReportConfigPerAperiodicTrigger INTEGER ::= 16 -- Maximum number of maxNrofNZP-CSI-RS-Resources INTEGER ::= 192 -- Maximum number of Non-Zero-Power (NZP) CSI-RS resources maxNrofNZP-CSI-RS-Resources-1 INTEGER ::= 191 -- Maximum number of Non-Zero-Power (NZP) CSI-RS resources minus 1 maxNrofNZP-CSI-RS-ResourcesPerSet INTEGER ::= 64 -- Maximum number of NZP CSI-RS resources per resource set +maxNrofNZP-CSI-RS-ResourcesPerSet-1-r18 INTEGER ::= 63 -- Maximum number of NZP CSI-RS resources per resource set minus 1 maxNrofNZP-CSI-RS-ResourceSets INTEGER ::= 64 -- Maximum number of NZP CSI-RS resource sets per cell maxNrofNZP-CSI-RS-ResourceSets-1 INTEGER ::= 63 -- Maximum number of NZP CSI-RS resource sets per cell minus 1 maxNrofNZP-CSI-RS-ResourceSetsPerConfig INTEGER ::= 16 -- Maximum number of resource sets per resource configuration @@ -18878,13 +24300,19 @@ maxNrofFailureDetectionResources INTEGER ::= 10 -- Maximum number of maxNrofFailureDetectionResources-1 INTEGER ::= 9 -- Maximum number of failure detection resources minus 1 maxNrofFailureDetectionResources-1-r17 INTEGER ::= 63 -- Maximum number of the enhanced failure detection resources minus 1 maxNrofFreqSL-r16 INTEGER ::= 8 -- Maximum number of carrier frequency for NR sidelink communication +maxNrofFreqSL-1-r18 INTEGER ::= 7 -- Maximum number of carrier frequency for NR sidelink communication minus 1 maxNrofSL-BWPs-r16 INTEGER ::= 4 -- Maximum number of BWP for NR sidelink communication -maxFreqSL-EUTRA-r16 INTEGER ::= 8 -- Maximum number of EUTRA anchor carrier frequency for NR sidelink communication +maxNrofSL-CarrierSetConfig-r18 INTEGER ::= 96 -- Maximum number of SCCH carrier set configuration for NR sidelink + -- communication +maxFreqSL-EUTRA-r16 INTEGER ::= 8 -- Maximum number of EUTRA anchor carrier frequency for NR sidelink + -- communication maxNrofSL-MeasId-r16 INTEGER ::= 64 -- Maximum number of sidelink measurement identity (RSRP) per destination maxNrofSL-ObjectId-r16 INTEGER ::= 64 -- Maximum number of sidelink measurement objects (RSRP) per destination maxNrofSL-ReportConfigId-r16 INTEGER ::= 64 -- Maximum number of sidelink measurement reporting configuration(RSRP) per destination -maxNrofSL-PoolToMeasureNR-r16 INTEGER ::= 8 -- Maximum number of resource pool for NR sidelink measurement to measure for - -- each measurement object (for CBR) +maxNrofSL-PoolToMeasureNR-r16 INTEGER ::= 8 -- Maximum number of resource pool for NR sidelink measurement to measure + -- for each measurement object (for CBR) +maxNrofDedicatedSL-PRS-PoolToMeas-r18 INTEGER ::= 8 -- Maximum number of SL-PRS dedicated resource pool for positioning + -- measurement to measure for each measurement object (for SL-PRS CBR) maxFreqSL-NR-r16 INTEGER ::= 8 -- Maximum number of NR anchor carrier frequency for NR sidelink communication maxNrofSL-QFIs-r16 INTEGER ::= 2048 -- Maximum number of QoS flow for NR sidelink communication per UE maxNrofSL-QFIsPerDest-r16 INTEGER ::= 64 -- Maximum number of QoS flow per destination for NR sidelink communication @@ -18901,7 +24329,11 @@ maxNrofQuantityConfig INTEGER ::= 2 -- Maximum number of maxNrofCSI-RS-CellsRRM INTEGER ::= 96 -- Maximum number of cells with CSI-RS resources for an RRM measurement object maxNrofSL-Dest-r16 INTEGER ::= 32 -- Maximum number of destination for NR sidelink communication and discovery maxNrofSL-Dest-1-r16 INTEGER ::= 31 -- Highest index of destination for NR sidelink communication and discovery -maxNrofSLRB-r16 INTEGER ::= 512 -- Maximum number of radio bearer for NR sidelink communication per UE +maxNrofSL-PRS-PerDest-r18 INTEGER ::= 8 -- Max number of SL-PRS transmission supported per destination UE +maxNrofSLRB-r16 INTEGER ::= 512 -- Maximum number of radio bearer for NR sidelink communication per UE without duplication +maxSL-LCID-Plus1-r18 INTEGER ::= 513 -- Maximum number of RLC bearer for NR sidelink communication per UE without duplication plus 1 +maxSL-LCID-r18 INTEGER ::= 1024 -- Maximum number of RLC bearer for NR sidelink communication per UE with duplication +maxSL-NonAnchorRBsets INTEGER ::= 4 -- Maximum number of non-anchor RB sets maxSL-LCID-r16 INTEGER ::= 512 -- Maximum number of RLC bearer for NR sidelink communication per UE maxSL-SyncConfig-r16 INTEGER ::= 16 -- Maximum number of sidelink Sync configurations maxNrofRXPool-r16 INTEGER ::= 16 -- Maximum number of Rx resource pool for NR sidelink communication and @@ -18926,8 +24358,14 @@ maxNrofSRS-TriggerStates-1 INTEGER ::= 3 -- Maximum number of maxNrofSRS-TriggerStates-2 INTEGER ::= 2 -- Maximum number of SRS trigger states minus 2. maxRAT-CapabilityContainers INTEGER ::= 8 -- Maximum number of interworking RAT containers (incl NR and MRDC) maxSimultaneousBands INTEGER ::= 32 -- Maximum number of simultaneously aggregated bands +maxSimultaneousBands-2-r18 INTEGER ::= 30 -- Maximum number of simultaneously aggregated bands minus 2. maxULTxSwitchingBandPairs INTEGER ::= 32 -- Maximum number of band pairs supporting dynamic UL Tx switching in a band -- combination. +maxULTxSwitchingBetweenBandPairs-r18 INTEGER ::= 32 -- Maximum number of combinations of a band pair and another band pair/band + -- between which dynamic UL Tx switching requires additional switching + -- period. +maxSchedulingBandCombination-r18 INTEGER ::= 32 -- Maximum number of combinations of scheduling cell and co-scheduled cells + -- have same or different carrier type. maxNrofSlotFormatCombinationsPerSet INTEGER ::= 512 -- Maximum number of Slot Format Combinations in a SF-Set. maxNrofSlotFormatCombinationsPerSet-1 INTEGER ::= 511 -- Maximum number of Slot Format Combinations in a SF-Set minus 1. maxNrofTrafficPattern-r16 INTEGER ::= 8 -- Maximum number of Traffic Pattern for NR sidelink communication. @@ -19002,6 +24440,8 @@ maxNrofTCI-States-1 INTEGER ::= 127 -- Maximum number of maxUL-TCI-r17 INTEGER ::= 64 -- Maximum number of TCI states. maxUL-TCI-1-r17 INTEGER ::= 63 -- Maximum number of TCI states minus 1. maxNrofAdditionalPCI-r17 INTEGER ::= 7 -- Maximum number of additional PCI +maxNrofAdditionalPRACHConfigs-r18 INTEGER ::= 7 -- Maximum number of additional PRACH configurations for 2TA +maxNrofdelayD-r18 INTEGER ::= 4 -- Maximum number of delayD values. maxMPE-Resources-r17 INTEGER ::= 64 -- Maximum number of pooled MPE resources maxNrofUL-Allocations INTEGER ::= 16 -- Maximum number of PUSCH time domain resource allocations. maxQFI INTEGER ::= 63 @@ -19045,6 +24485,9 @@ maxInterRAT-RSTD-Freq INTEGER ::= 3 maxGIN-r17 INTEGER ::= 24 -- Maximum number of broadcast GINs maxHRNN-Len-r16 INTEGER ::= 48 -- Maximum length of HRNNs maxNPN-r16 INTEGER ::= 12 -- Maximum number of NPNs broadcast and reported by UE at establishment +maxSNPN-ConfigCellId-r18 INTEGER ::= 32 -- Maximum number of Cell ID subject for SNPNS for MDT scope +maxSNPN-ConfigID-r18 INTEGER ::= 16 -- Maximum number of SNPNs subject for MDT scope +maxSNPN-ConfigTAI-r18 INTEGER ::= 8 -- Maximum number of TA subject for MDT scope maxNrOfMinSchedulingOffsetValues-r16 INTEGER ::= 2 -- Maximum number of min. scheduling offset (K0/K2) configurations maxK0-SchedulingOffset-r16 INTEGER ::= 16 -- Maximum number of slots configured as min. scheduling offset (K0) maxK2-SchedulingOffset-r16 INTEGER ::= 16 -- Maximum number of slots configured as min. scheduling offset (K2) @@ -19053,7 +24496,10 @@ maxK2-SchedulingOffset-r17 INTEGER ::= 64 -- Maximum number of maxDCI-2-6-Size-r16 INTEGER ::= 140 -- Maximum size of DCI format 2-6 maxDCI-2-7-Size-r17 INTEGER ::= 43 -- Maximum size of DCI format 2-7 maxDCI-2-6-Size-1-r16 INTEGER ::= 139 -- Maximum DCI format 2-6 size minus 1 +maxDCI-2-9-Size-r18 INTEGER ::= 140 -- Maximum DCI format 2-9 size +maxDCI-2-9-Size-1-r18 INTEGER ::= 139 -- Maximum DCI format 2-9 size minus 1 maxNrofUL-Allocations-r16 INTEGER ::= 64 -- Maximum number of PUSCH time domain resource allocations +maxNrofUL-Allocations-1-r18 INTEGER ::= 63 -- Maximum number of PUSCH time domain resource allocations minus 1 maxNrofP0-PUSCH-Set-r16 INTEGER ::= 2 -- Maximum number of P0 PUSCH set(s) maxOnDemandSIB-r16 INTEGER ::= 8 -- Maximum number of SIB(s) that can be requested on-demand maxOnDemandPosSIB-r16 INTEGER ::= 32 -- Maximum number of posSIB(s) that can be requested on-demand @@ -19075,6 +24521,10 @@ maxNrofConfiguredGrantConfig-r16 INTEGER ::= 12 -- Maximum number of maxNrofConfiguredGrantConfig-1-r16 INTEGER ::= 11 -- Maximum number of configured grant configurations per BWP minus 1 maxNrofCG-Type2DeactivationState INTEGER ::= 16 -- Maximum number of deactivation state for type 2 configured grants per BWP maxNrofConfiguredGrantConfigMAC-1-r16 INTEGER ::= 31 -- Maximum number of configured grant configurations per MAC entity minus 1 +maxNrofCSI-ReportSubconfigPerCSI-ReportConfig-r18 INTEGER ::= 8 -- Maximum number of CSI report subconfigurations per CSI report + -- configuration +maxNrofCSI-ReportSubconfigPerCSI-ReportConfig-1-r18 INTEGER ::= 7 -- Maximum number of CSI report subconfigurations per CSI report + -- configuration minus 1 maxNrofSPS-Config-r16 INTEGER ::= 8 -- Maximum number of SPS configurations per BWP maxNrofSPS-Config-1-r16 INTEGER ::= 7 -- Maximum number of SPS configurations per BWP minus 1 maxNrofSPS-DeactivationState INTEGER ::= 16 -- Maximum number of deactivation state for SPS per BWP @@ -19095,7 +24545,7 @@ maxNrofEnhType3HARQ-ACK-1-r17 INTEGER ::= 7 -- Maximum number of maxNrofPRS-ResourcesPerSet-r17 INTEGER ::= 64 -- Maximum number of PRS resources for one set maxNrofPRS-ResourcesPerSet-1-r17 INTEGER ::= 63 -- Maximum number of PRS resources for one set minus 1 maxNrofPRS-ResourceOffsetValue-1-r17 INTEGER ::= 511 -maxNrofGapId-r17 INTEGER ::= 8 -- Maximum number of measurement gap ID is FFS +maxNrofGapId-r17 INTEGER ::= 8 -- Maximum number of measurement gap ID maxNrofPreConfigPosGapId-r17 INTEGER ::= 16 -- Maximum number of preconfigured positioning measurement gap maxNrOfGapPri-r17 INTEGER ::= 16 -- Maximum number of gap priority level maxCEFReport-r17 INTEGER ::= 4 -- Maximum number of CEF reports by the UE @@ -19113,7 +24563,8 @@ maxNrofDRX-ConfigPTM-1-r17 INTEGER ::= 63 -- Max number of DRX -- cell minus 1 maxNrofMBS-ServiceListPerUE-r17 INTEGER ::= 16 -- Maximum number of services which the UE can include in the MBS interest -- indication -maxNrofMBS-Session-r17 INTEGER ::= 1024 -- Maximum number of MBS sessions provided in MBS broadcast in a cell +maxNrofMBS-Session-r17 INTEGER ::= 1024 -- Maximum number of MBS sessions provided in MBS broadcast or multicast in + -- a cell maxNrofMTCH-SSB-MappingWindow-r17 INTEGER ::= 16 -- Maximum number of MTCH to SSB beam mapping pattern maxNrofMTCH-SSB-MappingWindow-1-r17 INTEGER ::= 15 -- Maximum number of MTCH to SSB beam mapping pattern minus 1 maxNrofMRB-Broadcast-r17 INTEGER ::= 4 -- Maximum number of broadcast MRBs configured for one MBS broadcast service @@ -19131,6 +24582,56 @@ maxNrofPdcch-BlindDetectionMixed-1-r16 INTEGER ::= 7 -- Maximum number of -- monitoring capabilities minus 1 maxNrofPdcch-BlindDetection-r17 INTEGER ::= 16 -- Maximum number of combinations of PDCCH blind detection monitoring -- capabilities +maxNrofAltitudeRanges-r18 INTEGER ::= 8 -- Maximum number of altitude ranges for altitude-based measurement configurations +maxWayPoint-r18 INTEGER ::= 20 -- Maximum number of flight path information waypoints +maxAltitude-r18 INTEGER ::= 10000 -- Maximum altitude in meters +minAltitude-r18 INTEGER ::= -420 -- Minimum altitude in meters +maxMeasSequence-r18 INTEGER ::= 64 -- Maximum number of configured sequence for measurement +maxNrofHops-1-r18 INTEGER ::= 5 -- Maximum number of Hops that can be configured for Positioning SRS Transmission +maxNrOfCellsInVA-r18 INTEGER ::= 16 -- Maximum number of cells in validity area for Positioning SRS is FFS +maxNrOfLinkedSRS-PosResourceSet-r18 INTEGER ::= 3 -- Maximum number of linked SRSPosResourceSets that can be aggregated across + -- CCs +maxNrOfLinkedSRS-PosResSetComb-r18 INTEGER ::= 32 -- Maximum number of combinations of linked SRSPosResourceSets that can be + -- aggregated in RRC_CONNECTED state +maxNrOfLinkedSRS-PosResSetCombInactive-r18 INTEGER ::= 16 -- Maximum number of combinations of linked SRSPosResourceSets that can be + -- aggregated in RRC_INACTIVE state +maxCBR-ConfigDedSL-PRS-1-r18 INTEGER ::= 7 -- Maximum number of CBR ranges for dedicated SL PRS resource pool +maxCBR-LevelDedSL-PRS-1-r18 INTEGER ::= 15 -- Maximum number of CBR levels for dedicated SL PRS resource pool +maxNrofSL-PRS-TxPool-r18 INTEGER ::= 8 -- Maximum number of Tx dedicated SL-PRS resource pool for NR sidelink positioning is FFS +maxNrofSL-PRS-TxConfig-r18 INTEGER ::= 64 -- Maximum number of SL PRS transmission parameter configurations +maxNrOfVA-r18 INTEGER ::= 16 -- Maximum number of validity area is FFS +maxNrofLTM-Configs-r18 INTEGER ::= 8 -- Maximum number of LTM candidate cells +maxNrofLTM-Configs-plus1-r18 INTEGER ::= 9 -- Maximum number of LTM candidate cells plus 1 +maxNrofLTM-CSI-ReportConfigurations-r18 INTEGER ::= 48 -- Maximum number of LTM CSI reporting configurations +maxNrofLTM-CSI-ReportConfigurations-1-r18 INTEGER ::= 47 -- Maximum number of LTM CSI reporting configurations minus 1 +maxNrofLTM-CSI-SSB-ResourcesPerSet-r18 INTEGER ::= 512 -- Maximum number of LTM CSI SSB resource per set +maxNrofLTM-CSI-ResourceConfigurations-r18 INTEGER ::= 112 -- Maximum number of LTM CSI resource configurations +maxNrofLTM-CSI-ResourceConfigurations-1-r18 INTEGER ::= 111 -- Maximum number of LTM CSI resource configurations minus 1 +maxNrofCandidateTCI-State-r18 INTEGER ::= 128 -- Maximum number of LTM TCI states +maxNrofCandidateUL-TCI-r18 INTEGER ::= 64 -- Maximum number of LTM UL TCI states +maxSecurityCellSet-r18 INTEGER ::= 9 -- Maximum number of cell sets for subsequent CPAC. +maxSK-Counter-r18 INTEGER ::= 8 -- Maximum number of SK-counters configured for a cell set for subsequent CPAC. +maxNrofThresholdMBS-r18 INTEGER ::= 8 -- Max number of thresholds of MBS sessions for RRC connection resume for a + -- UE receiving multicast in RRC_INACTIVE +maxNrofThresholdMBS-1-r18 INTEGER ::= 7 -- Max number of thresholds of MBS sessions for RRC connection resume for a + -- UE receiving multicast in RRC_INACTIVE minus 1 +maxTN-AreaInfo-r18 INTEGER ::= 32 -- Maximum number of TN coverage areas for which assistance info is + -- provided in an NTN cell +maxNrofSetsOfCells-r18 INTEGER ::= 4 -- Maximum number of sets of cells for multi-cell PDSCH/PUSCH scheduling +maxNrofSetsOfCells-1-r18 INTEGER ::= 3 -- Maximum number of sets of cells for multi-cell PDSCH/PUSCH scheduling + -- minus 1 +maxNrofCellsInSet-r18 INTEGER ::= 4 -- Maximum number of cells configured in a set of cells for multi-cell + -- PDSCH/PUSCH scheduling +maxNrofCellsInSet-1-r18 INTEGER ::= 3 -- Maximum number of cells configured in a set of cells for multi-cell + -- PDSCH/PUSCH scheduling minus 1 +maxNrofCellCombos-r18 INTEGER ::= 16 -- Maximum number of combinations of co-scheduled cells for multi-cell + -- PDSCH/PUSCH scheduling +maxNrofBWPsInSetOfCells-r18 INTEGER ::= 16 -- Maximum number of BWPs configured in a set of cells for multi-cell + -- PDSCH/PUSCH scheduling +maxLowerMSD-r18 INTEGER ::= 256 -- Maximum number of lower MSD capability sets for a victim band +maxLowerMSDInfo-r18 INTEGER ::= 64 -- Maximum number of lower MSD capability sets for a band combination +maxNrofIntraEndc-Components-r17 INTEGER ::= 4 -- Maximum number of intra-band (NG)EN-DC band components in an inter-band + -- (NG)EN-DC band combination -- TAG-MULTIPLICITY-AND-TYPE-CONSTRAINT-DEFINITIONS-STOP diff --git a/epan/dissectors/asn1/nr-rrc/NR-Sidelink-DiscoveryMessage.asn b/epan/dissectors/asn1/nr-rrc/NR-Sidelink-DiscoveryMessage.asn index dbaf2ec3..eb26df3a 100644 --- a/epan/dissectors/asn1/nr-rrc/NR-Sidelink-DiscoveryMessage.asn +++ b/epan/dissectors/asn1/nr-rrc/NR-Sidelink-DiscoveryMessage.asn @@ -1,17 +1,21 @@ --- 3GPP TS 38.331 V17.5.0 (2023-06) +-- 3GPP TS 38.331 V18.2.0 (2024-06) NR-Sidelink-DiscoveryMessage DEFINITIONS AUTOMATIC TAGS ::= BEGIN IMPORTS CellAccessRelatedInfo, - SL-ServingCellInfo-r17 + SL-ServingCellInfo-r17, + SL-RelayIndicationMP-r18 FROM NR-RRC-Definitions; SL-AccessInfo-L2U2N-r17 ::= SEQUENCE { cellAccessRelatedInfo-r17 CellAccessRelatedInfo, sl-ServingCellInfo-r17 SL-ServingCellInfo-r17, - ... + ..., + [[ + sl-RelayIndication-r18 SL-RelayIndicationMP-r18 OPTIONAL + ]] } END diff --git a/epan/dissectors/asn1/nr-rrc/NR-Sidelink-Preconf.asn b/epan/dissectors/asn1/nr-rrc/NR-Sidelink-Preconf.asn index 492349d3..d2267b1f 100644 --- a/epan/dissectors/asn1/nr-rrc/NR-Sidelink-Preconf.asn +++ b/epan/dissectors/asn1/nr-rrc/NR-Sidelink-Preconf.asn @@ -1,12 +1,16 @@ --- 3GPP TS 38.331 V17.5.0 (2023-06) +-- 3GPP TS 38.331 V18.2.0 (2024-06) NR-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::= BEGIN IMPORTS + SL-RelayUE-ConfigU2U-r18, + SL-RemoteUE-ConfigU2U-r18, SL-RemoteUE-Config-r17, SL-DRX-ConfigGC-BC-r17, + SL-Freq-Id-r16, + maxNrofFreqSL-1-r18, SL-FreqConfigCommon-r16, SL-RadioBearerConfig-r16, SL-RLC-BearerConfig-r16, @@ -46,9 +50,17 @@ SidelinkPreconfigNR-r16 ::= SEQUENCE { sl-MaxCID-r16 INTEGER (1..16383) DEFAULT 15, ..., [[ - sl-DRX-PreConfigGC-BC-r17 SL-DRX-ConfigGC-BC-r17 OPTIONAL, + sl-DRX-PreConfigGC-BC-r17 SL-DRX-ConfigGC-BC-r17 OPTIONAL, sl-TxProfileList-r17 SL-TxProfileList-r17 OPTIONAL, sl-PreconfigDiscConfig-r17 SL-RemoteUE-Config-r17 OPTIONAL + ]], + [[ + sl-PreconfigFreqInfoListSizeExt-v1800 SEQUENCE (SIZE (1..maxNrofFreqSL-1-r18)) OF SL-FreqConfigCommon-r16 OPTIONAL, + sl-RLC-BearerConfigListSizeExt-v1800 SEQUENCE (SIZE (1..maxSL-LCID-r16)) OF SL-RLC-BearerConfig-r16 OPTIONAL, + sl-SyncFreqList-r18 SEQUENCE (SIZE (1..maxNrofFreqSL-r16)) OF SL-Freq-Id-r16 OPTIONAL, + sl-SyncTxMultiFreq-r18 ENUMERATED {true} OPTIONAL, + sl-PreconfigDiscConfig-v1800 SL-PreconfigDiscConfig-v1800 OPTIONAL, + sl-PosPreconfigFreqInfoList-r18 SEQUENCE (SIZE (1..maxNrofFreqSL-r16)) OF SL-FreqConfigCommon-r16 OPTIONAL ]] } @@ -74,6 +86,11 @@ SL-RoHC-Profiles-r16 ::= SEQUENCE { profile0x0104-r16 BOOLEAN } +SL-PreconfigDiscConfig-v1800 ::= SEQUENCE { + sl-RelayUE-PreconfigU2U-r18 SL-RelayUE-ConfigU2U-r18, + sl-RemoteUE-PreconfigU2U-r18 SL-RemoteUE-ConfigU2U-r18 +} + -- TAG-SL-PRECONFIGURATIONNR-STOP END diff --git a/epan/dissectors/asn1/nr-rrc/NR-UE-Variables.asn b/epan/dissectors/asn1/nr-rrc/NR-UE-Variables.asn index 2a273755..2ecfa40a 100644 --- a/epan/dissectors/asn1/nr-rrc/NR-UE-Variables.asn +++ b/epan/dissectors/asn1/nr-rrc/NR-UE-Variables.asn @@ -1,22 +1,29 @@ --- 3GPP TS 38.331 V17.5.0 (2023-06) +-- 3GPP TS 38.331 V18.2.0 (2024-06) NR-UE-Variables DEFINITIONS AUTOMATIC TAGS ::= BEGIN IMPORTS - AreaConfiguration-v1700, + AreaConfiguration-r17, ARFCN-ValueNR, CellIdentity, EUTRA-PhysCellId, maxCEFReport-r17, + maxCellReport, MeasId, MeasIdToAddModList, MeasIdleCarrierEUTRA-r16, MeasIdleCarrierNR-r16, MeasResultIdleEUTRA-r16, MeasResultIdleNR-r16, + MeasReselectionCarrierNR-r18, + MeasurementValidityDuration-r18, MeasObjectToAddModList, + MeasConfigAppLayerId-r17, + MeasConfigAppLayer-r17, + maxNrofAppLayerMeas-r17, + AppLayerIdleInactiveConfig-r18, PhysCellId, RNTI-Value, ReportConfigToAddModList, @@ -64,14 +71,52 @@ IMPORTS maxNrofCLI-SRS-Resources-r16, RSSI-ResourceId-r16, SRS-ResourceId, - VisitedPSCellInfoList-r17 + VisitedPSCellInfoList-r17, + SuccessPSCell-Report-r18, + maxNPN-r16, + SNPN-ConfigID-List-r18, + AreaConfiguration-v1800, + NID-r16, + SK-CounterConfig-r18, + ReferenceConfiguration-r18, + maxNrofLTM-Configs-plus1-r18, + maxSecurityCellSet-r18 + FROM NR-RRC-Definitions; -- NR-UE-VARIABLES-STOP +-- TAG-VARAPPLAYERIDLECONFIG-START + +VarAppLayerIdleConfig-r18-IEs ::= SEQUENCE { + appLayerIdleConfigList-r18 SEQUENCE (SIZE (1..maxNrofAppLayerMeas-r17)) OF VarAppLayerIdle-r18 +} + +VarAppLayerIdle-r18 ::= SEQUENCE { + measConfigAppLayerId-r18 MeasConfigAppLayerId-r17, + serviceType-r18 ENUMERATED {streaming, mtsi, vr, spare5, spare4, spare3, spare2, spare1}, + appLayerIdleInactiveConfig-r18 AppLayerIdleInactiveConfig-r18, + appLayerMeasPriority-r18 INTEGER (1..16) OPTIONAL +} + +-- TAG-VARAPPLAYERIDLECONFIG-STOP +-- TAG-VARAPPLAYERPLMN-LISTCONFIG-START + +VarAppLayerPLMN-ListConfig-r18-IEs ::= SEQUENCE { + plmnConfigList-r18 SEQUENCE (SIZE (1..maxNrofAppLayerMeas-r17)) OF VarAppLayerPLMN-List-r18 +} + +VarAppLayerPLMN-List-r18 ::= SEQUENCE { + measConfigAppLayerId-r18 MeasConfigAppLayerId-r17, + plmn-IdentityList-r18 PLMN-IdentityList2-r16 +} + +-- TAG-VARAPPLAYERPLMN-LISTCONFIG-STOP -- TAG-VARCONDITIONALRECONFIG-START -VarConditionalReconfig ::= SEQUENCE { - condReconfigList CondReconfigToAddModList-r16 OPTIONAL +VarConditionalReconfig ::= SEQUENCE { + condReconfigList CondReconfigToAddModList-r16 OPTIONAL, + scpac-ReferenceConfiguration-r18 ReferenceConfiguration-r18 OPTIONAL, + sk-CounterConfiguration-r18 SEQUENCE (SIZE (1..maxSecurityCellSet-r18)) OF SK-CounterConfig-r18 OPTIONAL } -- TAG-VARCONDITIONALRECONFIG-STOP @@ -79,9 +124,16 @@ VarConditionalReconfig ::= SEQUENCE { VarConnEstFailReport-r16 ::= SEQUENCE { connEstFailReport-r16 ConnEstFailReport-r16, - plmn-Identity-r16 PLMN-Identity + networkIdentity-r18 CHOICE { + plmn-Identity-r18 PLMN-Identity, + snpn-Identity-r18 SNPN-Identity-r18 + } } +SNPN-Identity-r18 ::= SEQUENCE { + plmn-Identity-r18 PLMN-Identity, + nid-r18 NID-r16 +} -- TAG-VARCONNESTFAILREPORT-STOP -- TAG-VARCONNESTFAILREPORTLIST-START @@ -103,7 +155,8 @@ VarLogMeasConfig-r16-IEs ::= SEQUENCE { eventTriggered LoggedEventTriggerConfig-r16 }, earlyMeasIndication-r17 ENUMERATED {true} OPTIONAL, - areaConfiguration-v1700 AreaConfiguration-v1700 OPTIONAL + areaConfiguration-r17 AreaConfiguration-r17 OPTIONAL, + areaConfiguration-v1800 AreaConfiguration-v1800 OPTIONAL } -- TAG-VARLOGMEASCONFIG-STOP -- TAG-VARLOGMEASREPORT-START @@ -114,11 +167,28 @@ VarLogMeasReport-r16 ::= SEQUENCE { traceRecordingSessionRef-r16 OCTET STRING (SIZE (2)), tce-Id-r16 OCTET STRING (SIZE (1)), logMeasInfoList-r16 LogMeasInfoList-r16, - plmn-IdentityList-r16 PLMN-IdentityList2-r16, - sigLoggedMeasType-r17 ENUMERATED {true} + sigLoggedMeasType-r17 ENUMERATED {true}, + identityList-r18 CHOICE { + plmn-IdentityList-r18 PLMN-IdentityList2-r16, + snpn-ConfigID-List-r18 SNPN-ConfigID-List-r18 + } } -- TAG-VARLOGMEASREPORT-STOP +-- TAG-VARLTM-SERVINGCELLNORESETID-START + +VarLTM-ServingCellNoResetID-r18-IEs ::= SEQUENCE { + ltm-ServingCellNoResetID-r18 INTEGER (1..maxNrofLTM-Configs-plus1-r18) OPTIONAL +} + +-- TAG-VARLTM-SERVINGCELLNORESETID-STOP +-- TAG-VARLTM-SERVINGCELLUE-MEASUREDTA-ID-START + +VarLTM-ServingCellUeMeasuredTA-ID-r18-IEs ::= SEQUENCE { + ltm-ServingCellUE-MeasuredTA-ID-r18 INTEGER (1..maxNrofLTM-Configs-plus1-r18) OPTIONAL +} + +-- TAG-VARLTM-SERVINGCELLUE-MEASUREDTA-ID-STOP -- TAG-VARMEASCONFIG-START VarMeasConfig ::= SEQUENCE { @@ -145,7 +215,7 @@ VarMeasConfigSL-r16 ::= SEQUENCE { -- NR sidelink measurement objects sl-MeasObjectList-r16 SL-MeasObjectList-r16 OPTIONAL, -- NR sidelink reporting configurations - sl-reportConfigList-r16 SL-ReportConfigList-r16 OPTIONAL, + sl-ReportConfigList-r16 SL-ReportConfigList-r16 OPTIONAL, -- Other parameters sl-QuantityConfig-r16 SL-QuantityConfig-r16 OPTIONAL } @@ -160,6 +230,10 @@ VarMeasIdleConfig-r16 ::= SEQUENCE { validityAreaList-r16 ValidityAreaList-r16 OPTIONAL } +VarEnhMeasIdleConfig-r18 ::= SEQUENCE { + measIdleValidityDuration-r18 MeasurementValidityDuration-r18 OPTIONAL +} + -- TAG-VARMEASIDLECONFIG-STOP -- TAG-VARMEASIDLEREPORT-START @@ -176,11 +250,13 @@ VarMeasReportList ::= SEQUENCE (SIZE (1..maxNrofMeasId)) OF VarMea VarMeasReport ::= SEQUENCE { -- List of measurement that have been triggered measId MeasId, - cellsTriggeredList CellsTriggeredList OPTIONAL, + cellsTriggeredList CellsTriggeredList OPTIONAL, numberOfReportsSent INTEGER, - cli-TriggeredList-r16 CLI-TriggeredList-r16 OPTIONAL, - tx-PoolMeasToAddModListNR-r16 Tx-PoolMeasList-r16 OPTIONAL, - relaysTriggeredList-r17 RelaysTriggeredList-r17 OPTIONAL + cli-TriggeredList-r16 CLI-TriggeredList-r16 OPTIONAL, + tx-PoolMeasToAddModListNR-r16 Tx-PoolMeasList-r16 OPTIONAL, + relaysTriggeredList-r17 RelaysTriggeredList-r17 OPTIONAL, + cellsMetLeavingCond-r18 SEQUENCE (SIZE (1..maxCellReport)) OF PhysCellId OPTIONAL, + reportedBestNeighbourCell-r18 SEQUENCE (SIZE (1..2)) OF PhysCellId OPTIONAL } CellsTriggeredList ::= SEQUENCE (SIZE (1..maxNrofCellMeas)) OF CHOICE { @@ -213,6 +289,14 @@ VarMeasReportSL-r16 ::= SEQUENCE { } -- TAG-VARMEASREPORTLISTSL-STOP +-- TAG-VARMEASRESELECTIONCONFIG-START + +VarMeasReselectionConfig-r18 ::= SEQUENCE { + measReselectionCarrierListNR-r18 SEQUENCE (SIZE (1..maxFreqIdle-r16)) OF MeasReselectionCarrierNR-r18 OPTIONAL, + measReselectionValidityDuration-r18 MeasurementValidityDuration-r18 OPTIONAL +} + +-- TAG-VARMEASRESELECTIONCONFIG-STOP -- TAG-VARMOBILITYHISTORYREPORT-START VarMobilityHistoryReport-r16 ::= VisitedCellInfoList-r16 @@ -234,11 +318,12 @@ VarPendingRNA-Update ::= SEQUENCE { VarRA-Report-r16 ::= SEQUENCE { ra-ReportList-r16 RA-ReportList-r16, - plmn-IdentityList-r16 PLMN-IdentityList-r16 + identityList-r18 CHOICE { + plmn-IdentityList-r18 PLMN-IdentityList2-r16, + snpn-IdentityList-r18 SEQUENCE (SIZE (1..maxNPN-r16)) OF SNPN-Identity-r18 + } } -PLMN-IdentityList-r16 ::= SEQUENCE (SIZE (1..maxPLMN)) OF PLMN-Identity - -- TAG-VARRA-REPORT-STOP -- TAG-VARRESUMEMAC-INPUT-START @@ -253,10 +338,20 @@ VarResumeMAC-Input ::= SEQUENCE { VarRLF-Report-r16 ::= SEQUENCE { rlf-Report-r16 RLF-Report-r16, - plmn-IdentityList-r16 PLMN-IdentityList2-r16 + identityList-r18 CHOICE { + plmn-IdentityList-r18 PLMN-IdentityList2-r16, + snpn-IdentityList-r18 SEQUENCE (SIZE (1..maxNPN-r16)) OF SNPN-Identity-r18 + } } -- TAG-VARRLF-REPORT-STOP +-- TAG-VARSERVINGSECURITYCELLSETID-START + +VarServingSecurityCellSetID ::= SEQUENCE { + servingSecurityCellSetId-r18 INTEGER (1.. maxSecurityCellSet-r18) +} + +-- TAG-VARSERVINGSECURITYCELLSETID-STOP -- TAG-VARSHORTMAC-INPUT-START VarShortMAC-Input ::= SEQUENCE { @@ -270,8 +365,33 @@ VarShortMAC-Input ::= SEQUENCE { VarSuccessHO-Report-r17-IEs ::= SEQUENCE { successHO-Report-r17 SuccessHO-Report-r17, - plmn-IdentityList-r17 PLMN-IdentityList2-r16 + identityList-r18 CHOICE { + plmn-IdentityList-r18 PLMN-IdentityList2-r16, + snpn-IdentityList-r18 SEQUENCE (SIZE (1..maxNPN-r16)) OF SNPN-Identity-r18 + } } -- TAG-VARSUCCESSHO-Report-STOP +-- TAG-VARSUCCESSPSCELL-Report-START + +VarSuccessPSCell-Report-r18-IEs ::= SEQUENCE { + successPSCell-Report-r18 SuccessPSCell-Report-r18, + identityList-r18 CHOICE { + plmn-IdentityList-r18 PLMN-IdentityList2-r16, + snpn-IdentityList-r18 SEQUENCE (SIZE (1..maxNPN-r16)) OF SNPN-Identity-r18 + } +} + +-- TAG-VARSUCCESSPSCELL-Report-STOP +-- TAG-VARTSS-INFO-START + +VarTSS-Info-r18 ::= SEQUENCE { + storedEventID-r18 INTEGER (0..63), + storedGlobalGnbID-r18 SEQUENCE { + plmn-Identity-r18 PLMN-Identity, + gnb-ID-r18 BIT STRING (SIZE (22..32)) + } +} + +-- TAG-VARTSS-INFO-STOP END diff --git a/epan/dissectors/asn1/nr-rrc/PC5-RRC-Definitions.asn b/epan/dissectors/asn1/nr-rrc/PC5-RRC-Definitions.asn index cd5ec756..3a34fb20 100644 --- a/epan/dissectors/asn1/nr-rrc/PC5-RRC-Definitions.asn +++ b/epan/dissectors/asn1/nr-rrc/PC5-RRC-Definitions.asn @@ -1,10 +1,11 @@ --- 3GPP TS 38.331 V17.5.0 (2023-06) +-- 3GPP TS 38.331 V18.2.0 (2024-06) PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::= BEGIN IMPORTS + ARFCN-ValueNR, CellAccessRelatedInfo, SetupRelease, RRC-TransactionIdentifier, @@ -22,21 +23,34 @@ IMPORTS SL-MeasId-r16, FreqBandList, FreqBandIndicatorNR, + GNSS-ID-r16, maxNrofRelayMeas-r17, maxSimultaneousBands, maxBandComb, maxBands, + maxSIB, maxSIB-MessagePlus1-r17, maxSL-LCID-r16, + maxNrofFreqSL-1-r18, BandParametersSidelink-r16, + PagingRecord-v1700, RLC-ParametersSidelink-r16, + SBAS-ID-r16, SIB1, SL-DRX-ConfigUC-r17, SL-DRX-ConfigUC-SemiStatic-r17, SL-PagingIdentityRemoteUE-r17, SL-RLC-ChannelID-r17, SL-SourceIdentity-r17, - SystemInformation + SystemInformation, + maxNrofSL-Dest-r16, + SL-DestinationIdentity-r16, + SL-RelayIndicationMP-r18, + SL-RSRP-Range-r16, + SL-QoS-FlowIdentity-r16, + SL-QoS-Info-r16, + maxNrofPhysicalResourceBlocks, + SubcarrierSpacing FROM NR-RRC-Definitions; -- TAG-PC5-RRC-DEFINITIONS-STOP @@ -76,7 +90,8 @@ SCCH-MessageType ::= CHOICE { c2 CHOICE { notificationMessageSidelink-r17 NotificationMessageSidelink-r17, ueAssistanceInformationSidelink-r17 UEAssistanceInformationSidelink-r17, - spare6 NULL, spare5 NULL, spare4 NULL, spare3 NULL, spare2 NULL, spare1 NULL + ueInformationRequestSidelink-r18 UEInformationRequestSidelink-r18, + ueInformationResponseSidelink-r18 UEInformationResponseSidelink-r18, spare4 NULL, spare3 NULL, spare2 NULL, spare1 NULL }, messageClassExtensionFuture-r17 SEQUENCE {} } @@ -104,7 +119,7 @@ MeasurementReportSidelink ::= SEQUENCE { } MeasurementReportSidelink-r16-IEs ::= SEQUENCE { - sl-measResults-r16 SL-MeasResults-r16, + sl-MeasResults-r16 SL-MeasResults-r16, lateNonCriticalExtension OCTET STRING OPTIONAL, nonCriticalExtension SEQUENCE{} OPTIONAL } @@ -117,12 +132,18 @@ SL-MeasResults-r16 ::= SEQUENCE { SL-MeasResult-r16 ::= SEQUENCE { sl-ResultDMRS-r16 SL-MeasQuantityResult-r16 OPTIONAL, - ... + ..., + [[ + sl-Result-SL-PRS-r18 SL-MeasQuantityResult-r16 OPTIONAL + ]] } SL-MeasQuantityResult-r16 ::= SEQUENCE { sl-RSRP-r16 RSRP-Range OPTIONAL, - ... + ..., + [[ + sl-RSRP-DedicatedSL-PRS-RP-r18 SL-RSRP-Range-r16 OPTIONAL + ]] } SL-MeasResultListRelay-r17 ::= SEQUENCE (SIZE (1..maxNrofRelayMeas-r17)) OF SL-MeasResultRelay-r17 @@ -131,7 +152,11 @@ SL-MeasResultRelay-r17 ::= SEQUENCE { cellIdentity-r17 CellAccessRelatedInfo, sl-RelayUE-Identity-r17 SL-SourceIdentity-r17, sl-MeasResult-r17 SL-MeasResult-r16, - ... + ..., + [[ + sl-MeasQuantity-r18 ENUMERATED { sl-rsrp, sd-rsrp } OPTIONAL, + sl-RelayIndicationMP-r18 SL-RelayIndicationMP-r18 OPTIONAL + ]] } -- TAG-MEASUREMENTREPORTSIDELINK-STOP @@ -150,9 +175,14 @@ NotificationMessageSidelink-r17-IEs ::= SEQUENCE { relayUE-Uu-RRC-Failure } OPTIONAL, -- Need N lateNonCriticalExtension OCTET STRING OPTIONAL, - nonCriticalExtension SEQUENCE {} OPTIONAL + nonCriticalExtension NotificationMessageSidelink-v1800-IEs OPTIONAL } +NotificationMessageSidelink-v1800-IEs ::= SEQUENCE { + sl-IndicationType-r18 ENUMERATED {relayUE-PC5-RLF, spare1} OPTIONAL, -- Need N + sl-DestinationIdentityRemoteUE-r18 SL-DestinationIdentity-r16 OPTIONAL, -- Need N + nonCriticalExtension SEQUENCE {} OPTIONAL +} -- TAG-NOTIFICATIONMESSAGESIDELINK -STOP -- TAG-REMOTEUEINFORMATIONSIDELINK-START @@ -167,7 +197,15 @@ RemoteUEInformationSidelink-r17-IEs ::= SEQUENCE { sl-RequestedSIB-List-r17 CHOICE {release NULL, setup SL-RequestedSIB-List-r17} OPTIONAL, -- Need M sl-PagingInfo-RemoteUE-r17 CHOICE {release NULL, setup SL-PagingInfo-RemoteUE-r17} OPTIONAL, -- Need M lateNonCriticalExtension OCTET STRING OPTIONAL, - nonCriticalExtension SEQUENCE {} OPTIONAL + nonCriticalExtension RemoteUEInformationSidelink-v1800-IEs OPTIONAL +} + +RemoteUEInformationSidelink-v1800-IEs ::= SEQUENCE { + sl-RequestedPosSIB-List-r18 CHOICE {release NULL, setup SL-RequestedPosSIB-List-r18 } OPTIONAL, -- Need M + sl-SFN-DFN-OffsetRequested-r18 ENUMERATED { true } OPTIONAL, -- Need R + connectionForMP-r18 ENUMERATED {true} OPTIONAL, -- Need N + sl-DestinationIdentityRemoteUE-r18 SL-DestinationIdentity-r16 OPTIONAL, -- Need N + nonCriticalExtension SEQUENCE {} OPTIONAL } SL-RequestedSIB-List-r17 ::= SEQUENCE (SIZE (maxSIB-MessagePlus1-r17)) OF SL-SIB-ReqInfo-r17 @@ -178,8 +216,28 @@ SL-PagingInfo-RemoteUE-r17 ::= SEQUENCE { } SL-SIB-ReqInfo-r17 ::= ENUMERATED { sib1, sib2, sib3, sib4, sib5, sib6, sib7, sib8, sib9, sib10, sib11, sib12, sib13, - sib14, sib15, sib16, sib17, sib18, sib19, sib20, sib21, sibNotReq11, sibNotReq10, sibNotReq9, - sibNotReq8, sibNotReq7, sibNotReq6, sibNotReq5, sibNotReq4, sibNotReq3, sibNotReq2, sibNotReq1, ... } + sib14, sib15, sib16, sib17, sib18, sib19, sib20, sib21, sibNotReq11, sibNotReq10, + sibNotReq9, sibNotReq8, sibNotReq7, sibNotReq6, sibNotReq5, sibNotReq4, + sibNotReq3, sibNotReq2, sibNotReq1, ..., sib17bis-v1820 } + +SL-RequestedPosSIB-List-r18 ::= SEQUENCE (SIZE (1..maxSIB)) OF SL-PosSIB-ReqInfo-r18 + +SL-PosSIB-ReqInfo-r18 ::= SEQUENCE { + gnss-id-r18 GNSS-ID-r16 OPTIONAL, -- Need R + sbas-id-r18 SBAS-ID-r16 OPTIONAL, -- Cond GNSS-ID-SBAS + posSibType-r18 ENUMERATED { posSibType1-1, posSibType1-2, posSibType1-3, posSibType1-4, posSibType1-5, posSibType1-6, + posSibType1-7, posSibType1-8, posSibType1-9, posSibType1-10, posSibType1-11, + posSibType1-12, posSibType2-1, posSibType2-2, posSibType2-3, posSibType2-4, posSibType2-5, + posSibType2-6, posSibType2-7, posSibType2-8, posSibType2-9, posSibType2-10, posSibType2-11, + posSibType2-12, posSibType2-13, posSibType2-14, posSibType2-15, posSibType2-16, + posSibType2-17, posSibType2-17a, posSibType2-18, posSibType2-18a, posSibType2-19, + posSibType2-20, posSibType2-20a, posSibType2-21, posSibType2-22, posSibType2-23, + posSibType2-24, posSibType2-25, posSibType2-26, posSibType2-27, posSibType3-1, + posSibType4-1, posSibType5-1, posSibType6-1, posSibType6-2, posSibType6-3, posSibType6-4, + posSibType6-5, posSibType6-6, posSibType6-7, posSibType7-1, posSibType7-2, posSibType7-3, + posSibType7-4, spare9, spare8, spare7, spare6, spare5, spare4, spare3, spare2, spare1, + ... } +} -- TAG-REMOTEUEINFORMATIONSIDELINK-STOP -- TAG-RRCRECONFIGURATIONSIDELINK-START @@ -208,9 +266,46 @@ RRCReconfigurationSidelink-v1700-IEs ::= SEQUENCE { sl-LatencyBoundIUC-Report-r17 CHOICE {release NULL, setup SL-LatencyBoundIUC-Report-r17 } OPTIONAL, -- Need M sl-RLC-ChannelToReleaseListPC5-r17 SEQUENCE (SIZE (1..maxSL-LCID-r16)) OF SL-RLC-ChannelID-r17 OPTIONAL, -- Need N sl-RLC-ChannelToAddModListPC5-r17 SEQUENCE (SIZE (1..maxSL-LCID-r16)) OF SL-RLC-ChannelConfigPC5-r17 OPTIONAL, -- Need N - nonCriticalExtension SEQUENCE {} OPTIONAL + nonCriticalExtension RRCReconfigurationSidelink-v1800-IEs OPTIONAL } +RRCReconfigurationSidelink-v1800-IEs ::= SEQUENCE { + sl-SFN-DFN-Offset-r18 CHOICE {release NULL, setup SL-SFN-DFN-Offset-r18 } OPTIONAL, -- Need M + sl-CarrierToAddModList-r18 SEQUENCE (SIZE (1..maxNrofFreqSL-1-r18)) OF SL-CarrierConfig-r18 OPTIONAL, -- Need N + sl-CarrierToReleaseList-r18 SEQUENCE (SIZE (1..maxNrofFreqSL-1-r18)) OF SL-CarrierId-r18 OPTIONAL, -- Need N + sl-RLC-BearerToAddModList-r18 SEQUENCE (SIZE(1..maxNrofSLRB-r16)) OF SL-RLC-BearerConfig-r18 OPTIONAL, -- Need N + sl-RLC-BearerToReleaseList-r18 SEQUENCE (SIZE(1..maxNrofSLRB-r16)) OF SL-RLC-BearerConfigIndex-r18 OPTIONAL, -- Need N + sl-LocalID-PairToAddModList-r18 SEQUENCE (SIZE (1..maxNrofSL-Dest-r16)) OF SL-SRAP-ConfigPC5-r18 OPTIONAL, -- Need N + nonCriticalExtension SEQUENCE {} OPTIONAL +} + +SL-CarrierConfig-r18 ::= SEQUENCE { + sl-CarrierId-r18 SL-CarrierId-r18, + sl-OffsetToCarrier-r18 INTEGER (0..2199), + subcarrierSpacing-r18 SubcarrierSpacing, + carrierBandwidth-r18 INTEGER (1..maxNrofPhysicalResourceBlocks), + sl-AbsoluteFrequencyPointA-r18 ARFCN-ValueNR +} + +SL-CarrierId-r18 ::= INTEGER (1..maxNrofFreqSL-1-r18) + +SL-RLC-BearerConfig-r18 ::= CHOICE { + srb SEQUENCE { + sl-SRB-IdentityWithDuplication INTEGER (1..3), + sL-RLC-BearerConfigIndex-r18 SL-RLC-BearerConfigIndex-r18, + ... + }, + drb SEQUENCE { + slrb-PC5-ConfigIndex-r18 SLRB-PC5-ConfigIndex-r16, + sL-RLC-BearerConfigIndex-r18 SL-RLC-BearerConfigIndex-r18, + sl-RLC-ConfigPC5-r18 SL-RLC-ConfigPC5-r16 OPTIONAL, -- Need M + sl-MAC-LogicalChannelConfigPC5-r18 SL-LogicalChannelConfigPC5-r16 OPTIONAL, -- Need M + ... + } +} + +SL-RLC-BearerConfigIndex-r18 ::= INTEGER (1..maxSL-LCID-r16) + SL-LatencyBoundIUC-Report-r17::= INTEGER (3..160) SLRB-Config-r16::= SEQUENCE { @@ -254,7 +349,10 @@ SL-RLC-ConfigPC5-r16 ::= CHOICE { SL-LogicalChannelConfigPC5-r16 ::= SEQUENCE { sl-LogicalChannelIdentity-r16 LogicalChannelIdentity, - ... + ..., + [[ + sl-LogicalChannelIdentity-v1800 INTEGER (33..38) OPTIONAL -- Need M + ]] } SL-PQFI-r16 ::= INTEGER (1..64) @@ -275,6 +373,20 @@ SL-RLC-ChannelConfigPC5-r17::= SEQUENCE { ... } +SL-SFN-DFN-Offset-r18 ::= SEQUENCE { + sl-FrameOffset-r18 INTEGER (0..1023), + sl-SubframeOffset-r18 INTEGER (0..9), + sl-SlotOffset-r18 INTEGER (0..31) +} + +SL-SRAP-ConfigPC5-r18 ::= SEQUENCE { + sl-PeerRemoteUE-L2Identity-r18 SL-DestinationIdentity-r16 OPTIONAL, -- Need M + sl-PeerRemoteUE-LocalIdentity-r18 INTEGER (0..255) OPTIONAL, -- Need M + sl-RemoteUE-L2Identity-r18 SL-SourceIdentity-r17 OPTIONAL, -- Need M + sl-RemoteUE-LocalIdentity-r18 INTEGER (0..255) OPTIONAL, -- Need M + ... +} + -- TAG-RRCRECONFIGURATIONSIDELINK-STOP -- TAG-RRCRECONFIGURATIONCOMPLETESIDELINK-START @@ -378,6 +490,12 @@ UECapabilityInformationSidelink-r16-IEs ::= SEQUENCE { UECapabilityInformationSidelink-v1700-IEs ::= SEQUENCE { mac-ParametersSidelink-r17 MAC-ParametersSidelink-r17 OPTIONAL, supportedBandCombinationListSidelinkNR-v1710 BandCombinationListSidelinkNR-v1710 OPTIONAL, + nonCriticalExtension UECapabilityInformationSidelink-v1800-IEs OPTIONAL +} + +UECapabilityInformationSidelink-v1800-IEs ::= SEQUENCE { + sfn-DFN-OffsetSupported-r18 ENUMERATED { supported } OPTIONAL, + posSIB-ForwardingSupported-r18 ENUMERATED { supported } OPTIONAL, nonCriticalExtension SEQUENCE {} OPTIONAL } @@ -386,11 +504,15 @@ MAC-ParametersSidelink-r17 ::= SEQUENCE { ... } -AccessStratumReleaseSidelink-r16 ::= ENUMERATED { rel16, rel17, spare6, spare5, spare4, spare3, spare2, spare1, ... } +AccessStratumReleaseSidelink-r16 ::= ENUMERATED { rel16, rel17, rel18, spare5, spare4, spare3, spare2, spare1, ... } PDCP-ParametersSidelink-r16 ::= SEQUENCE { outOfOrderDeliverySidelink-r16 ENUMERATED {supported} OPTIONAL, - ... + ..., + [[ + pdcp-DuplicationSRB-sidelink-r18 ENUMERATED {supported} OPTIONAL, + pdcp-DuplicationDRB-sidelink-r18 ENUMERATED {supported} OPTIONAL + ]] } BandCombinationListSidelinkNR-r16 ::= SEQUENCE (SIZE (1..maxBandComb)) OF BandCombinationParametersSidelinkNR-r16 @@ -446,9 +568,9 @@ BandSidelinkPC5-r16 ::= SEQUENCE { ]], [[ --32-5a-2 - rx-IUC-Scheme1-PreferredMode2Sidelink-r17 ENUMERATED {supported} OPTIONAL, + rx-IUC-Scheme1-PreferredMode2Sidelink-r17 ENUMERATED {supported} OPTIONAL, --32-5a-3 - rx-IUC-Scheme1-NonPreferredMode2Sidelink-r17 ENUMERATED {supported} OPTIONAL, + rx-IUC-Scheme1-NonPreferredMode2Sidelink-r17 ENUMERATED {supported} OPTIONAL, --32-5b-2 rx-IUC-Scheme2-Mode2Sidelink-r17 ENUMERATED {n5, n15, n25, n32, n35, n45, n50, n64} OPTIONAL, --32-6-1 @@ -457,10 +579,76 @@ BandSidelinkPC5-r16 ::= SEQUENCE { rx-IUC-Scheme1-SCI-ExplicitReq-r17 ENUMERATED {supported} OPTIONAL, --32-7 scheme2-ConflictDeterminationRSRP-r17 ENUMERATED {supported} OPTIONAL + ]], + [[ + -- R1 41-1-17: Open loop SL pathloss based power control for SL-PRS and associated PSCCH and SL RSRP report for dedicated resource + -- pool + sl-PathlossBasedOLPC-SL-RSRP-Report-r18 ENUMERATED {supported} OPTIONAL, + -- R1 47-k4: Transmitting UE to UE COT sharing information + sl-UE-COT-Sharing-r18 ENUMERATED {supported} OPTIONAL, + -- R1 47-m11: PSFCH transmissions in multiple contiguous RB sets + sl-PSFCH-MultiContiguousRB-r18 ENUMERATED {supported} OPTIONAL, + -- R1 47-m11a: PSFCH transmissions in multiple non-contiguous RB sets + sl-PSFCH-MultiNonContiguousRB-r18 ENUMERATED {supported} OPTIONAL, + -- R1 47-v1: NR SL communication with SL CA + sl-CA-Communication-r18 SEQUENCE { + numberOfCarriers-r18 INTEGER (2..8), + numberOfPSCCH-DecodeValueZ-r18 INTEGER (1..2), + totalBandwidth-r18 ENUMERATED {mhz20,mhz30,mhz40,mhz50,mhz60,mhz70} + } OPTIONAL, + -- R4 45-2: SL reception in intra-carrier guard band + sl-ReceptionIntraCarrierGuardBand-r18 ENUMERATED {supported} OPTIONAL, + -- R4 45-3: Power class for sidelink unlicensed + sl-PowerClassUnlicensed-r18 ENUMERATED {pc5, spare7, spare6, spare5, spare4, spare3, spare2, spare1} OPTIONAL ]] } -- TAG-UECAPABILITYINFORMATIONSIDELINK-STOP +-- TAG-UEINFORMATIONREQUESTSIDELINK-START + +UEInformationRequestSidelink-r18 ::= SEQUENCE { + rrc-TransactionIdentifier-r18 RRC-TransactionIdentifier, + criticalExtensions CHOICE { + ueInformationRequestSidelink-r18 UEInformationRequestSidelink-r18-IEs, + criticalExtensionsFuture SEQUENCE {} + } +} + +UEInformationRequestSidelink-r18-IEs ::= SEQUENCE { + sl-E2E-QoS-InfoListPC5-r18 SEQUENCE (SIZE (1..maxNrofSLRB-r16)) OF SL-E2E-QoS-InfoPC5-r18 OPTIONAL, -- Need N + lateNonCriticalExtension OCTET STRING OPTIONAL, + nonCriticalExtension SEQUENCE {} OPTIONAL +} + +SL-E2E-QoS-InfoPC5-r18 ::= SEQUENCE { + sl-DestinationIdentityRemoteUE-r18 SL-DestinationIdentity-r16, + sl-E2E-SLRB-Index-r18 SLRB-PC5-ConfigIndex-r16, + sl-QoS-InfoList-r18 SEQUENCE (SIZE (1..maxNrofSL-QFIsPerDest-r16)) OF SL-QoS-Info-r16 +} + +-- TAG-UEINFORMATIONREQUESTSIDELINK-STOP +-- TAG-UEINFORMATIONRESPONSESIDELINK-START + +UEInformationResponseSidelink-r18 ::= SEQUENCE { + rrc-TransactionIdentifier-r18 RRC-TransactionIdentifier, + criticalExtensions CHOICE { + ueInformationResponseSidelink-r18 UEInformationResponseSidelink-r18-IEs, + criticalExtensionsFuture SEQUENCE {} + } +} + +UEInformationResponseSidelink-r18-IEs ::= SEQUENCE { + sl-SplitQoS-InfoListPC5-r18 SEQUENCE (SIZE (1.. maxNrofSL-QFIs-r16)) OF SL-SplitQoS-InfoPC5-r18 OPTIONAL, -- Need N + lateNonCriticalExtension OCTET STRING OPTIONAL, + nonCriticalExtension SEQUENCE {} OPTIONAL +} + +SL-SplitQoS-InfoPC5-r18 ::= SEQUENCE { + sl-QoS-FlowIdentity-r18 SL-QoS-FlowIdentity-r16, + sl-SplitPacketDelayBudget-r18 INTEGER (0..1023) +} + +-- TAG-UEINFORMATIONRESPONSESIDELINK-STOP -- TAG-UUMESSAGETRANSFERSIDELINK-START UuMessageTransferSidelink-r17 ::= SEQUENCE { @@ -475,6 +663,11 @@ UuMessageTransferSidelink-r17-IEs ::= SEQUENCE { sl-SIB1-Delivery-r17 OCTET STRING (CONTAINING SIB1) OPTIONAL, -- Need N sl-SystemInformationDelivery-r17 OCTET STRING (CONTAINING SystemInformation) OPTIONAL, -- Need N lateNonCriticalExtension OCTET STRING OPTIONAL, + nonCriticalExtension UuMessageTransferSidelink-v1800-IEs OPTIONAL +} + +UuMessageTransferSidelink-v1800-IEs ::= SEQUENCE { + sl-PagingDelivery-r18 OCTET STRING (CONTAINING PagingRecord-v1700) OPTIONAL, -- Need N nonCriticalExtension SEQUENCE {} OPTIONAL } diff --git a/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf b/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf index c9181191..d2d03c4a 100644 --- a/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf +++ b/epan/dissectors/asn1/nr-rrc/nr-rrc.cnf @@ -1,6 +1,6 @@ # nr-rrc.cnf # nr-rrc conformation file -# Copyright 2018-2023 Pascal Quantin +# Copyright 2018-2024 Pascal Quantin #.OPT PER @@ -65,13 +65,18 @@ CG-ConfigInfo_PDU CondReconfigExecCondSCG-r17_PDU ConfigRestrictInfoDAPS-r16_PDU ConfigRestrictInfoSCG_PDU +EarlyUL-SyncConfig-r18_PDU FeatureSetEntryIndex_PDU FreqBandList_PDU HandoverCommand_PDU HandoverPreparationInformation_PDU LocationMeasurementInfo_PDU +LTM-CSI-ResourceConfigToAddModList-r18_PDU +LTM-CSI-ResourceConfigToReleaseList-r18_PDU +LTM-TCI-Info-r18_PDU MBS-NeighbourCellList-r17_PDU MBSInterestIndication-r17_PDU +MBSMulticastConfiguration-r18_PDU MeasConfig_PDU MeasGapConfig_PDU MeasGapSharingConfig_PDU @@ -80,10 +85,13 @@ MeasResultSCG-Failure_PDU MeasurementTimingConfiguration_PDU MIB_PDU MRB-PDCP-ConfigBroadcast-r17_PDU +MTCH-NeighbourCell-r18_PDU +MUSIM-CandidateBandList-r18_PDU MUSIM-GapConfig-r17_PDU NeedForGapsInfoNR-r16_PDU NeedForGapNCSG-InfoEUTRA-r17_PDU NeedForGapNCSG-InfoNR-r17_PDU +NeedForInterruptionInfoNR-r18_PDU NonCellDefiningSSB-r17_PDU NZP-CSI-RS-Resource_PDU OverheatingAssistance_PDU @@ -96,6 +104,7 @@ PosMeasGapPreConfigToAddModList-r17_PDU PosMeasGapPreConfigToReleaseList-r17_PDU RA-ReportList-r16_PDU RACH-ConfigCommon_PDU +RACH-ConfigDedicated_PDU RadioBearerConfig_PDU ReferenceTime-r16_PDU ReportConfigToAddMod_PDU @@ -125,15 +134,25 @@ SIB18-r17_PDU SIB19-r17_PDU SIB20-r17_PDU SIB21-r17_PDU +SIB22-r18_PDU +SIB23-r18_PDU +SIB24-r18_PDU +SIB25-r18_PDU SidelinkParametersNR-r16_PDU SidelinkUEInformationNR-r16_PDU SL-ConfigDedicatedEUTRA-Info-r16_PDU SL-ConfigDedicatedNR-r16_PDU SL-PHY-MAC-RLC-Config-r16_PDU +SL-PHY-MAC-RLC-Config-v1700_PDU SL-RLC-ChannelToAddModList-r17_PDU SRS-PosRRC-InactiveConfig-r17_PDU +SRS-PosRRC-InactiveValidityAreaConfig-r18_PDU SuccessHO-Report-r17_PDU +SuccessPSCell-Report-r18_PDU +TCI-StateId_PDU +TCI-UL-StateId-r17_PDU TDD-UL-DL-ConfigCommon_PDU +ThresholdMBS-List-r18_PDU UE-CapabilityRAT-ContainerList_PDU UE-CapabilityRequestFilterCommon_PDU UE-CapabilityRequestFilterNR_PDU @@ -162,13 +181,18 @@ ConfigRestrictInfoSCG DL-CCCH-Message @dl.ccch DL-DCCH-Message @dl.dcch DRX-Config +EarlyUL-SyncConfig-r18 FeatureSetEntryIndex FreqBandList HandoverCommand HandoverPreparationInformation LocationMeasurementInfo +LTM-CSI-ResourceConfigToAddModList-r18 +LTM-CSI-ResourceConfigToReleaseList-r18 +LTM-TCI-Info-r18 MBS-NeighbourCellList-r17 MBSInterestIndication-r17 +MBSMulticastConfiguration-r18 MCCH-Message-r17 @mcch MeasConfig MeasGapConfig @@ -178,10 +202,14 @@ MeasResultSCG-Failure MeasurementTimingConfiguration MIB MRB-PDCP-ConfigBroadcast-r17 +MTCH-NeighbourCell-r18 +MulticastMCCH-Message-r18 @multicast_mcch +MUSIM-CandidateBandList-r18 MUSIM-GapConfig-r17 NeedForGapsInfoNR-r16 NeedForGapNCSG-InfoEUTRA-r17 NeedForGapNCSG-InfoNR-r17 +NeedForInterruptionInfoNR-r18 NonCellDefiningSSB-r17 NZP-CSI-RS-Resource OverheatingAssistance @@ -195,6 +223,7 @@ PosMeasGapPreConfigToAddModList-r17 PosMeasGapPreConfigToReleaseList-r17 RA-ReportList-r16 RACH-ConfigCommon +RACH-ConfigDedicated RadioBearerConfig ReferenceTime-r16 ReportConfigToAddMod @@ -225,18 +254,29 @@ SIB15-r17 @sib15 SIB16-r17 @sib16 SIB17-r17 @sib17 SIB18-r17 @sib18 -SIB19-r17 @sib21 -SIB20-r17 @sib22 -SIB21-r17 @sib23 +SIB19-r17 @sib19 +SIB20-r17 @sib20 +SIB21-r17 @sib21 +SIB22-r18 @sib22 +SIB23-r18 @sib23 +SIB24-r18 @sib24 +SIB25-r18 @sib25 +SIB17bis-r18 @sib17bis SL-ConfigDedicatedEUTRA-Info-r16 SL-ConfigDedicatedNR-r16 SL-MeasResultListRelay-r17 SL-MeasResultRelay-r17 SL-PHY-MAC-RLC-Config-r16 +SL-PHY-MAC-RLC-Config-v1700 SL-RLC-ChannelToAddModList-r17 SRS-PosRRC-InactiveConfig-r17 +SRS-PosRRC-InactiveValidityAreaConfig-r18 SuccessHO-Report-r17 +SuccessPSCell-Report-r18 +TCI-StateId +TCI-UL-StateId-r17 TDD-UL-DL-ConfigCommon +ThresholdMBS-List-r18 UE-CapabilityRAT-ContainerList UE-CapabilityRequestFilterCommon UE-CapabilityRequestFilterNR @@ -262,17 +302,24 @@ CG-CandidateList CG-CandidateList-r17-IEs SIB12-IEs-r16 SIB17-IEs-r17 +SIB17bis-IEs-r18 +SIB23-IEs-r18 SL-BWP-ConfigCommon-r16 SL-BWP-DiscPoolConfigCommon-r17 SL-BWP-PoolConfigCommon-r16 +SL-BWP-PRS-PoolConfigCommon-r18 SL-ConfigCommonNR-r16 SL-DiscConfigCommon-r17 +SL-DiscConfigCommon-v1800 SL-EUTRA-AnchorCarrierFreqList-r16 SL-FreqConfigCommon-r16 SL-MeasConfigCommon-r16 SL-NR-AnchorCarrierFreqList-r16 +SL-PosBWP-ConfigCommon-r18 +SL-PosConfigCommonNR-r18 SL-ServingCellInfo-r17 TRS-ResourceSet-r17 +TRS-ResourceSet-r18 UE-TimersAndConstantsRemoteUE-r17 #.FIELD_RENAME @@ -789,6 +836,21 @@ RAT-Type TYPE_PREFIX #.FN_HDR SIB21-r17 col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB21 "); +#.FN_HDR SIB22-r18 + col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB22 "); + +#.FN_HDR SIB23-r18 + col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB23 "); + +#.FN_HDR SIB24-r18 + col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB24 "); + +#.FN_HDR SIB25-r18 + col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB25 "); + +#.FN_HDR SIB17bis-r18 + col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB17bis "); + #.FN_HDR SIB1 col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "SIB1 "); @@ -851,11 +913,11 @@ RAT-Type TYPE_PREFIX if (!PINFO_FD_VISITED(actx->pinfo)) { /* Look for UE identifier */ - mac_nr_info *p_mac_nr_info = (mac_nr_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_mac_nr, 0); + uint16_t *p_ueid = nr_rrc_get_ueid_from_lower_layers(wmem_file_scope(), actx->pinfo); - if (p_mac_nr_info != NULL) { + if (p_ueid != NULL) { /* Inform PDCP about the RRCreestablishmentRequest */ - set_pdcp_nr_rrc_reestablishment_request(p_mac_nr_info->ueid); + set_pdcp_nr_rrc_reestablishment_request(*p_ueid); } } @@ -884,16 +946,16 @@ RAT-Type TYPE_PREFIX col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Security Mode Complete"); #.FN_BODY SecurityModeFailure - mac_nr_info *p_mac_nr_info; + uint16_t *p_ueid; col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Security Mode Failure"); %(DEFAULT_BODY)s /* Look for UE identifier */ - p_mac_nr_info = (mac_nr_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_mac_nr, 0); + p_ueid = nr_rrc_get_ueid_from_lower_layers(wmem_file_scope(), actx->pinfo); - if (p_mac_nr_info != NULL) { + if (p_ueid != NULL) { /* Inform PDCP that the UE failed to execute the securityModeCommand */ - set_pdcp_nr_security_algorithms_failed(p_mac_nr_info->ueid); + set_pdcp_nr_security_algorithms_failed(*p_ueid); } #.FN_HDR ULInformationTransfer @@ -953,6 +1015,9 @@ RAT-Type TYPE_PREFIX #.FN_HDR MeasurementReportAppLayer-r17 col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Measurement Report App Layer"); +#.FN_HDR IndirectPathFailureInformation-r18 + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Indirect Path Failure Information"); + #.FN_BODY MRDC-SecondaryCellGroupConfig/mrdc-SecondaryCellGroup/eutra-SCG VAL_PTR = &eutra_scg_tvb tvbuff_t *eutra_scg_tvb = NULL; %(DEFAULT_BODY)s @@ -1030,10 +1095,10 @@ RAT-Type TYPE_PREFIX } #.FN_BODY MobilityFromNRCommand-IEs/targetRAT-Type VAL_PTR = &target_rat_type - guint32 target_rat_type; + uint32_t target_rat_type; nr_rrc_private_data_t *nr_priv = nr_rrc_get_private_data(actx); %(DEFAULT_BODY)s - nr_priv->target_rat_type = (guint8)target_rat_type; + nr_priv->target_rat_type = (uint8_t)target_rat_type; #.FN_BODY MobilityFromNRCommand-IEs/targetRAT-MessageContainer VAL_PTR = &target_rat_msg_cont_tvb tvbuff_t *target_rat_msg_cont_tvb = NULL; @@ -1093,7 +1158,7 @@ RAT-Type TYPE_PREFIX } #.TYPE_ATTR -RejectWaitTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +RejectWaitTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_RENAME MeasTriggerQuantityUTRA-FDD-r16/utra-FDD-RSCP-r16 MeasTriggerQuantityUTRA_FDD_RSCP_r16 @@ -1111,7 +1176,7 @@ MeasTriggerQuantityUTRA-FDD-r16/utra-FDD-EcN0-r16 DISPLAY=BASE_CUSTOM STRINGS=CF SIB1/cellSelectionInfo/q-RxLevMinOffset DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_q_RxLevMin_fmt) #.TYPE_ATTR -SIB1/cellSelectionInfo/q-QualMinOffset DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +SIB1/cellSelectionInfo/q-QualMinOffset DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.FN_BODY SL-TxResourceReq-r16/sl-CapabilityInformationSidelink-r16 VAL_PTR = &sl_cap_info_sidelink_tvb tvbuff_t *sl_cap_info_sidelink_tvb = NULL; @@ -1132,7 +1197,7 @@ SIB1/cellSelectionInfo/q-QualMinOffset DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS } #.TYPE_ATTR -LogMeasInfo-r16/relativeTimeStamp-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +LogMeasInfo-r16/relativeTimeStamp-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_ATTR RLF-Report-r16/nr-RLF-Report-r16/timeConnFailure-r16 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_timeConnFailure_r16_fmt) @@ -1156,16 +1221,31 @@ RLF-Report-r16/nr-RLF-Report-r16/timeConnFailure-r16 DISPLAY=BASE_CUSTOM STRINGS } #.TYPE_ATTR -TimeSinceFailure-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +TimeSinceFailure-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_ATTR -TimeUntilReconnection-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +TimeUntilReconnection-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_ATTR TimeSinceCHO-Reconfig-r17 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_TimeSinceCHO_Reconfig_r17_fmt) #.TYPE_ATTR -UPInterruptionTimeAtHO-r17 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_milliseconds +TimeSinceCPAC-Reconfig-r18 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_TimeSinceCHO_Reconfig_r17_fmt) + +#.TYPE_ATTR +TimeConnSourceDAPS-Failure-r17 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_milliseconds) + +#.TYPE_ATTR +UPInterruptionTimeAtHO-r17 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_milliseconds) + +#.TYPE_ATTR +ElapsedTimeT316-r18 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_milliseconds) + +#.TYPE_ATTR +ElapsedTimeSCG-Failure-r18 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_milliseconds) + +#.TYPE_ATTR +TimeSinceSHR-r18 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.FN_BODY ULInformationTransferIRAT-r16-IEs/ul-DCCH-MessageEUTRA-r16 VAL_PTR = &ul_dcch_msg_eutra_tvb tvbuff_t *ul_dcch_msg_eutra_tvb = NULL; @@ -1183,7 +1263,7 @@ IntraFreqNeighCellInfo/q-RxLevMinOffsetCell DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC( IntraFreqNeighCellInfo/q-RxLevMinOffsetCellSUL DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_q_RxLevMin_fmt) #.TYPE_ATTR -IntraFreqNeighCellInfo/q-QualMinOffsetCell DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +IntraFreqNeighCellInfo/q-QualMinOffsetCell DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR InterFreqNeighCellInfo/q-RxLevMinOffsetCell DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_q_RxLevMin_fmt) @@ -1192,22 +1272,22 @@ InterFreqNeighCellInfo/q-RxLevMinOffsetCell DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC( InterFreqNeighCellInfo/q-RxLevMinOffsetCellSUL DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_q_RxLevMin_fmt) #.TYPE_ATTR -InterFreqNeighCellInfo/q-QualMinOffsetCell DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +InterFreqNeighCellInfo/q-QualMinOffsetCell DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR CarrierFreqEUTRA/q-RxLevMin DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_q_RxLevMin_fmt) #.TYPE_ATTR -CarrierFreqEUTRA/q-QualMin DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +CarrierFreqEUTRA/q-QualMin DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR -CarrierFreqEUTRA/p-MaxEUTRA DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm +CarrierFreqEUTRA/p-MaxEUTRA DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_dbm) #.TYPE_ATTR EUTRA-FreqNeighCellInfo/q-RxLevMinOffsetCell DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_q_RxLevMin_fmt) #.TYPE_ATTR -EUTRA-FreqNeighCellInfo/q-QualMinOffsetCell DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +EUTRA-FreqNeighCellInfo/q-QualMinOffsetCell DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR SIB6/messageIdentifier TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=<e_rrc_messageIdentifier_vals_ext @@ -1278,15 +1358,15 @@ SIB7/messageIdentifier TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=& #.FN_BODY SIB7/warningMessageSegmentType VAL_PTR=&segment_type nr_rrc_private_data_t *nr_priv = nr_rrc_get_private_data(actx); - guint32 segment_type; + uint32_t segment_type; %(DEFAULT_BODY)s - nr_priv->warning_message_segment_type = (guint8)segment_type; + nr_priv->warning_message_segment_type = (uint8_t)segment_type; #.FN_BODY SIB7/warningMessageSegmentNumber VAL_PTR=&segment_number nr_rrc_private_data_t *nr_priv = nr_rrc_get_private_data(actx); - guint32 segment_number; + uint32_t segment_number; %(DEFAULT_BODY)s - nr_priv->warning_message_segment_number = (guint8)segment_number; + nr_priv->warning_message_segment_number = (uint8_t)segment_number; #.FN_BODY SIB7/dataCodingScheme VAL_PTR=&data_coding_scheme_tvb tvbuff_t *data_coding_scheme_tvb = NULL; @@ -1296,10 +1376,10 @@ SIB7/messageIdentifier TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=& if (data_coding_scheme_tvb) { nr_rrc_private_data_t *nr_priv = nr_rrc_get_private_data(actx); proto_tree *subtree; - guint32 dataCodingScheme; + uint32_t dataCodingScheme; subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_dataCodingScheme); dataCodingScheme = dissect_cbs_data_coding_scheme(data_coding_scheme_tvb, actx->pinfo, subtree, 0); - wmem_map_insert(nr_rrc_etws_cmas_dcs_hash, GUINT_TO_POINTER((guint)nr_priv->message_identifier), + wmem_map_insert(nr_rrc_etws_cmas_dcs_hash, GUINT_TO_POINTER((unsigned)nr_priv->message_identifier), GUINT_TO_POINTER(dataCodingScheme)); } @@ -1312,16 +1392,16 @@ SIB7/messageIdentifier TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=& nr_rrc_private_data_t *nr_priv = nr_rrc_get_private_data(actx); proto_tree *subtree; tvbuff_t *frag_tvb; - gpointer p_dcs; + void *p_dcs; fragment_head *frag_data = fragment_add_seq_check(&nr_rrc_sib7_reassembly_table, warning_msg_seg_tvb, 0, actx->pinfo, nr_priv->message_identifier, NULL, nr_priv->warning_message_segment_number, tvb_reported_length(warning_msg_seg_tvb), - nr_priv->warning_message_segment_type ? FALSE : TRUE); + nr_priv->warning_message_segment_type ? false : true); subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_warningMessageSegment); frag_tvb = process_reassembled_data(warning_msg_seg_tvb, 0, actx->pinfo, "Reassembled SIB7 warning message", frag_data, &nr_rrc_sib7_frag_items, NULL, subtree); - p_dcs = wmem_map_lookup(nr_rrc_etws_cmas_dcs_hash, GUINT_TO_POINTER((guint)nr_priv->message_identifier)); + p_dcs = wmem_map_lookup(nr_rrc_etws_cmas_dcs_hash, GUINT_TO_POINTER((unsigned)nr_priv->message_identifier)); if (frag_tvb && p_dcs) { dissect_nr_rrc_warningMessageSegment(frag_tvb, subtree, actx->pinfo, GPOINTER_TO_UINT(p_dcs)); } @@ -1358,15 +1438,15 @@ SIB8/messageIdentifier TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=& #.FN_BODY SIB8/warningMessageSegmentType VAL_PTR=&segment_type nr_rrc_private_data_t *nr_priv = nr_rrc_get_private_data(actx); - guint32 segment_type; + uint32_t segment_type; %(DEFAULT_BODY)s - nr_priv->warning_message_segment_type = (guint8)segment_type; + nr_priv->warning_message_segment_type = (uint8_t)segment_type; #.FN_BODY SIB8/warningMessageSegmentNumber VAL_PTR=&segment_number nr_rrc_private_data_t *nr_priv = nr_rrc_get_private_data(actx); - guint32 segment_number; + uint32_t segment_number; %(DEFAULT_BODY)s - nr_priv->warning_message_segment_number = (guint8)segment_number; + nr_priv->warning_message_segment_number = (uint8_t)segment_number; #.FN_BODY SIB8/dataCodingScheme VAL_PTR=&data_coding_scheme_tvb tvbuff_t *data_coding_scheme_tvb = NULL; @@ -1376,10 +1456,10 @@ SIB8/messageIdentifier TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=& if (data_coding_scheme_tvb) { nr_rrc_private_data_t *nr_priv = nr_rrc_get_private_data(actx); proto_tree *subtree; - guint32 dataCodingScheme; + uint32_t dataCodingScheme; subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_dataCodingScheme); dataCodingScheme = dissect_cbs_data_coding_scheme(data_coding_scheme_tvb, actx->pinfo, subtree, 0); - wmem_map_insert(nr_rrc_etws_cmas_dcs_hash, GUINT_TO_POINTER((guint)nr_priv->message_identifier), + wmem_map_insert(nr_rrc_etws_cmas_dcs_hash, GUINT_TO_POINTER((unsigned)nr_priv->message_identifier), GUINT_TO_POINTER(dataCodingScheme)); } @@ -1392,26 +1472,26 @@ SIB8/messageIdentifier TYPE=FT_UINT16 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=& nr_rrc_private_data_t *nr_priv = nr_rrc_get_private_data(actx); proto_tree *subtree; tvbuff_t *frag_tvb; - gpointer p_dcs; + void *p_dcs; fragment_head *frag_data = fragment_add_seq_check(&nr_rrc_sib8_reassembly_table, warning_msg_seg_tvb, 0, actx->pinfo, nr_priv->message_identifier, NULL, nr_priv->warning_message_segment_number, tvb_reported_length(warning_msg_seg_tvb), - nr_priv->warning_message_segment_type ? FALSE : TRUE); + nr_priv->warning_message_segment_type ? false : true); subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_warningMessageSegment); frag_tvb = process_reassembled_data(warning_msg_seg_tvb, 0, actx->pinfo, "Reassembled SIB8 warning message", frag_data, &nr_rrc_sib8_frag_items, NULL, subtree); - p_dcs = wmem_map_lookup(nr_rrc_etws_cmas_dcs_hash, GUINT_TO_POINTER((guint)nr_priv->message_identifier)); + p_dcs = wmem_map_lookup(nr_rrc_etws_cmas_dcs_hash, GUINT_TO_POINTER((unsigned)nr_priv->message_identifier)); if (frag_tvb && p_dcs) { dissect_nr_rrc_warningMessageSegment(frag_tvb, subtree, actx->pinfo, GPOINTER_TO_UINT(p_dcs)); } } #.FN_BODY SIB9/timeInfo/timeInfoUTC VAL_PTR=&timeInfo - guint64 timeInfo; + uint64_t timeInfo; proto_tree *subtree; nstime_t ts; - guint32 old_offset = offset; + uint32_t old_offset = offset; %(DEFAULT_BODY)s #.FN_FTR SIB9/timeInfo/timeInfoUTC @@ -1430,12 +1510,12 @@ SIB9/timeInfo/dayLightSavingTime TYPE=FT_UINT8 DISPLAY=BASE_DEC STRINGS=VALS(nr_ #.FN_FTR SIB9/timeInfo/dayLightSavingTime if (daylight_saving_time_tvb) { - guint bitvalue = tvb_get_bits8(daylight_saving_time_tvb, 0, 2); + unsigned bitvalue = tvb_get_bits8(daylight_saving_time_tvb, 0, 2); actx->created_item = proto_tree_add_uint(tree, hf_index, daylight_saving_time_tvb, 0, 1, bitvalue); } #.TYPE_ATTR -SIB9/timeInfo/leapSeconds DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +SIB9/timeInfo/leapSeconds DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_ATTR SIB9/timeInfo/localTimeOffset DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_localTimeOffset_fmt) @@ -1492,16 +1572,16 @@ RSSI-Range-r16 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_RSSI_Range_r16_fmt) } #.TYPE_ATTR -ConfiguredGrantConfig/configuredGrantTimer DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_periodicities +ConfiguredGrantConfig/configuredGrantTimer DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_periodicities) #.TYPE_ATTR -ConnEstFailureControl/connEstFailOffset DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +ConnEstFailureControl/connEstFailOffset DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR DRX-Config/drx-SlotOffset DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_drx_SlotOffset_fmt) #.TYPE_ATTR -FrequencyInfoDL-SIB/offsetToPointA DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_prbs +FrequencyInfoDL-SIB/offsetToPointA DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_prbs) #.TYPE_ATTR Hysteresis DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_Hysteresis_fmt) @@ -1528,10 +1608,10 @@ RSRQ-RangeEUTRA-r16 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_RSRQ_RangeEUTRA_r } #.TYPE_ATTR -ChannelAccessConfig-r16/maxEnergyDetectionThreshold-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm +ChannelAccessConfig-r16/maxEnergyDetectionThreshold-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_dbm) #.TYPE_ATTR -ChannelAccessConfig-r16/energyDetectionThresholdOffset-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +ChannelAccessConfig-r16/energyDetectionThresholdOffset-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR MeasResultUTRA-FDD-r16/measResult-r16/utra-FDD-RSCP-r16 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_utra_FDD_RSCP_r16_fmt) @@ -1540,61 +1620,61 @@ MeasResultUTRA-FDD-r16/measResult-r16/utra-FDD-RSCP-r16 DISPLAY=BASE_CUSTOM STRI MeasResultUTRA-FDD-r16/measResult-r16/utra-FDD-EcN0-r16 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_utra_FDD_EcN0_r16_fmt) #.TYPE_ATTR -MeasResultForRSSI-r16/channelOccupancy-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_percent +MeasResultForRSSI-r16/channelOccupancy-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_percent) #.TYPE_ATTR UL-PDCP-DelayValueResult-r16/averageDelay-r16 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_averageDelay_r16_fmt) #.TYPE_ATTR -NZP-CSI-RS-Resource/powerControlOffset DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +NZP-CSI-RS-Resource/powerControlOffset DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR -P-Max DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm +P-Max DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_dbm) #.TYPE_ATTR -PUCCH-ResourceSet/maxPayloadMinus1 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_bit_bits +PUCCH-ResourceSet/maxPayloadMinus1 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_bit_bits) #.TYPE_ATTR -PUCCH-ConfigCommon/p0-nominal DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm +PUCCH-ConfigCommon/p0-nominal DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_dbm) #.TYPE_ATTR -PUCCH-PowerControl/deltaF-PUCCH-f0 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +PUCCH-PowerControl/deltaF-PUCCH-f0 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR -PUCCH-PowerControl/deltaF-PUCCH-f1 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +PUCCH-PowerControl/deltaF-PUCCH-f1 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR -PUCCH-PowerControl/deltaF-PUCCH-f2 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +PUCCH-PowerControl/deltaF-PUCCH-f2 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR -PUCCH-PowerControl/deltaF-PUCCH-f3 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +PUCCH-PowerControl/deltaF-PUCCH-f3 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR -PUCCH-PowerControl/deltaF-PUCCH-f4 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +PUCCH-PowerControl/deltaF-PUCCH-f4 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR -P0-PUCCH/p0-PUCCH-Value DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +P0-PUCCH/p0-PUCCH-Value DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR PUSCH-ConfigCommon/msg3-DeltaPreamble DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_msg3_DeltaPreamble_fmt) #.TYPE_ATTR -PUSCH-ConfigCommon/p0-NominalWithGrant DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm +PUSCH-ConfigCommon/p0-NominalWithGrant DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_dbm) #.TYPE_ATTR -PUSCH-PowerControl/p0-NominalWithoutGrant DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm +PUSCH-PowerControl/p0-NominalWithoutGrant DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_dbm) #.TYPE_ATTR -P0-PUSCH-AlphaSet/p0 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +P0-PUSCH-AlphaSet/p0 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR -Q-QualMin DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +Q-QualMin DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR Q-RxLevMin DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_Q_RxLevMin_fmt) #.TYPE_ATTR -RACH-ConfigGeneric/preambleReceivedTargetPower DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm +RACH-ConfigGeneric/preambleReceivedTargetPower DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_dbm) #.TYPE_ATTR RSRP-RangeEUTRA DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_RSRP_RangeEUTRA_fmt) @@ -1606,7 +1686,7 @@ RSRQ-RangeEUTRA DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_RSRQ_RangeEUTRA_fmt) SINR-RangeEUTRA DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_SINR_RangeEUTRA_fmt) #.TYPE_ATTR -MsgA-PUSCH-Config-r16/msgA-DeltaPreamble-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +MsgA-PUSCH-Config-r16/msgA-DeltaPreamble-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR MeasTriggerQuantityOffset/rsrp DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_MeasTriggerQuantityOffset_fmt) @@ -1621,7 +1701,7 @@ MeasTriggerQuantityOffset/sinr DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_MeasTr ReselectionThreshold DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_ReselectionThreshold_fmt) #.TYPE_ATTR -ReselectionThresholdQ DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels +ReselectionThresholdQ DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_decibels) #.TYPE_ATTR RSRP-Range DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_RSRP_Range_fmt) @@ -1630,28 +1710,28 @@ RSRP-Range DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_RSRP_Range_fmt) RSRQ-Range DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_RSRQ_Range_fmt) #.TYPE_ATTR -SearchSpace/duration DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_slots +SearchSpace/duration DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_slots) #.TYPE_ATTR -ServingCellConfigCommon/ss-PBCH-BlockPower DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm +ServingCellConfigCommon/ss-PBCH-BlockPower DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_dbm) #.TYPE_ATTR -ServingCellConfigCommonSIB/ss-PBCH-BlockPower DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm +ServingCellConfigCommonSIB/ss-PBCH-BlockPower DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_dbm) #.TYPE_ATTR SINR-Range DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_SINR_Range_fmt) #.TYPE_ATTR -SRS-ResourceSet/p0 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm +SRS-ResourceSet/p0 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_dbm) #.TYPE_ATTR -SRS-PosResourceSet-r16/p0-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm +SRS-PosResourceSet-r16/p0-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_dbm) #.TYPE_ATTR SRS-RSRP-Range-r16 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_SRS_RSRP_r16_fmt) #.TYPE_ATTR -T-Reselection DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +T-Reselection DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.FN_BODY BandParametersSidelinkEUTRA-NR-r16/eutra/bandParametersSidelinkEUTRA1-r16 VAL_PTR = &band_params_sl_tvb tvbuff_t *band_params_sl_tvb = NULL; @@ -1705,10 +1785,10 @@ T-Reselection DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds %(DEFAULT_BODY)s #.FN_BODY RAT-Type VAL_PTR = &rat_type - guint32 rat_type; + uint32_t rat_type; nr_rrc_private_data_t *nr_priv = nr_rrc_get_private_data(actx); %(DEFAULT_BODY)s - nr_priv->rat_type = (guint8)rat_type; + nr_priv->rat_type = (uint8_t)rat_type; #.FN_BODY UE-CapabilityRAT-Container/ue-CapabilityRAT-Container VAL_PTR = &ue_cap_tvb tvbuff_t *ue_cap_tvb = NULL; @@ -1772,17 +1852,17 @@ T-Reselection DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds %(DEFAULT_BODY)s #.FN_FTR AbsoluteTimeInfo-r16 if (abs_time_info_tvb) { - const gchar *str, *hf_str; + const char *str, *hf_str; proto_tree *subtree; subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_absTimeInfo); - str = tvb_bcd_dig_to_str(actx->pinfo->pool, abs_time_info_tvb, 0, 6, NULL, FALSE); + str = tvb_bcd_dig_to_str(actx->pinfo->pool, abs_time_info_tvb, 0, 6, NULL, false); hf_str = wmem_strdup_printf(actx->pinfo->pool, "%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_nr_rrc_absolute_time, abs_time_info_tvb, 0, 6, hf_str); } #.TYPE_ATTR -EUTRA-NS-PmaxValue/additionalPmax DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm +EUTRA-NS-PmaxValue/additionalPmax DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_dbm) #.TYPE_ATTR WLAN-Identifiers-r16/ssid-r16 TYPE=FT_STRING DISPLAY=BASE_NONE @@ -1800,10 +1880,10 @@ WLAN-Identifiers-r16/bssid-r16 TYPE=FT_ETHER WLAN-Identifiers-r16/hessid-r16 TYPE=FT_ETHER #.TYPE_ATTR -VisitedCellInfo-r16/timeSpent-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +VisitedCellInfo-r16/timeSpent-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.TYPE_ATTR -VisitedPSCellInfo-r17/timeSpent-r17 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds +VisitedPSCellInfo-r17/timeSpent-r17 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) #.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_UNKNOWN; @@ -1940,6 +2020,42 @@ VisitedPSCellInfo-r17/timeSpent-r17 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&u #.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib6-6-v1700 nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_6_6; +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib2-17a-v1770 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_2_17a; + +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib2-18a-v1770 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_2_18a; + +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib2-20a-v1770 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_2_20a; + +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib1-11-v1800 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_1_11; + +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib1-12-v1800 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_1_12; + +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib2-26-v1800 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_2_26; + +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib2-27-v1800 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_2_27; + +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib6-7-v1800 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_6_7; + +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib7-1-v1800 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_7_1; + +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib7-2-v1800 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_7_2; + +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib7-3-v1800 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_7_3; + +#.FN_HDR PosSystemInformation-r16-IEs/posSIB-TypeAndInfo-r16/_item/posSib7-4-v1800 + nr_rrc_get_private_data(actx)->pos_sib_type = LPP_POS_SIB_TYPE_7_4; + #.FN_BODY SIBpos-r16/assistanceDataSIB-Element-r16 VAL_PTR = &assist_data_sib_elem_tvb tvbuff_t *assist_data_sib_elem_tvb = NULL; %(DEFAULT_BODY)s @@ -1951,44 +2067,77 @@ VisitedPSCellInfo-r17/timeSpent-r17 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&u } #.FN_BODY RLC-BearerConfig - struct mac_nr_info *p_mac_nr_info; + uint16_t *p_ueid; /* Get the struct and clear it out */ nr_drb_mac_rlc_mapping_t *drb_mapping = &nr_rrc_get_private_data(actx)->drb_rlc_mapping; memset(drb_mapping, 0, sizeof(nr_drb_mac_rlc_mapping_t)); - drb_mapping->active = TRUE; + drb_mapping->active = true; %(DEFAULT_BODY)s /* Need UE identifier */ - p_mac_nr_info = (mac_nr_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_mac_nr, 0); - if (p_mac_nr_info && drb_mapping->drbid) { - drb_mapping->ueid = p_mac_nr_info->ueid; - /* Tell MAC about this mapping */ - set_mac_nr_bearer_mapping(drb_mapping); + p_ueid = nr_rrc_get_ueid_from_lower_layers(wmem_file_scope(), actx->pinfo); + if (p_ueid != NULL && drb_mapping->rbid) { + drb_mapping->ueid = *p_ueid; + if (drb_mapping->is_drb) { + /* Tell MAC about this mapping */ + set_mac_nr_bearer_mapping(drb_mapping); + } + else if (drb_mapping->lcid_present && drb_mapping->lcid==3) { + /* Tell MAC that LCID 3 is for SRB-3 */ + set_mac_nr_srb3_in_use(drb_mapping->ueid); + } + else if (drb_mapping->lcid_present && drb_mapping->lcid==4) { + /* Tell MAC that LCID 4 is for SRB-4 */ + set_mac_nr_srb4_in_use(drb_mapping->ueid); + } } - drb_mapping->active = FALSE; + drb_mapping->active = false; #.FN_BODY DRB-Identity VAL_PTR=&value - guint32 value; + uint32_t value; +%(DEFAULT_BODY)s + if (nr_rrc_get_private_data(actx)->drb_rlc_mapping.active) { + nr_rrc_get_private_data(actx)->drb_rlc_mapping.rbid = (uint8_t)value; + nr_rrc_get_private_data(actx)->drb_rlc_mapping.is_drb = true; + } + else if (nr_rrc_get_private_data(actx)->drb_pdcp_mapping.active) { + nr_rrc_get_private_data(actx)->drb_pdcp_mapping.drbid = (uint8_t)value; + } + +#.FN_BODY SRB-Identity VAL_PTR=&value + uint32_t value; %(DEFAULT_BODY)s if (nr_rrc_get_private_data(actx)->drb_rlc_mapping.active) { - nr_rrc_get_private_data(actx)->drb_rlc_mapping.drbid = (guint8)value; + nr_rrc_get_private_data(actx)->drb_rlc_mapping.rbid = (uint8_t)value; + nr_rrc_get_private_data(actx)->drb_rlc_mapping.is_drb = false; } else if (nr_rrc_get_private_data(actx)->drb_pdcp_mapping.active) { - nr_rrc_get_private_data(actx)->drb_pdcp_mapping.drbid = (guint8)value; + nr_rrc_get_private_data(actx)->drb_pdcp_mapping.drbid = (uint8_t)value; + } + +#.FN_BODY SRB-Identity-v1700 VAL_PTR=&value + uint32_t value; +%(DEFAULT_BODY)s + if (nr_rrc_get_private_data(actx)->drb_rlc_mapping.active) { + nr_rrc_get_private_data(actx)->drb_rlc_mapping.rbid = (uint8_t)value; + nr_rrc_get_private_data(actx)->drb_rlc_mapping.is_drb = false; + } + else if (nr_rrc_get_private_data(actx)->drb_pdcp_mapping.active) { + nr_rrc_get_private_data(actx)->drb_pdcp_mapping.drbid = (uint8_t)value; } #.FN_BODY RLC-Config VAL_PTR=&value - guint32 value; + uint32_t value; nr_drb_mac_rlc_mapping_t *mapping = &nr_rrc_get_private_data(actx)->drb_rlc_mapping; %(DEFAULT_BODY)s mapping->rlcMode = (value==0) ? RLC_AM_MODE : RLC_UM_MODE; - mapping->rlcMode_present = TRUE; + mapping->rlcMode_present = true; #.FN_BODY LogicalChannelIdentity VAL_PTR=&value - guint32 value; + uint32_t value; nr_drb_mac_rlc_mapping_t *mapping = &nr_rrc_get_private_data(actx)->drb_rlc_mapping; %(DEFAULT_BODY)s - mapping->lcid = (guint8)value; - mapping->lcid_present = TRUE; + mapping->lcid = (uint8_t)value; + mapping->lcid_present = true; #.FN_BODY UL-UM-RLC nr_drb_mac_rlc_mapping_t *mapping = &nr_rrc_get_private_data(actx)->drb_rlc_mapping; @@ -2012,28 +2161,28 @@ VisitedPSCellInfo-r17/timeSpent-r17 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&u #.FN_BODY SN-FieldLengthUM VAL_PTR=&value - guint32 value; + uint32_t value; %(DEFAULT_BODY)s nr_drb_mac_rlc_mapping_t *mapping = &nr_rrc_get_private_data(actx)->drb_rlc_mapping; if (mapping->tempDirection == DIRECTION_UPLINK) { - mapping->rlcUlSnLength_present = TRUE; + mapping->rlcUlSnLength_present = true; mapping->rlcUlSnLength = (value==0) ? 6 : 12; } else { - mapping->rlcDlSnLength_present = TRUE; + mapping->rlcDlSnLength_present = true; mapping->rlcDlSnLength = (value==0) ? 6 : 12; } #.FN_BODY SN-FieldLengthAM VAL_PTR=&value - guint32 value; + uint32_t value; %(DEFAULT_BODY)s nr_drb_mac_rlc_mapping_t *mapping = &nr_rrc_get_private_data(actx)->drb_rlc_mapping; if (mapping->tempDirection == DIRECTION_UPLINK) { - mapping->rlcUlSnLength_present = TRUE; + mapping->rlcUlSnLength_present = true; mapping->rlcUlSnLength = (value==0) ? 12 : 18; } else { - mapping->rlcDlSnLength_present = TRUE; + mapping->rlcDlSnLength_present = true; mapping->rlcDlSnLength = (value==0) ? 12 : 18; } @@ -2041,27 +2190,27 @@ VisitedPSCellInfo-r17/timeSpent-r17 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&u #.FN_BODY DRB-ToAddMod nr_drb_rlc_pdcp_mapping_t *mapping = &nr_rrc_get_private_data(actx)->drb_pdcp_mapping; memset(mapping, 0, sizeof(*mapping)); - mapping->active = TRUE; + mapping->active = true; %(DEFAULT_BODY)s - /* Need UE identifier. Use mac-nr. */ - mac_nr_info *p_mac_nr_info = (mac_nr_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_mac_nr, 0); - if (p_mac_nr_info) { + /* Need UE identifier. */ + uint16_t *p_ueid = nr_rrc_get_ueid_from_lower_layers(wmem_file_scope(), actx->pinfo); + if (p_ueid != NULL) { /* Configure PDCP SN length(s) for this DRB */ if (mapping->pdcpUlSnLength_present || mapping->pdcpDlSnLength_present) { - mapping->ueid = p_mac_nr_info->ueid; + mapping->ueid = *p_ueid; set_rlc_nr_drb_pdcp_mapping(actx->pinfo, mapping); } } - mapping->active = FALSE; + mapping->active = false; #.FN_BODY SDAP-Config/sdap-HeaderDL VAL_PTR=&value - guint32 value; + uint32_t value; %(DEFAULT_BODY)s nr_drb_rlc_pdcp_mapping_t *mapping = &nr_rrc_get_private_data(actx)->drb_pdcp_mapping; mapping->pdcpDlSdap = !value; #.FN_BODY SDAP-Config/sdap-HeaderUL VAL_PTR=&value - guint32 value; + uint32_t value; %(DEFAULT_BODY)s nr_drb_rlc_pdcp_mapping_t *mapping = &nr_rrc_get_private_data(actx)->drb_pdcp_mapping; mapping->pdcpUlSdap = !value; @@ -2069,24 +2218,24 @@ VisitedPSCellInfo-r17/timeSpent-r17 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&u #.FN_BODY PDCP-Config/drb/integrityProtection %(DEFAULT_BODY)s nr_drb_rlc_pdcp_mapping_t *mapping = &nr_rrc_get_private_data(actx)->drb_pdcp_mapping; - mapping->pdcpIntegrityProtection = TRUE; + mapping->pdcpIntegrityProtection = true; #.FN_HDR PDCP-Config/eag_1/cipheringDisabled nr_drb_rlc_pdcp_mapping_t *mapping = &nr_rrc_get_private_data(actx)->drb_pdcp_mapping; - mapping->pdcpCipheringDisabled = TRUE; + mapping->pdcpCipheringDisabled = true; #.FN_BODY PDCP-Config/drb/pdcp-SN-SizeUL VAL_PTR=&value - guint32 value; + uint32_t value; nr_drb_rlc_pdcp_mapping_t *mapping = &nr_rrc_get_private_data(actx)->drb_pdcp_mapping; %(DEFAULT_BODY)s - mapping->pdcpUlSnLength_present = TRUE; + mapping->pdcpUlSnLength_present = true; mapping->pdcpUlSnLength = (value) ? 18 : 12; #.FN_BODY PDCP-Config/drb/pdcp-SN-SizeDL VAL_PTR=&value - guint32 value; + uint32_t value; nr_drb_rlc_pdcp_mapping_t *mapping = &nr_rrc_get_private_data(actx)->drb_pdcp_mapping; %(DEFAULT_BODY)s - mapping->pdcpDlSnLength_present = TRUE; + mapping->pdcpDlSnLength_present = true; mapping->pdcpDlSnLength = (value) ? 18 : 12; @@ -2183,8 +2332,8 @@ CA-ParametersEUTRA-v1570/dl-1024QAM-TotalWeightedLayers DISPLAY=BASE_CUSTOM STRI dissect_lte_rrc_MeasResultSCG_FailureMRDC_r15_PDU(meas_result_scg_fail_mrdc_tvb, actx->pinfo, subtree, NULL); } -#.FN_BODY SecurityAlgorithmConfig - mac_nr_info *p_mac_nr_info; +#.FN_BODY SecurityConfigSMC/securityAlgorithmConfig + uint16_t *p_ueid; pdcp_nr_security_info_t *p_security_algorithms; %(DEFAULT_BODY)s p_security_algorithms = &(nr_rrc_get_private_data(actx)->pdcp_security); @@ -2194,21 +2343,21 @@ CA-ParametersEUTRA-v1570/dl-1024QAM-TotalWeightedLayers DISPLAY=BASE_CUSTOM STRI p_security_algorithms->previous_ciphering = nea0; /* Look for UE identifier */ - p_mac_nr_info = (mac_nr_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_mac_nr, 0); - if (p_mac_nr_info != NULL) { + p_ueid = nr_rrc_get_ueid_from_lower_layers(wmem_file_scope(), actx->pinfo); + if (p_ueid != NULL) { /* Configure algorithms */ - set_pdcp_nr_security_algorithms(p_mac_nr_info->ueid, p_security_algorithms); + set_pdcp_nr_security_algorithms(*p_ueid, p_security_algorithms); } #.FN_BODY CipheringAlgorithm VAL_PTR=&value - guint32 value; + uint32_t value; pdcp_nr_security_info_t *p_security_algorithms; %(DEFAULT_BODY)s p_security_algorithms = &(nr_rrc_get_private_data(actx)->pdcp_security); p_security_algorithms->ciphering = (enum nr_security_ciphering_algorithm_e)value; #.FN_BODY IntegrityProtAlgorithm VAL_PTR=&value - guint32 value; + uint32_t value; pdcp_nr_security_info_t *p_security_algorithms; %(DEFAULT_BODY)s p_security_algorithms = &(nr_rrc_get_private_data(actx)->pdcp_security); @@ -2219,7 +2368,7 @@ CA-ParametersEUTRA-v1570/dl-1024QAM-TotalWeightedLayers DISPLAY=BASE_CUSTOM STRI %(DEFAULT_BODY)s if (sl_v2x_configcommon_tvb) { proto_tree *subtree; - subtree = proto_item_add_subtree(actx->created_item, ett_nr_sl_V2X_ConfigCommon_r16); + subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_sl_V2X_ConfigCommon_r16); dissect_lte_rrc_SystemInformationBlockType21_r14_PDU(sl_v2x_configcommon_tvb, actx->pinfo, subtree, NULL); } @@ -2228,7 +2377,7 @@ CA-ParametersEUTRA-v1570/dl-1024QAM-TotalWeightedLayers DISPLAY=BASE_CUSTOM STRI %(DEFAULT_BODY)s if (tdd_config_tvb) { proto_tree *subtree; - subtree = proto_item_add_subtree(actx->created_item, ett_nr_tdd_Config_r16); + subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_tdd_Config_r16); dissect_lte_rrc_TDD_Config_PDU(tdd_config_tvb, actx->pinfo, subtree, NULL); } @@ -2237,7 +2386,7 @@ CA-ParametersEUTRA-v1570/dl-1024QAM-TotalWeightedLayers DISPLAY=BASE_CUSTOM STRI %(DEFAULT_BODY)s if (ellipsoid_point_tvb) { proto_tree *subtree; - subtree = proto_item_add_subtree(actx->created_item, ett_nr_coarseLocationInfo_r17); + subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_coarseLocationInfo_r17); dissect_lpp_Ellipsoid_Point_PDU(ellipsoid_point_tvb, actx->pinfo, subtree, NULL); } @@ -2246,7 +2395,7 @@ CA-ParametersEUTRA-v1570/dl-1024QAM-TotalWeightedLayers DISPLAY=BASE_CUSTOM STRI %(DEFAULT_BODY)s if (sl_meas_result_list_relay_tvb) { proto_tree *subtree; - subtree = proto_item_add_subtree(actx->created_item, ett_nr_sl_MeasResultsCandRelay_r17); + subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_sl_MeasResultsCandRelay_r17); dissect_SL_MeasResultListRelay_r17_PDU(sl_meas_result_list_relay_tvb, actx->pinfo, subtree, NULL); } @@ -2255,7 +2404,7 @@ CA-ParametersEUTRA-v1570/dl-1024QAM-TotalWeightedLayers DISPLAY=BASE_CUSTOM STRI %(DEFAULT_BODY)s if (sl_meas_result_serving_relay_tvb) { proto_tree *subtree; - subtree = proto_item_add_subtree(actx->created_item, ett_nr_sl_MeasResultServingRelay_r17); + subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_sl_MeasResultServingRelay_r17); dissect_SL_MeasResultRelay_r17_PDU(sl_meas_result_serving_relay_tvb, actx->pinfo, subtree, NULL); } @@ -2264,22 +2413,181 @@ CA-ParametersEUTRA-v1570/dl-1024QAM-TotalWeightedLayers DISPLAY=BASE_CUSTOM STRI %(DEFAULT_BODY)s if (ellipsoid_point_tvb) { proto_tree *subtree; - subtree = proto_item_add_subtree(actx->created_item, ett_nr_coarseLocationInfo_r17); + subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_coarseLocationInfo_r17); dissect_lpp_Ellipsoid_Point_PDU(ellipsoid_point_tvb, actx->pinfo, subtree, NULL); } #.TYPE_ATTR -TimeBetweenEvent-r17 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_milliseconds +TimeBetweenEvent-r17 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_milliseconds) #.FN_BODY ReferenceLocation-r17 VAL_PTR = &ellipsoid_point_tvb tvbuff_t *ellipsoid_point_tvb = NULL; %(DEFAULT_BODY)s if (ellipsoid_point_tvb) { proto_tree *subtree; - subtree = proto_item_add_subtree(actx->created_item, ett_nr_ReferenceLocation_r17); + subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_ReferenceLocation_r17); dissect_lpp_Ellipsoid_Point_PDU(ellipsoid_point_tvb, actx->pinfo, subtree, NULL); } +#.FN_BODY WayPoint-r18/wayPointLocation-r18 VAL_PTR = &location_coordinate_tvb + tvbuff_t *location_coordinate_tvb = NULL; +%(DEFAULT_BODY)s + if (location_coordinate_tvb) { + proto_tree *subtree; + subtree = proto_item_add_subtree(actx->created_item, ett_nr_rrc_wayPointLocation_r18); + dissect_lpp_LocationCoordinates_PDU(location_coordinate_tvb, actx->pinfo, subtree, NULL); + } + +#.TYPE_ATTR +FlightPathUpdateDistanceThr-r18 DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_FlightPathUpdateDistanceThr_r18_fmt) + +#.TYPE_ATTR +flightPathUpdateTimeThr-r18 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_seconds) + +#.TYPE_ATTR +Altitude-r18 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_meters) + +#.TYPE_ATTR +ATG-Config-r18/heightgNB-r18 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_meters) + +#.TYPE_ATTR +HysteresisAltitude-r18 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_meters) + +#.TYPE_ATTR +LCG-DSR-Config-r18/remainingTimeThreshold-r18 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=UNS(&units_milliseconds) + +#.FN_FTR DLDedicatedMessageSegment-r16-IEs + if (nr_rrc_reassemble_dcch_segments) { + uint16_t *p_ueid = nr_rrc_get_ueid_from_lower_layers(wmem_file_scope(), actx->pinfo); + uint32_t ueid, id, count; + fragment_head *frag_data; + tvbuff_t *reassembled_tvb; + wmem_tree_key_t key[3]; + nr_rrc_private_data_t *nr_priv = nr_rrc_get_private_data(actx); + + if (p_ueid != NULL) { + ueid = *p_ueid; + } else { + ueid = 0; + } + key[0].length = 1; + key[0].key = &ueid; + key[1].length = 1; + key[1].key = &actx->pinfo->num; + key[2].length = 0; + key[2].key = NULL; + if (!PINFO_FD_VISITED(actx->pinfo)) { + void *value; + + if (wmem_map_lookup_extended(nr_rrc_dcch_segment_ueid_count_hash, GUINT_TO_POINTER((ueid<<16)|(1<<15)), NULL, &value)) { + count = GPOINTER_TO_UINT(value); + } else { + count = 0; + } + if (nr_priv->dcch_segment_number == 0) { + /* new segmented message */ + count++; + wmem_map_insert(nr_rrc_dcch_segment_ueid_count_hash, GUINT_TO_POINTER((ueid<<16)|(1<<15)), GUINT_TO_POINTER(count)); + } + id = (ueid<<16)|(1<<15)|(count&0x7fff); + wmem_tree_insert32_array(nr_rrc_dcch_segment_id_tree, key, GUINT_TO_POINTER(id)); + } else { + id = GPOINTER_TO_UINT(wmem_tree_lookup32_array(nr_rrc_dcch_segment_id_tree, key)); + } + if (nr_priv->dcch_segment != NULL) { + frag_data = fragment_add_seq_check(&nr_rrc_dcch_segment_reassembly_table, nr_priv->dcch_segment, 0, actx->pinfo, + id, NULL, nr_priv->dcch_segment_number, + tvb_reported_length(nr_priv->dcch_segment), + !nr_priv->dcch_segment_last); + reassembled_tvb = process_reassembled_data(nr_priv->dcch_segment, 0, actx->pinfo, "Reassembled DL Dedicated Message", + frag_data, &nr_rrc_dcch_segment_frag_items, NULL, tree); + if (reassembled_tvb) { + dissect_DL_DCCH_Message_PDU(reassembled_tvb, actx->pinfo, tree, NULL); + } + } + } + +#.FN_BODY DLDedicatedMessageSegment-r16-IEs/segmentNumber-r16 VAL_PTR=&value + uint32_t value; +%(DEFAULT_BODY)s + nr_rrc_get_private_data(actx)->dcch_segment_number = value; + +#.FN_BODY DLDedicatedMessageSegment-r16-IEs/rrc-MessageSegmentContainer-r16 VAL_PTR=&segment + tvbuff_t *segment; +%(DEFAULT_BODY)s + nr_rrc_get_private_data(actx)->dcch_segment = segment; + +#.FN_BODY DLDedicatedMessageSegment-r16-IEs/rrc-MessageSegmentType-r16 VAL_PTR=&value + uint32_t value; +%(DEFAULT_BODY)s + nr_rrc_get_private_data(actx)->dcch_segment_last = (value > 0) ? true : false; + +#.FN_FTR ULDedicatedMessageSegment-r16-IEs + if (nr_rrc_reassemble_dcch_segments) { + uint16_t *p_ueid = nr_rrc_get_ueid_from_lower_layers(wmem_file_scope(), actx->pinfo); + uint32_t ueid, id, count; + fragment_head *frag_data; + tvbuff_t *reassembled_tvb; + wmem_tree_key_t key[3]; + nr_rrc_private_data_t *nr_priv = nr_rrc_get_private_data(actx); + + if (p_ueid != NULL) { + ueid = *p_ueid; + } else { + ueid = 0; + } + key[0].length = 1; + key[0].key = &ueid; + key[1].length = 1; + key[1].key = &actx->pinfo->num; + key[2].length = 0; + key[2].key = NULL; + if (!PINFO_FD_VISITED(actx->pinfo)) { + void *value; + + if (wmem_map_lookup_extended(nr_rrc_dcch_segment_ueid_count_hash, GUINT_TO_POINTER(ueid<<16), NULL, &value)) { + count = GPOINTER_TO_UINT(value); + } else { + count = 0; + } + if (nr_priv->dcch_segment_number == 0) { + /* new segmented message */ + count++; + wmem_map_insert(nr_rrc_dcch_segment_ueid_count_hash, GUINT_TO_POINTER(ueid<<16), GUINT_TO_POINTER(count)); + } + id = (ueid<<16)|(count&0x7fff); + wmem_tree_insert32_array(nr_rrc_dcch_segment_id_tree, key, GUINT_TO_POINTER(id)); + } else { + id = GPOINTER_TO_UINT(wmem_tree_lookup32_array(nr_rrc_dcch_segment_id_tree, key)); + } + if (nr_priv->dcch_segment != NULL) { + frag_data = fragment_add_seq_check(&nr_rrc_dcch_segment_reassembly_table, nr_priv->dcch_segment, 0, actx->pinfo, + id, NULL, nr_priv->dcch_segment_number, + tvb_reported_length(nr_priv->dcch_segment), + !nr_priv->dcch_segment_last); + reassembled_tvb = process_reassembled_data(nr_priv->dcch_segment, 0, actx->pinfo, "Reassembled UL Dedicated Message", + frag_data, &nr_rrc_dcch_segment_frag_items, NULL, tree); + if (reassembled_tvb) { + dissect_nr_rrc_UL_DCCH_Message_PDU(reassembled_tvb, actx->pinfo, tree, NULL); + } + } + } + +#.FN_BODY ULDedicatedMessageSegment-r16-IEs/segmentNumber-r16 VAL_PTR=&value + uint32_t value; +%(DEFAULT_BODY)s + nr_rrc_get_private_data(actx)->dcch_segment_number = value; + +#.FN_BODY ULDedicatedMessageSegment-r16-IEs/rrc-MessageSegmentContainer-r16 VAL_PTR=&segment + tvbuff_t *segment; +%(DEFAULT_BODY)s + nr_rrc_get_private_data(actx)->dcch_segment = segment; + +#.FN_BODY ULDedicatedMessageSegment-r16-IEs/rrc-MessageSegmentType-r16 VAL_PTR=&value + uint32_t value; +%(DEFAULT_BODY)s + nr_rrc_get_private_data(actx)->dcch_segment_last = (value > 0) ? true : false; + #.FN_HDR SBCCH-SL-BCH-Message proto_item *ti; @@ -2319,6 +2627,24 @@ TimeBetweenEvent-r17 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_millisecon #.FN_HDR UECapabilityInformationSidelink col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UE Capability Information Sidelink"); +#.FN_HDR UuMessageTransferSidelink-r17 + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Uu Message Transfer Sidelink"); + +#.FN_HDR RemoteUEInformationSidelink-r17 + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Remote UE Information Sidelink"); + +#.FN_HDR NotificationMessageSidelink-r17 + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Notification Message Sidelink"); + +#.FN_HDR UEAssistanceInformationSidelink-r17 + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UE Assistance Information Sidelink"); + +#.FN_HDR UEInformationRequestSidelink-r18 + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UE Information Request Sidelink"); + +#.FN_HDR UEInformationResponseSidelink-r18 + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "UE Information Response Sidelink"); + #.FN_HDR MCCH-Message-r17 proto_item *ti; @@ -2330,3 +2656,15 @@ TimeBetweenEvent-r17 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_millisecon #.FN_HDR MBSBroadcastConfiguration-r17 col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MBS Broadcast Configuration"); + +#.FN_HDR MulticastMCCH-MessageType-r18 + proto_item *ti; + + col_set_str(actx->pinfo->cinfo, COL_PROTOCOL, "NR RRC"); + col_clear(actx->pinfo->cinfo, COL_INFO); + + ti = proto_tree_add_item(tree, proto_nr_rrc, tvb, 0, -1, ENC_NA); + tree = proto_item_add_subtree(ti, ett_nr_rrc); + +#.FN_HDR MBSMulticastConfiguration-r18 + col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "MBS Multicast Configuration"); diff --git a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c index 88f72f7a..b8612a1e 100644 --- a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c +++ b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.c @@ -1,8 +1,8 @@ /* packet-nr-rrc-template.c * NR; * Radio Resource Control (RRC) protocol specification - * (3GPP TS 38.331 V17.5.0 Release 17) packet dissection - * Copyright 2018-2023, Pascal Quantin + * (3GPP TS 38.331 V18.2.0 Release 18) packet dissection + * Copyright 2018-2024, Pascal Quantin * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> @@ -23,6 +23,10 @@ #include <epan/show_exception.h> #include <epan/proto_data.h> #include <epan/prefs.h> +#include <epan/tfs.h> +#include <epan/unit_strings.h> + +#include <wsutil/array.h> #include <wsutil/str_util.h> #include <wsutil/epochs.h> @@ -46,121 +50,141 @@ void proto_register_nr_rrc(void); void proto_reg_handoff_nr_rrc(void); -static dissector_handle_t nas_5gs_handle = NULL; -static dissector_handle_t lte_rrc_conn_reconf_handle = NULL; -static dissector_handle_t lte_rrc_conn_reconf_compl_handle = NULL; -static dissector_handle_t lte_rrc_ul_dcch_handle = NULL; -static dissector_handle_t lte_rrc_dl_dcch_handle = NULL; +static dissector_handle_t nas_5gs_handle; +static dissector_handle_t lte_rrc_conn_reconf_handle; +static dissector_handle_t lte_rrc_conn_reconf_compl_handle; +static dissector_handle_t lte_rrc_ul_dcch_handle; +static dissector_handle_t lte_rrc_dl_dcch_handle; + +static wmem_map_t *nr_rrc_etws_cmas_dcs_hash; -static wmem_map_t *nr_rrc_etws_cmas_dcs_hash = NULL; +static wmem_map_t *nr_rrc_dcch_segment_ueid_count_hash; +static wmem_tree_t *nr_rrc_dcch_segment_id_tree; static reassembly_table nr_rrc_sib7_reassembly_table; static reassembly_table nr_rrc_sib8_reassembly_table; +static reassembly_table nr_rrc_dcch_segment_reassembly_table; -static gboolean nr_rrc_nas_in_root_tree; +static bool nr_rrc_nas_in_root_tree; +static bool nr_rrc_reassemble_dcch_segments; extern int proto_mac_nr; +extern int proto_rlc_nr; extern int proto_pdcp_nr; /* Include constants */ #include "packet-nr-rrc-val.h" /* Initialize the protocol and registered fields */ -static int proto_nr_rrc = -1; +static int proto_nr_rrc; #include "packet-nr-rrc-hf.c" -static int hf_nr_rrc_serialNumber_gs = -1; -static int hf_nr_rrc_serialNumber_msg_code = -1; -static int hf_nr_rrc_serialNumber_upd_nb = -1; -static int hf_nr_rrc_warningType_value = -1; -static int hf_nr_rrc_warningType_emergency_user_alert = -1; -static int hf_nr_rrc_warningType_popup = -1; -static int hf_nr_rrc_warningMessageSegment_nb_pages = -1; -static int hf_nr_rrc_warningMessageSegment_decoded_page = -1; -static int hf_nr_rrc_sib7_fragments = -1; -static int hf_nr_rrc_sib7_fragment = -1; -static int hf_nr_rrc_sib7_fragment_overlap = -1; -static int hf_nr_rrc_sib7_fragment_overlap_conflict = -1; -static int hf_nr_rrc_sib7_fragment_multiple_tails = -1; -static int hf_nr_rrc_sib7_fragment_too_long_fragment = -1; -static int hf_nr_rrc_sib7_fragment_error = -1; -static int hf_nr_rrc_sib7_fragment_count = -1; -static int hf_nr_rrc_sib7_reassembled_in = -1; -static int hf_nr_rrc_sib7_reassembled_length = -1; -static int hf_nr_rrc_sib7_reassembled_data = -1; -static int hf_nr_rrc_sib8_fragments = -1; -static int hf_nr_rrc_sib8_fragment = -1; -static int hf_nr_rrc_sib8_fragment_overlap = -1; -static int hf_nr_rrc_sib8_fragment_overlap_conflict = -1; -static int hf_nr_rrc_sib8_fragment_multiple_tails = -1; -static int hf_nr_rrc_sib8_fragment_too_long_fragment = -1; -static int hf_nr_rrc_sib8_fragment_error = -1; -static int hf_nr_rrc_sib8_fragment_count = -1; -static int hf_nr_rrc_sib8_reassembled_in = -1; -static int hf_nr_rrc_sib8_reassembled_length = -1; -static int hf_nr_rrc_sib8_reassembled_data = -1; -static int hf_nr_rrc_utc_time = -1; -static int hf_nr_rrc_local_time = -1; -static int hf_nr_rrc_absolute_time = -1; +static int hf_nr_rrc_serialNumber_gs; +static int hf_nr_rrc_serialNumber_msg_code; +static int hf_nr_rrc_serialNumber_upd_nb; +static int hf_nr_rrc_warningType_value; +static int hf_nr_rrc_warningType_emergency_user_alert; +static int hf_nr_rrc_warningType_popup; +static int hf_nr_rrc_warningMessageSegment_nb_pages; +static int hf_nr_rrc_warningMessageSegment_decoded_page; +static int hf_nr_rrc_sib7_fragments; +static int hf_nr_rrc_sib7_fragment; +static int hf_nr_rrc_sib7_fragment_overlap; +static int hf_nr_rrc_sib7_fragment_overlap_conflict; +static int hf_nr_rrc_sib7_fragment_multiple_tails; +static int hf_nr_rrc_sib7_fragment_too_long_fragment; +static int hf_nr_rrc_sib7_fragment_error; +static int hf_nr_rrc_sib7_fragment_count; +static int hf_nr_rrc_sib7_reassembled_in; +static int hf_nr_rrc_sib7_reassembled_length; +static int hf_nr_rrc_sib7_reassembled_data; +static int hf_nr_rrc_sib8_fragments; +static int hf_nr_rrc_sib8_fragment; +static int hf_nr_rrc_sib8_fragment_overlap; +static int hf_nr_rrc_sib8_fragment_overlap_conflict; +static int hf_nr_rrc_sib8_fragment_multiple_tails; +static int hf_nr_rrc_sib8_fragment_too_long_fragment; +static int hf_nr_rrc_sib8_fragment_error; +static int hf_nr_rrc_sib8_fragment_count; +static int hf_nr_rrc_sib8_reassembled_in; +static int hf_nr_rrc_sib8_reassembled_length; +static int hf_nr_rrc_sib8_reassembled_data; +static int hf_nr_rrc_dcch_segment_fragments; +static int hf_nr_rrc_dcch_segment_fragment; +static int hf_nr_rrc_dcch_segment_fragment_overlap; +static int hf_nr_rrc_dcch_segment_fragment_overlap_conflict; +static int hf_nr_rrc_dcch_segment_fragment_multiple_tails; +static int hf_nr_rrc_dcch_segment_fragment_too_long_fragment; +static int hf_nr_rrc_dcch_segment_fragment_error; +static int hf_nr_rrc_dcch_segment_fragment_count; +static int hf_nr_rrc_dcch_segment_reassembled_in; +static int hf_nr_rrc_dcch_segment_reassembled_length; +static int hf_nr_rrc_dcch_segment_reassembled_data; +static int hf_nr_rrc_utc_time; +static int hf_nr_rrc_local_time; +static int hf_nr_rrc_absolute_time; /* Initialize the subtree pointers */ -static gint ett_nr_rrc = -1; +static int ett_nr_rrc; #include "packet-nr-rrc-ett.c" -static gint ett_nr_rrc_DedicatedNAS_Message = -1; -static gint ett_nr_rrc_targetRAT_MessageContainer = -1; -static gint ett_nr_rrc_nas_Container = -1; -static gint ett_nr_rrc_serialNumber = -1; -static gint ett_nr_rrc_warningType = -1; -static gint ett_nr_rrc_dataCodingScheme = -1; -static gint ett_nr_rrc_sib7_fragment = -1; -static gint ett_nr_rrc_sib7_fragments = -1; -static gint ett_nr_rrc_sib8_fragment = -1; -static gint ett_nr_rrc_sib8_fragments = -1; -static gint ett_nr_rrc_warningMessageSegment = -1; -static gint ett_nr_rrc_timeInfo = -1; -static gint ett_nr_rrc_capabilityRequestFilter = -1; -static gint ett_nr_rrc_sourceSCG_EUTRA_Config = -1; -static gint ett_nr_rrc_scg_CellGroupConfigEUTRA = -1; -static gint ett_nr_rrc_candidateCellInfoListSN_EUTRA = -1; -static gint ett_nr_rrc_candidateCellInfoListMN_EUTRA = -1; -static gint ett_nr_rrc_sourceConfigSCG_EUTRA = -1; -static gint ett_nr_rrc_eutra_SCG = -1; -static gint ett_nr_rrc_nr_SCG_Response = -1; -static gint ett_nr_rrc_eutra_SCG_Response = -1; -static gint ett_nr_rrc_measResultSCG_FailureMRDC = -1; -static gint ett_nr_rrc_ul_DCCH_MessageNR = -1; -static gint ett_nr_rrc_ul_DCCH_MessageEUTRA = -1; -static gint ett_rr_rrc_nas_SecurityParamFromNR = -1; -static gint ett_nr_rrc_sidelinkUEInformationNR = -1; -static gint ett_nr_rrc_sidelinkUEInformationEUTRA = -1; -static gint ett_nr_rrc_ueAssistanceInformationEUTRA = -1; -static gint ett_nr_rrc_dl_DCCH_MessageNR = -1; -static gint ett_nr_rrc_dl_DCCH_MessageEUTRA = -1; -static gint ett_nr_rrc_sl_ConfigDedicatedEUTRA = -1; -static gint ett_nr_rrc_sl_CapabilityInformationSidelink = -1; -static gint ett_nr_rrc_measResult_RLF_Report_EUTRA = -1; -static gint ett_nr_rrc_measResult_RLF_Report_EUTRA_v1690 = -1; -static gint ett_nr_rrc_locationTimestamp_r16 = -1; -static gint ett_nr_rrc_locationCoordinate_r16 = -1; -static gint ett_nr_rrc_locationError_r16 = -1; -static gint ett_nr_rrc_locationSource_r16 = -1; -static gint ett_nr_rrc_velocityEstimate_r16 = -1; -static gint ett_nr_rrc_sensor_MeasurementInformation_r16 = -1; -static gint ett_nr_rrc_sensor_MotionInformation_r16 = -1; -static gint ett_nr_rrc_bandParametersSidelinkEUTRA1_r16 = -1; -static gint ett_nr_rrc_bandParametersSidelinkEUTRA2_r16 = -1; -static gint ett_nr_rrc_sl_ParametersEUTRA1_r16 = -1; -static gint ett_nr_rrc_sl_ParametersEUTRA2_r16 = -1; -static gint ett_nr_rrc_sl_ParametersEUTRA3_r16 = -1; -static gint ett_nr_rrc_absTimeInfo = -1; -static gint ett_nr_rrc_assistanceDataSIB_Element_r16 = -1; -static gint ett_nr_sl_V2X_ConfigCommon_r16 = -1; -static gint ett_nr_tdd_Config_r16 = -1; -static gint ett_nr_coarseLocationInfo_r17 = -1; -static gint ett_nr_sl_MeasResultsCandRelay_r17 = -1; -static gint ett_nr_sl_MeasResultServingRelay_r17 = -1; -static gint ett_nr_ReferenceLocation_r17 = -1; - -static expert_field ei_nr_rrc_number_pages_le15 = EI_INIT; +static int ett_nr_rrc_DedicatedNAS_Message; +static int ett_nr_rrc_targetRAT_MessageContainer; +static int ett_nr_rrc_nas_Container; +static int ett_nr_rrc_serialNumber; +static int ett_nr_rrc_warningType; +static int ett_nr_rrc_dataCodingScheme; +static int ett_nr_rrc_sib7_fragment; +static int ett_nr_rrc_sib7_fragments; +static int ett_nr_rrc_sib8_fragment; +static int ett_nr_rrc_sib8_fragments; +static int ett_nr_rrc_dcch_segment_fragment; +static int ett_nr_rrc_dcch_segment_fragments; +static int ett_nr_rrc_warningMessageSegment; +static int ett_nr_rrc_timeInfo; +static int ett_nr_rrc_capabilityRequestFilter; +static int ett_nr_rrc_sourceSCG_EUTRA_Config; +static int ett_nr_rrc_scg_CellGroupConfigEUTRA; +static int ett_nr_rrc_candidateCellInfoListSN_EUTRA; +static int ett_nr_rrc_candidateCellInfoListMN_EUTRA; +static int ett_nr_rrc_sourceConfigSCG_EUTRA; +static int ett_nr_rrc_eutra_SCG; +static int ett_nr_rrc_nr_SCG_Response; +static int ett_nr_rrc_eutra_SCG_Response; +static int ett_nr_rrc_measResultSCG_FailureMRDC; +static int ett_nr_rrc_ul_DCCH_MessageNR; +static int ett_nr_rrc_ul_DCCH_MessageEUTRA; +static int ett_rr_rrc_nas_SecurityParamFromNR; +static int ett_nr_rrc_sidelinkUEInformationNR; +static int ett_nr_rrc_sidelinkUEInformationEUTRA; +static int ett_nr_rrc_ueAssistanceInformationEUTRA; +static int ett_nr_rrc_dl_DCCH_MessageNR; +static int ett_nr_rrc_dl_DCCH_MessageEUTRA; +static int ett_nr_rrc_sl_ConfigDedicatedEUTRA; +static int ett_nr_rrc_sl_CapabilityInformationSidelink; +static int ett_nr_rrc_measResult_RLF_Report_EUTRA; +static int ett_nr_rrc_measResult_RLF_Report_EUTRA_v1690; +static int ett_nr_rrc_locationTimestamp_r16; +static int ett_nr_rrc_locationCoordinate_r16; +static int ett_nr_rrc_locationError_r16; +static int ett_nr_rrc_locationSource_r16; +static int ett_nr_rrc_velocityEstimate_r16; +static int ett_nr_rrc_sensor_MeasurementInformation_r16; +static int ett_nr_rrc_sensor_MotionInformation_r16; +static int ett_nr_rrc_bandParametersSidelinkEUTRA1_r16; +static int ett_nr_rrc_bandParametersSidelinkEUTRA2_r16; +static int ett_nr_rrc_sl_ParametersEUTRA1_r16; +static int ett_nr_rrc_sl_ParametersEUTRA2_r16; +static int ett_nr_rrc_sl_ParametersEUTRA3_r16; +static int ett_nr_rrc_absTimeInfo; +static int ett_nr_rrc_assistanceDataSIB_Element_r16; +static int ett_nr_rrc_sl_V2X_ConfigCommon_r16; +static int ett_nr_rrc_tdd_Config_r16; +static int ett_nr_rrc_coarseLocationInfo_r17; +static int ett_nr_rrc_sl_MeasResultsCandRelay_r17; +static int ett_nr_rrc_sl_MeasResultServingRelay_r17; +static int ett_nr_rrc_ReferenceLocation_r17; +static int ett_nr_rrc_wayPointLocation_r18; + +static expert_field ei_nr_rrc_number_pages_le15; /* Forward declarations */ static int dissect_UECapabilityInformationSidelink_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_); @@ -176,17 +200,43 @@ static const unit_name_string units_prbs = { " PRB", " PRBs" }; static const unit_name_string units_slots = { " slot", " slots" }; typedef struct { - guint8 rat_type; - guint8 target_rat_type; - guint16 message_identifier; - guint8 warning_message_segment_type; - guint8 warning_message_segment_number; + uint8_t rat_type; + uint8_t target_rat_type; + uint16_t message_identifier; + uint8_t warning_message_segment_type; + uint8_t warning_message_segment_number; nr_drb_mac_rlc_mapping_t drb_rlc_mapping; nr_drb_rlc_pdcp_mapping_t drb_pdcp_mapping; lpp_pos_sib_type_t pos_sib_type; pdcp_nr_security_info_t pdcp_security; + uint8_t dcch_segment_number; + tvbuff_t *dcch_segment; + bool dcch_segment_last; } nr_rrc_private_data_t; +/* Helper function to get UE identifier from lower layers (in order MAC, RLC, PDCP) */ +static uint16_t* +nr_rrc_get_ueid_from_lower_layers(wmem_allocator_t *scope, struct _packet_info* pinfo) +{ + /* Try MAC first */ + mac_nr_info *p_mac_nr_info = (mac_nr_info *)p_get_proto_data(scope, pinfo, proto_mac_nr, 0); + if (p_mac_nr_info != NULL) { + return &p_mac_nr_info->ueid; + } + /* Not found, try RLC */ + rlc_nr_info *p_rlc_nr_info = (rlc_nr_info *)p_get_proto_data(scope, pinfo, proto_rlc_nr, 0); + if (p_rlc_nr_info != NULL) { + return &p_rlc_nr_info->ueid; + } + /* Not found, try PDCP */ + pdcp_nr_info *p_pdcp_nr_info = (pdcp_nr_info *)p_get_proto_data(scope, pinfo, proto_pdcp_nr, 0); + if (p_pdcp_nr_info != NULL) { + return &p_pdcp_nr_info->ueid; + } + /* Nothing found, give up */ + return NULL; +} + /* Helper function to get or create a struct that will be actx->private_data */ static nr_rrc_private_data_t* nr_rrc_get_private_data(asn1_ctx_t *actx) @@ -211,9 +261,9 @@ nr_rrc_call_dissector(dissector_handle_t handle, tvbuff_t *tvb, packet_info *pin } static void -nr_rrc_q_RxLevMin_fmt(gchar *s, guint32 v) +nr_rrc_q_RxLevMin_fmt(char *s, uint32_t v) { - gint32 d = (gint32)v; + int32_t d = (int32_t)v; snprintf(s, ITEM_LABEL_LENGTH, "%d dB (%d)", 2*d, d); } @@ -236,49 +286,66 @@ static const value_string nr_rrc_warningType_vals[] = { }; static const fragment_items nr_rrc_sib7_frag_items = { - &ett_nr_rrc_sib7_fragment, - &ett_nr_rrc_sib7_fragments, - &hf_nr_rrc_sib7_fragments, - &hf_nr_rrc_sib7_fragment, - &hf_nr_rrc_sib7_fragment_overlap, - &hf_nr_rrc_sib7_fragment_overlap_conflict, - &hf_nr_rrc_sib7_fragment_multiple_tails, - &hf_nr_rrc_sib7_fragment_too_long_fragment, - &hf_nr_rrc_sib7_fragment_error, - &hf_nr_rrc_sib7_fragment_count, - &hf_nr_rrc_sib7_reassembled_in, - &hf_nr_rrc_sib7_reassembled_length, - &hf_nr_rrc_sib7_reassembled_data, - "SIB7 warning message segments" + &ett_nr_rrc_sib7_fragment, + &ett_nr_rrc_sib7_fragments, + &hf_nr_rrc_sib7_fragments, + &hf_nr_rrc_sib7_fragment, + &hf_nr_rrc_sib7_fragment_overlap, + &hf_nr_rrc_sib7_fragment_overlap_conflict, + &hf_nr_rrc_sib7_fragment_multiple_tails, + &hf_nr_rrc_sib7_fragment_too_long_fragment, + &hf_nr_rrc_sib7_fragment_error, + &hf_nr_rrc_sib7_fragment_count, + &hf_nr_rrc_sib7_reassembled_in, + &hf_nr_rrc_sib7_reassembled_length, + &hf_nr_rrc_sib7_reassembled_data, + "SIB7 warning message segments" }; static const fragment_items nr_rrc_sib8_frag_items = { - &ett_nr_rrc_sib8_fragment, - &ett_nr_rrc_sib8_fragments, - &hf_nr_rrc_sib8_fragments, - &hf_nr_rrc_sib8_fragment, - &hf_nr_rrc_sib8_fragment_overlap, - &hf_nr_rrc_sib8_fragment_overlap_conflict, - &hf_nr_rrc_sib8_fragment_multiple_tails, - &hf_nr_rrc_sib8_fragment_too_long_fragment, - &hf_nr_rrc_sib8_fragment_error, - &hf_nr_rrc_sib8_fragment_count, - &hf_nr_rrc_sib8_reassembled_in, - &hf_nr_rrc_sib8_reassembled_length, - &hf_nr_rrc_sib8_reassembled_data, - "SIB8 warning message segments" + &ett_nr_rrc_sib8_fragment, + &ett_nr_rrc_sib8_fragments, + &hf_nr_rrc_sib8_fragments, + &hf_nr_rrc_sib8_fragment, + &hf_nr_rrc_sib8_fragment_overlap, + &hf_nr_rrc_sib8_fragment_overlap_conflict, + &hf_nr_rrc_sib8_fragment_multiple_tails, + &hf_nr_rrc_sib8_fragment_too_long_fragment, + &hf_nr_rrc_sib8_fragment_error, + &hf_nr_rrc_sib8_fragment_count, + &hf_nr_rrc_sib8_reassembled_in, + &hf_nr_rrc_sib8_reassembled_length, + &hf_nr_rrc_sib8_reassembled_data, + "SIB8 warning message segments" +}; + +static const fragment_items nr_rrc_dcch_segment_frag_items = { + &ett_nr_rrc_dcch_segment_fragment, + &ett_nr_rrc_dcch_segment_fragments, + &hf_nr_rrc_dcch_segment_fragments, + &hf_nr_rrc_dcch_segment_fragment, + &hf_nr_rrc_dcch_segment_fragment_overlap, + &hf_nr_rrc_dcch_segment_fragment_overlap_conflict, + &hf_nr_rrc_dcch_segment_fragment_multiple_tails, + &hf_nr_rrc_dcch_segment_fragment_too_long_fragment, + &hf_nr_rrc_dcch_segment_fragment_error, + &hf_nr_rrc_dcch_segment_fragment_count, + &hf_nr_rrc_dcch_segment_reassembled_in, + &hf_nr_rrc_dcch_segment_reassembled_length, + &hf_nr_rrc_dcch_segment_reassembled_data, + "DCCH message segments" }; static void -dissect_nr_rrc_warningMessageSegment(tvbuff_t *warning_msg_seg_tvb, proto_tree *tree, packet_info *pinfo, guint8 dataCodingScheme) +dissect_nr_rrc_warningMessageSegment(tvbuff_t *warning_msg_seg_tvb, proto_tree *tree, packet_info *pinfo, uint8_t dataCodingScheme) { - guint32 offset; - guint8 nb_of_pages, length, *str; + uint32_t offset; + uint8_t nb_of_pages, length, *str; proto_item *ti; tvbuff_t *cb_data_page_tvb, *cb_data_tvb; int i; - nb_of_pages = tvb_get_guint8(warning_msg_seg_tvb, 0); + nb_of_pages = tvb_get_uint8(warning_msg_seg_tvb, 0); ti = proto_tree_add_uint(tree, hf_nr_rrc_warningMessageSegment_nb_pages, warning_msg_seg_tvb, 0, 1, nb_of_pages); if (nb_of_pages > 15) { expert_add_info_format(pinfo, ti, &ei_nr_rrc_number_pages_le15, @@ -286,7 +353,7 @@ dissect_nr_rrc_warningMessageSegment(tvbuff_t *warning_msg_seg_tvb, proto_tree * nb_of_pages = 15; } for (i = 0, offset = 1; i < nb_of_pages; i++) { - length = tvb_get_guint8(warning_msg_seg_tvb, offset+82); + length = tvb_get_uint8(warning_msg_seg_tvb, offset+82); cb_data_page_tvb = tvb_new_subset_length(warning_msg_seg_tvb, offset, length); cb_data_tvb = dissect_cbs_data(dataCodingScheme, cb_data_page_tvb, tree, pinfo, 0); if (cb_data_tvb) { @@ -307,9 +374,9 @@ static const value_string nr_rrc_daylightSavingTime_vals[] = { }; static void -nr_rrc_localTimeOffset_fmt(gchar *s, guint32 v) +nr_rrc_localTimeOffset_fmt(char *s, uint32_t v) { - gint32 time_offset = (gint32) v; + int32_t time_offset = (int32_t) v; snprintf(s, ITEM_LABEL_LENGTH, "UTC time %c %dhr %dmin (%d)", (time_offset < 0) ? '-':'+', abs(time_offset) >> 2, @@ -317,35 +384,35 @@ nr_rrc_localTimeOffset_fmt(gchar *s, guint32 v) } static void -nr_rrc_drx_SlotOffset_fmt(gchar *s, guint32 v) +nr_rrc_drx_SlotOffset_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%g ms (%u)", 1./32 * v, v); } static void -nr_rrc_Hysteresis_fmt(gchar *s, guint32 v) +nr_rrc_Hysteresis_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%gdB (%u)", 0.5 * v, v); } static void -nr_rrc_msg3_DeltaPreamble_fmt(gchar *s, guint32 v) +nr_rrc_msg3_DeltaPreamble_fmt(char *s, uint32_t v) { - gint32 d = (gint32)v; + int32_t d = (int32_t)v; snprintf(s, ITEM_LABEL_LENGTH, "%ddB (%d)", 2 * d, d); } static void -nr_rrc_Q_RxLevMin_fmt(gchar *s, guint32 v) +nr_rrc_Q_RxLevMin_fmt(char *s, uint32_t v) { - gint32 d = (gint32)v; + int32_t d = (int32_t)v; snprintf(s, ITEM_LABEL_LENGTH, "%ddBm (%d)", 2 * d, d); } static void -nr_rrc_RSRP_RangeEUTRA_fmt(gchar *s, guint32 v) +nr_rrc_RSRP_RangeEUTRA_fmt(char *s, uint32_t v) { if (v == 0) { snprintf(s, ITEM_LABEL_LENGTH, "RSRP < -140dBm (0)"); @@ -357,7 +424,7 @@ nr_rrc_RSRP_RangeEUTRA_fmt(gchar *s, guint32 v) } static void -nr_rrc_RSRQ_RangeEUTRA_fmt(gchar *s, guint32 v) +nr_rrc_RSRQ_RangeEUTRA_fmt(char *s, uint32_t v) { if (v == 0) { snprintf(s, ITEM_LABEL_LENGTH, "RSRQ < -19.5dB (0)"); @@ -369,7 +436,7 @@ nr_rrc_RSRQ_RangeEUTRA_fmt(gchar *s, guint32 v) } static void -nr_rrc_SINR_RangeEUTRA_fmt(gchar *s, guint32 v) +nr_rrc_SINR_RangeEUTRA_fmt(char *s, uint32_t v) { if (v == 0) { snprintf(s, ITEM_LABEL_LENGTH, "SINR < -23dB (0)"); @@ -381,13 +448,13 @@ nr_rrc_SINR_RangeEUTRA_fmt(gchar *s, guint32 v) } static void -nr_rrc_ReselectionThreshold_fmt(gchar *s, guint32 v) +nr_rrc_ReselectionThreshold_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%udB (%u)", 2 * v, v); } static void -nr_rrc_RSRP_Range_fmt(gchar *s, guint32 v) +nr_rrc_RSRP_Range_fmt(char *s, uint32_t v) { if (v == 0) { snprintf(s, ITEM_LABEL_LENGTH, "SS-RSRP < -156dBm (0)"); @@ -401,7 +468,7 @@ nr_rrc_RSRP_Range_fmt(gchar *s, guint32 v) } static void -nr_rrc_RSRQ_Range_fmt(gchar *s, guint32 v) +nr_rrc_RSRQ_Range_fmt(char *s, uint32_t v) { if (v == 0) { snprintf(s, ITEM_LABEL_LENGTH, "SS-RSRQ < -43dB (0)"); @@ -413,7 +480,7 @@ nr_rrc_RSRQ_Range_fmt(gchar *s, guint32 v) } static void -nr_rrc_SINR_Range_fmt(gchar *s, guint32 v) +nr_rrc_SINR_Range_fmt(char *s, uint32_t v) { if (v == 0) { snprintf(s, ITEM_LABEL_LENGTH, "SS-SINR < -23dB (0)"); @@ -425,19 +492,19 @@ nr_rrc_SINR_Range_fmt(gchar *s, guint32 v) } static void -nr_rrc_dl_1024QAM_TotalWeightedLayers_fmt(gchar *s, guint32 v) +nr_rrc_dl_1024QAM_TotalWeightedLayers_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%u (%u)", 10+(2*v), v); } static void -nr_rrc_timeConnFailure_r16_fmt(gchar *s, guint32 v) +nr_rrc_timeConnFailure_r16_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%ums (%u)", 100*v, v); } static void -nr_rrc_RSSI_Range_r16_fmt(gchar *s, guint32 v) +nr_rrc_RSSI_Range_r16_fmt(char *s, uint32_t v) { if (v == 0) { snprintf(s, ITEM_LABEL_LENGTH, "RSSI < -100dBm (0)"); @@ -449,9 +516,9 @@ nr_rrc_RSSI_Range_r16_fmt(gchar *s, guint32 v) } static void -nr_rrc_RSRQ_RangeEUTRA_r16_fmt(gchar *s, guint32 v) +nr_rrc_RSRQ_RangeEUTRA_r16_fmt(char *s, uint32_t v) { - gint32 d = (gint32)v; + int32_t d = (int32_t)v; if (d == -34) { snprintf(s, ITEM_LABEL_LENGTH, "RSRQ < -36dB (-34)"); @@ -471,9 +538,9 @@ nr_rrc_RSRQ_RangeEUTRA_r16_fmt(gchar *s, guint32 v) } static void -nr_rrc_utra_FDD_RSCP_r16_fmt(gchar *s, guint32 v) +nr_rrc_utra_FDD_RSCP_r16_fmt(char *s, uint32_t v) { - gint32 d = (gint32)v; + int32_t d = (int32_t)v; if (d == -5) { snprintf(s, ITEM_LABEL_LENGTH, "RSCP < -120dBm (-5)"); @@ -485,7 +552,7 @@ nr_rrc_utra_FDD_RSCP_r16_fmt(gchar *s, guint32 v) } static void -nr_rrc_utra_FDD_EcN0_r16_fmt(gchar *s, guint32 v) +nr_rrc_utra_FDD_EcN0_r16_fmt(char *s, uint32_t v) { if (v == 0) { snprintf(s, ITEM_LABEL_LENGTH, "Ec/No < -24dB (0)"); @@ -497,27 +564,27 @@ nr_rrc_utra_FDD_EcN0_r16_fmt(gchar *s, guint32 v) } static void -nr_rrc_averageDelay_r16_fmt(gchar *s, guint32 v) +nr_rrc_averageDelay_r16_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%.1fms (%u)", (float)v/10, v); } static void -nr_rrc_measTriggerQuantity_utra_FDD_RSCP_r16_fmt(gchar *s, guint32 v) +nr_rrc_measTriggerQuantity_utra_FDD_RSCP_r16_fmt(char *s, uint32_t v) { - gint32 d = (gint32)v; + int32_t d = (int32_t)v; snprintf(s, ITEM_LABEL_LENGTH, "%ddBm (%d)", d-115, d); } static void -nr_rrc_measTriggerQuantity_utra_FDD_EcN0_r16_fmt(gchar *s, guint32 v) +nr_rrc_measTriggerQuantity_utra_FDD_EcN0_r16_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB (%u)", (float)v/2-24.5, v); } static void -nr_rrc_SRS_RSRP_r16_fmt(gchar *s, guint32 v) +nr_rrc_SRS_RSRP_r16_fmt(char *s, uint32_t v) { if (v == 0) { snprintf(s, ITEM_LABEL_LENGTH, "SRS-RSRP < -140dBm (0)"); @@ -531,19 +598,25 @@ nr_rrc_SRS_RSRP_r16_fmt(gchar *s, guint32 v) } static void -nr_rrc_MeasTriggerQuantityOffset_fmt(gchar *s, guint32 v) +nr_rrc_MeasTriggerQuantityOffset_fmt(char *s, uint32_t v) { - gint32 d = (gint32)v; + int32_t d = (int32_t)v; snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB (%d)", (float)d/2, d); } static void -nr_rrc_TimeSinceCHO_Reconfig_r17_fmt(gchar *s, guint32 v) +nr_rrc_TimeSinceCHO_Reconfig_r17_fmt(char *s, uint32_t v) { snprintf(s, ITEM_LABEL_LENGTH, "%.1fs (%u)", (float)v/10, v); } +static void +nr_rrc_FlightPathUpdateDistanceThr_r18_fmt(char *s, uint32_t v) +{ + snprintf(s, ITEM_LABEL_LENGTH, "%um (%u)", v*5, v); +} + static int dissect_nr_rrc_cg_configinfo_msg(tvbuff_t* tvb _U_, packet_info* pinfo _U_, proto_tree* tree _U_, void* data _U_) { @@ -796,7 +869,7 @@ dissect_nr_rrc_nr_RLF_Report_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, false, pinfo); offset = dissect_nr_rrc_T_nr_RLF_Report_r16(tvb, offset, &asn1_ctx, tree, hf_nr_rrc_BCCH_DL_SCH_Message_PDU); offset += 7; offset >>= 3; return offset; @@ -808,7 +881,7 @@ dissect_nr_rrc_subCarrierSpacingCommon_PDU(tvbuff_t *tvb _U_, packet_info *pinfo proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, false, pinfo); offset = dissect_nr_rrc_T_subCarrierSpacingCommon(tvb, offset, &asn1_ctx, tree, hf_nr_rrc_BCCH_DL_SCH_Message_PDU); offset += 7; offset >>= 3; return offset; @@ -820,7 +893,7 @@ dissect_nr_rrc_rach_ConfigCommonIAB_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinf proto_item_set_hidden(prot_ti); int offset = 0; asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, FALSE, pinfo); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, false, pinfo); offset = dissect_nr_rrc_T_rach_ConfigCommonIAB_r16(tvb, offset, &asn1_ctx, tree, hf_nr_rrc_BCCH_DL_SCH_Message_PDU); offset += 7; offset >>= 3; return offset; @@ -954,6 +1027,50 @@ proto_register_nr_rrc(void) { { "Reassembled Data", "nr-rrc.warningMessageSegment.reassembled_data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_nr_rrc_dcch_segment_fragments, + { "Fragments", "nr-rrc.dedicatedMessageSegment_r16.fragments", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_dcch_segment_fragment, + { "Fragment", "nr-rrc.dedicatedMessageSegment_r16.fragment", + FT_FRAMENUM, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_dcch_segment_fragment_overlap, + { "Fragment Overlap", "nr-rrc.dedicatedMessageSegment_r16.fragment_overlap", + FT_BOOLEAN, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_dcch_segment_fragment_overlap_conflict, + { "Fragment Overlap Conflict", "nr-rrc.dedicatedMessageSegment_r16.fragment_overlap_conflict", + FT_BOOLEAN, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_dcch_segment_fragment_multiple_tails, + { "Fragment Multiple Tails", "nr-rrc.dedicatedMessageSegment_r16.fragment_multiple_tails", + FT_BOOLEAN, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_dcch_segment_fragment_too_long_fragment, + { "Too Long Fragment", "nr-rrc.dedicatedMessageSegment_r16.fragment_too_long_fragment", + FT_BOOLEAN, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_dcch_segment_fragment_error, + { "Fragment Error", "nr-rrc.dedicatedMessageSegment_r16.fragment_error", + FT_FRAMENUM, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_dcch_segment_fragment_count, + { "Fragment Count", "nr-rrc.dedicatedMessageSegment_r16.fragment_count", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_dcch_segment_reassembled_in, + { "Reassembled In", "nr-rrc.dedicatedMessageSegment_r16.reassembled_in", + FT_FRAMENUM, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_dcch_segment_reassembled_length, + { "Reassembled Length", "nr-rrc.dedicatedMessageSegment_r16.reassembled_length", + FT_UINT32, BASE_DEC, NULL, 0, + NULL, HFILL }}, + { &hf_nr_rrc_dcch_segment_reassembled_data, + { "Reassembled Data", "nr-rrc.dedicatedMessageSegment_r16.reassembled_data", + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_nr_rrc_utc_time, { "UTC time", "nr-rrc.utc_time", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_UTC, NULL, 0x0, @@ -968,7 +1085,7 @@ proto_register_nr_rrc(void) { NULL, HFILL }}, }; - static gint *ett[] = { + static int *ett[] = { &ett_nr_rrc, #include "packet-nr-rrc-ettarr.c" &ett_nr_rrc_DedicatedNAS_Message, @@ -981,6 +1098,8 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_sib7_fragments, &ett_nr_rrc_sib8_fragment, &ett_nr_rrc_sib8_fragments, + &ett_nr_rrc_dcch_segment_fragment, + &ett_nr_rrc_dcch_segment_fragments, &ett_nr_rrc_warningMessageSegment, &ett_nr_rrc_timeInfo, &ett_nr_rrc_capabilityRequestFilter, @@ -1019,12 +1138,13 @@ proto_register_nr_rrc(void) { &ett_nr_rrc_sl_ParametersEUTRA3_r16, &ett_nr_rrc_absTimeInfo, &ett_nr_rrc_assistanceDataSIB_Element_r16, - &ett_nr_sl_V2X_ConfigCommon_r16, - &ett_nr_tdd_Config_r16, - &ett_nr_coarseLocationInfo_r17, - &ett_nr_sl_MeasResultsCandRelay_r17, - &ett_nr_sl_MeasResultServingRelay_r17, - &ett_nr_ReferenceLocation_r17 + &ett_nr_rrc_sl_V2X_ConfigCommon_r16, + &ett_nr_rrc_tdd_Config_r16, + &ett_nr_rrc_coarseLocationInfo_r17, + &ett_nr_rrc_sl_MeasResultsCandRelay_r17, + &ett_nr_rrc_sl_MeasResultServingRelay_r17, + &ett_nr_rrc_ReferenceLocation_r17, + &ett_nr_rrc_wayPointLocation_r18 }; static ei_register_info ei[] = { @@ -1066,11 +1186,16 @@ proto_register_nr_rrc(void) { nr_rrc_etws_cmas_dcs_hash = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), g_direct_hash, g_direct_equal); + nr_rrc_dcch_segment_ueid_count_hash = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), + g_direct_hash, g_direct_equal); + nr_rrc_dcch_segment_id_tree = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope()); reassembly_table_register(&nr_rrc_sib7_reassembly_table, &addresses_reassembly_table_functions); reassembly_table_register(&nr_rrc_sib8_reassembly_table, &addresses_reassembly_table_functions); + reassembly_table_register(&nr_rrc_dcch_segment_reassembly_table, + &addresses_reassembly_table_functions); /* Register configuration preferences */ nr_rrc_module = prefs_register_protocol(proto_nr_rrc, NULL); @@ -1078,6 +1203,10 @@ proto_register_nr_rrc(void) { "Show NAS PDU in root packet details", "Whether the NAS PDU should be shown in the root packet details tree", &nr_rrc_nas_in_root_tree); + prefs_register_bool_preference(nr_rrc_module, "reassemble_dcch_segments", + "Try to reassemble DCCH segmented messages", + "Whether the NR RRC dissector should attempt to reassemble DCCH segmented messages", + &nr_rrc_reassemble_dcch_segments); } void diff --git a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.h b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.h index adb1fbc4..0241aa16 100644 --- a/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.h +++ b/epan/dissectors/asn1/nr-rrc/packet-nr-rrc-template.h @@ -1,5 +1,5 @@ /* packet-nr-rrc-template.h - * Copyright 2018-2023, Pascal Quantin + * Copyright 2018-2024, Pascal Quantin * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> |