aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/asn1/lte-rrc
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2016-07-12 19:04:12 +0200
committerPascal Quantin <pascal.quantin@gmail.com>2016-07-13 10:24:36 +0000
commite46be62c3b02c7c526a896eb68bfbc76d9a1e5f6 (patch)
treee736e51d376f03572153e9c220bcc39189a04a45 /epan/dissectors/asn1/lte-rrc
parent33fa58ccbc00de5613eaeb495f052f30795dee3b (diff)
LTE RRC: upgrade dissector to v13.2.0
Change-Id: If2e15f429e3e35b3deef8afc23e57c8ef3974a22 Reviewed-on: https://code.wireshark.org/review/16410 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/asn1/lte-rrc')
-rw-r--r--epan/dissectors/asn1/lte-rrc/CMakeLists.txt3
-rw-r--r--epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn20
-rw-r--r--epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn550
-rw-r--r--epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn2
-rw-r--r--epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn13
-rw-r--r--epan/dissectors/asn1/lte-rrc/Makefile.am5
-rw-r--r--epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn133
-rw-r--r--epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn1184
-rw-r--r--epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn19
-rw-r--r--epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn2
-rw-r--r--epan/dissectors/asn1/lte-rrc/lte-rrc.cnf245
-rw-r--r--epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c115
12 files changed, 2133 insertions, 158 deletions
diff --git a/epan/dissectors/asn1/lte-rrc/CMakeLists.txt b/epan/dissectors/asn1/lte-rrc/CMakeLists.txt
index 7588412b32..72e8d52d61 100644
--- a/epan/dissectors/asn1/lte-rrc/CMakeLists.txt
+++ b/epan/dissectors/asn1/lte-rrc/CMakeLists.txt
@@ -36,6 +36,9 @@ set( ASN_FILE_LIST
EUTRA-Sidelink-Preconf.asn
EUTRA-UE-Variables.asn
PC5-RRC-Definitions.asn
+ NBIOT-InterNodeDefinitions.asn
+ NBIOT-RRC-Definitions.asn
+ NBIOT-UE-Variables.asn
)
set( EXTRA_DIST
diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
index 202bbac712..19f0794f0b 100644
--- a/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
+++ b/epan/dissectors/asn1/lte-rrc/EUTRA-InterNodeDefinitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V13.1.0 (2016-03)
+-- 3GPP TS 36.331 V13.2.0 (2016-06)
--
EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
@@ -36,6 +36,7 @@ IMPORTS
SL-CommConfig-r12,
SL-DiscConfig-r12,
RadioResourceConfigDedicated,
+ RCLWI-Configuration-r13,
RSRP-Range,
RSRQ-Range,
RSRQ-Range-v1250,
@@ -59,6 +60,7 @@ IMPORTS
UECapabilityInformation,
UE-CapabilityRAT-ContainerList,
UE-RadioPagingInfo-r12,
+ WLANConnectionStatusReport-r13,
WLAN-OffloadConfig-r12
FROM EUTRA-RRC-Definitions;
@@ -140,6 +142,12 @@ HandoverPreparationInformation-v1130-IEs ::= SEQUENCE {
HandoverPreparationInformation-v1250-IEs ::= SEQUENCE {
ue-SupportedEARFCN-r12 ARFCN-ValueEUTRA-r9 OPTIONAL, -- Cond HO3
as-Config-v1250 AS-Config-v1250 OPTIONAL, -- Cond HO2
+ nonCriticalExtension HandoverPreparationInformation-v1320-IEs OPTIONAL
+}
+
+HandoverPreparationInformation-v1320-IEs ::= SEQUENCE {
+ as-Config-v1320 AS-Config-v1320 OPTIONAL, -- Cond HO2
+ as-Context-v1320 AS-Context-v1320 OPTIONAL, -- Cond HO2
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@@ -356,6 +364,11 @@ AS-Config-v1250 ::= SEQUENCE {
sourceSL-DiscConfig-r12 SL-DiscConfig-r12 OPTIONAL
}
+AS-Config-v1320 ::= SEQUENCE {
+ sourceSCellConfigList-r13 SCellToAddModListExt-r13 OPTIONAL,
+ sourceRCLWI-Configuration-r13 RCLWI-Configuration-r13 OPTIONAL
+}
+
AS-Context ::= SEQUENCE {
reestablishmentInfo ReestablishmentInfo OPTIONAL -- Cond HO
@@ -374,6 +387,11 @@ AS-Context-v1130 ::= SEQUENCE {
]]
}
+AS-Context-v1320 ::= SEQUENCE {
+ wlanConnectionStatusReport-r13 OCTET STRING (CONTAINING
+ WLANConnectionStatusReport-r13) OPTIONAL -- Cond HO2
+}
+
ReestablishmentInfo ::= SEQUENCE {
sourcePhysCellId PhysCellId,
diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
index c82cd7b5a6..33af8b5a37 100644
--- a/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
+++ b/epan/dissectors/asn1/lte-rrc/EUTRA-RRC-Definitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V13.1.0 (2016-03)
+-- 3GPP TS 36.331 V13.2.0 (2016-06)
--
EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@@ -24,6 +24,7 @@ BCCH-DL-SCH-MessageType ::= CHOICE {
messageClassExtension SEQUENCE {}
}
+
BCCH-DL-SCH-Message-BR ::= SEQUENCE {
message BCCH-DL-SCH-MessageType-BR-r13
}
@@ -99,7 +100,7 @@ DL-DCCH-MessageType ::= CHOICE {
ueInformationRequest-r9 UEInformationRequest-r9,
loggedMeasurementConfiguration-r10 LoggedMeasurementConfiguration-r10,
rnReconfiguration-r10 RNReconfiguration-r10,
- spare4 NULL,
+ rrcConnectionResume-r13 RRCConnectionResume-r13,
spare3 NULL, spare2 NULL, spare1 NULL
},
messageClassExtension SEQUENCE {}
@@ -115,12 +116,17 @@ UL-CCCH-MessageType ::= CHOICE {
rrcConnectionReestablishmentRequest RRCConnectionReestablishmentRequest,
rrcConnectionRequest RRCConnectionRequest
},
- messageClassExtension SEQUENCE {}
+ messageClassExtension CHOICE {
+ c2 CHOICE {
+ rrcConnectionResumeRequest-r13 RRCConnectionResumeRequest-r13
+ },
+ messageClassExtensionFuture-r13 SEQUENCE {}
+ }
}
UL-DCCH-Message ::= SEQUENCE {
- message UL-DCCH-MessageType
+ message UL-DCCH-MessageType
}
UL-DCCH-MessageType ::= CHOICE {
@@ -150,7 +156,7 @@ UL-DCCH-MessageType ::= CHOICE {
scgFailureInformation-r12 SCGFailureInformation-r12,
sidelinkUEInformation-r12 SidelinkUEInformation-r12,
wlanConnectionStatusReport-r13 WLANConnectionStatusReport-r13,
- spare10 NULL,
+ rrcConnectionResumeComplete-r13 RRCConnectionResumeComplete-r13,
spare9 NULL, spare8 NULL, spare7 NULL,
spare6 NULL, spare5 NULL, spare4 NULL,
spare3 NULL, spare2 NULL, spare1 NULL
@@ -873,7 +879,7 @@ RRCConnectionReconfiguration-v1020-IEs ::= SEQUENCE {
}
RRCConnectionReconfiguration-v1130-IEs ::= SEQUENCE {
- systemInfomationBlockType1Dedicated-r11 OCTET STRING (CONTAINING SystemInformationBlockType1) OPTIONAL, -- Need ON
+ systemInformationBlockType1Dedicated-r11 OCTET STRING (CONTAINING SystemInformationBlockType1) OPTIONAL, -- Need ON
nonCriticalExtension RRCConnectionReconfiguration-v1250-IEs OPTIONAL
}
@@ -898,16 +904,7 @@ RRCConnectionReconfiguration-v1310-IEs ::= SEQUENCE {
sCellToAddModListExt-r13 SCellToAddModListExt-r13 OPTIONAL, -- Need ON
lwa-Configuration-r13 LWA-Configuration-r13 OPTIONAL, -- Need ON
lwip-Configuration-r13 LWIP-Configuration-r13 OPTIONAL, -- Need ON
- steeringCommandWLAN-r13 CHOICE {
- release NULL,
- setup SEQUENCE {
- command CHOICE {
- steerToWLAN-r13 WLAN-Id-List-r12,
- steerToLTE-r13 NULL
- },
- ...
- }
- } OPTIONAL, -- Need ON
+ rclwi-Configuration-r13 RCLWI-Configuration-r13 OPTIONAL, -- Need ON
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@@ -1184,7 +1181,12 @@ RRCConnectionReject-v1130-IEs ::= SEQUENCE {
deprioritisationType-r11 ENUMERATED {frequency, e-utra},
deprioritisationTimer-r11 ENUMERATED {min5, min10, min15, min30}
} OPTIONAL, -- Need ON
- nonCriticalExtension SEQUENCE {} OPTIONAL
+ nonCriticalExtension RRCConnectionReject-v1320-IEs OPTIONAL
+}
+
+RRCConnectionReject-v1320-IEs ::= SEQUENCE {
+ rrc-SuspendIndication-r13 ENUMERATED {true} OPTIONAL, -- Need ON
+ nonCriticalExtension SEQUENCE {} OPTIONAL
}
@@ -1232,11 +1234,16 @@ RRCConnectionRelease-v920-IEs ::= SEQUENCE {
RRCConnectionRelease-v1020-IEs ::= SEQUENCE {
extendedWaitTime-r10 INTEGER (1..1800) OPTIONAL, -- Need ON
- nonCriticalExtension SEQUENCE {} OPTIONAL
+ nonCriticalExtension RRCConnectionRelease-v1320-IEs OPTIONAL
+}
+
+RRCConnectionRelease-v1320-IEs::= SEQUENCE {
+ resumeIdentity-r13 ResumeIdentity-r13 OPTIONAL, -- Need OR
+ nonCriticalExtension SEQUENCE {} OPTIONAL
}
ReleaseCause ::= ENUMERATED {loadBalancingTAUrequired,
- other, cs-FallbackHighPriority-v1020, spare1}
+ other, cs-FallbackHighPriority-v1020, rrc-Suspend-v1320}
RedirectedCarrierInfo ::= CHOICE {
eutra ARFCN-ValueEUTRA,
@@ -1392,6 +1399,75 @@ EstablishmentCause ::= ENUMERATED {
mo-Data, delayTolerantAccess-v1020, mo-VoiceCall-v1280, spare1}
+RRCConnectionResume-r13 ::= SEQUENCE {
+ rrc-TransactionIdentifier RRC-TransactionIdentifier,
+ criticalExtensions CHOICE {
+ c1 CHOICE {
+ rrcConnectionResume-r13 RRCConnectionResume-r13-IEs,
+ spare3 NULL,
+ spare2 NULL,
+ spare1 NULL
+ },
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+RRCConnectionResume-r13-IEs ::= SEQUENCE {
+ radioResourceConfigDedicated-r13 RadioResourceConfigDedicated OPTIONAL, -- Need ON
+ nextHopChainingCount-r13 NextHopChainingCount,
+ measConfig-r13 MeasConfig OPTIONAL, -- Need ON
+ antennaInfoDedicatedPCell-r13 AntennaInfoDedicated-v10i0 OPTIONAL, -- Need ON
+ drb-ContinueROHC-r13 ENUMERATED {true} OPTIONAL, -- Need OP
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+RRCConnectionResumeComplete-r13 ::= SEQUENCE {
+ rrc-TransactionIdentifier RRC-TransactionIdentifier,
+ criticalExtensions CHOICE {
+ rrcConnectionResumeComplete-r13 RRCConnectionResumeComplete-r13-IEs,
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+RRCConnectionResumeComplete-r13-IEs ::= SEQUENCE {
+ selectedPLMN-Identity-r13 INTEGER (1..maxPLMN-r11) OPTIONAL,
+ dedicatedInfoNAS-r13 DedicatedInfoNAS OPTIONAL,
+ rlf-InfoAvailable-r13 ENUMERATED {true} OPTIONAL,
+ logMeasAvailable-r13 ENUMERATED {true} OPTIONAL,
+ connEstFailInfoAvailable-r13 ENUMERATED {true} OPTIONAL,
+ mobilityState-r13 ENUMERATED {normal, medium, high, spare} OPTIONAL,
+ mobilityHistoryAvail-r13 ENUMERATED {true} OPTIONAL,
+ logMeasAvailableMBSFN-r13 ENUMERATED {true} OPTIONAL,
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+RRCConnectionResumeRequest-r13 ::= SEQUENCE {
+ criticalExtensions CHOICE {
+ rrcConnectionResumeRequest-r13 RRCConnectionResumeRequest-r13-IEs,
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+RRCConnectionResumeRequest-r13-IEs ::= SEQUENCE {
+ resumeIdentity-r13 CHOICE {
+ resumeID-r13 ResumeIdentity-r13,
+ truncatedResumeID-r13 BIT STRING (SIZE (24))
+ },
+ shortResumeMAC-I-r13 BIT STRING (SIZE (16)),
+ resumeCause-r13 ResumeCause,
+ spare BIT STRING (SIZE (1))
+}
+
+ResumeCause ::= ENUMERATED {
+ emergency, highPriorityAccess, mt-Access, mo-Signalling,
+ mo-Data, delayTolerantAccess-v1020, mo-VoiceCall-v1280, spare1}
+
+
+
RRCConnectionSetup ::= SEQUENCE {
rrc-TransactionIdentifier RRC-TransactionIdentifier,
criticalExtensions CHOICE {
@@ -1456,6 +1532,15 @@ RRCConnectionSetupComplete-v1250-IEs ::= SEQUENCE {
mobilityState-r12 ENUMERATED {normal, medium, high, spare} OPTIONAL,
mobilityHistoryAvail-r12 ENUMERATED {true} OPTIONAL,
logMeasAvailableMBSFN-r12 ENUMERATED {true} OPTIONAL,
+ nonCriticalExtension RRCConnectionSetupComplete-v1320-IEs OPTIONAL
+}
+
+RRCConnectionSetupComplete-v1320-IEs ::= SEQUENCE {
+ ce-ModeB-r13 ENUMERATED {supported} OPTIONAL,
+ s-TMSI-r13 S-TMSI OPTIONAL,
+ attachWithoutPDN-Connectivity-r13 ENUMERATED {true} OPTIONAL,
+ up-CIoT-EPS-Optimisation-r13 ENUMERATED {true} OPTIONAL,
+ cp-CIoT-EPS-Optimisation-r13 ENUMERATED {true} OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@@ -1749,16 +1834,32 @@ SystemInformationBlockType1-v1310-IEs ::= SEQUENCE {
si-RepetitionPattern-r13 ENUMERATED {everyRF, every2ndRF, every4thRF,
every8thRF},
schedulingInfoList-BR-r13 SchedulingInfoList-BR-r13 OPTIONAL, -- Need OR
- fdd-DownlinkOrTddSubframeBitmapLC-r13 CHOICE {
+ fdd-DownlinkOrTddSubframeBitmapBR-r13 CHOICE {
subframePattern10-r13 BIT STRING (SIZE (10)),
subframePattern40-r13 BIT STRING (SIZE (40))
} OPTIONAL, -- Need OP
- fdd-UplinkSubframeBitmapLC-r13 BIT STRING (SIZE (10)) OPTIONAL, -- Need OP
- startSymbolLC-r13 INTEGER (1..4),
+ fdd-UplinkSubframeBitmapBR-r13 BIT STRING (SIZE (10)) OPTIONAL, -- Need OP
+ startSymbolBR-r13 INTEGER (1..4),
si-HoppingConfigCommon-r13 ENUMERATED {on,off},
si-ValidityTime-r13 ENUMERATED {true} OPTIONAL, -- Need OP
systemInfoValueTagList-r13 SystemInfoValueTagList-r13 OPTIONAL -- Need OR
} OPTIONAL, -- Cond BW-reduced
+ nonCriticalExtension SystemInformationBlockType1-v1320-IEs OPTIONAL
+}
+
+SystemInformationBlockType1-v1320-IEs ::= SEQUENCE {
+ freqHoppingParametersDL-r13 SEQUENCE {
+ mpdcch-pdsch-HoppingNB-r13 ENUMERATED {nb2, nb4} OPTIONAL, -- Need OR
+ interval-DLHoppingConfigCommonModeA-r13 CHOICE {
+ interval-FDD-r13 ENUMERATED {int1, int2, int4, int8},
+ interval-TDD-r13 ENUMERATED {int1, int5, int10, int20}
+ } OPTIONAL, -- Need OR
+ interval-DLHoppingConfigCommonModeB-r13 CHOICE {
+ interval-FDD-r13 ENUMERATED {int2, int4, int8, int16},
+ interval-TDD-r13 ENUMERATED { int5, int10, int20, int40}
+ } OPTIONAL, -- Need OR
+ mpdcch-pdsch-HoppingOffset-r13 INTEGER (1..maxAvailNarrowBands-r13) OPTIONAL -- Need OR
+ } OPTIONAL, -- Cond SI-Hopping
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@@ -1859,10 +1960,10 @@ UECapabilityEnquiry-v1180-IEs ::= SEQUENCE {
UECapabilityEnquiry-v1310-IEs ::= SEQUENCE {
requestReducedFormat-r13 ENUMERATED {true} OPTIONAL, -- Need ON
requestSkipFallbackComb-r13 ENUMERATED {true} OPTIONAL, -- Need ON
- requestedMaxCCsDL-r13 INTEGER (2..32) OPTIONAL, -- Need ON
- requestedMaxCCsUL-r13 INTEGER (2..32) OPTIONAL, -- Need ON
+ requestedMaxCCsDL-r13 INTEGER (2..32) OPTIONAL, -- Need ON
+ requestedMaxCCsUL-r13 INTEGER (2..32) OPTIONAL, -- Need ON
requestReducedIntNonContComb-r13 ENUMERATED {true} OPTIONAL, -- Need ON
- nonCriticalExtension SEQUENCE {} OPTIONAL
+ nonCriticalExtension SEQUENCE {} OPTIONAL
}
UE-CapabilityRequest ::= SEQUENCE (SIZE (1..maxRAT-Capabilities)) OF RAT-Type
@@ -2282,7 +2383,14 @@ SystemInformationBlockType2 ::= SEQUENCE {
]],
[[ acdc-BarringForCommon-r13 ACDC-BarringForCommon-r13 OPTIONAL, -- Need OP
acdc-BarringPerPLMN-List-r13 ACDC-BarringPerPLMN-List-r13 OPTIONAL -- Need OP
+ ]],
+ [[
+ udt-RestrictingForCommon-r13 UDT-Restricting-r13 OPTIONAL, -- Need OR
+ udt-RestrictingPerPLMN-List-r13 UDT-RestrictingPerPLMN-List-r13 OPTIONAL, -- Need OR
+ cIoT-EPS-OptimisationInfo-r13 CIOT-EPS-OptimisationInfo-r13 OPTIONAL, -- Need OP
+ useFullResumeID-r13 ENUMERATED {true} OPTIONAL -- Need OP
]]
+
}
SystemInformationBlockType2-v8h0-IEs ::= SEQUENCE {
@@ -2347,6 +2455,26 @@ BarringPerACDC-Category-r13 ::= SEQUENCE {
} OPTIONAL -- Need OP
}
+UDT-Restricting-r13 ::= SEQUENCE {
+ udt-Restricting-r13 ENUMERATED {true} OPTIONAL, --Need OR
+ udt-RestrictingTime-r13 ENUMERATED {s4, s8, s16, s32, s64, s128, s256, s512} OPTIONAL --Need OR
+}
+
+UDT-RestrictingPerPLMN-List-r13 ::= SEQUENCE (SIZE (1..maxPLMN-r11)) OF UDT-RestrictingPerPLMN-r13
+
+UDT-RestrictingPerPLMN-r13 ::= SEQUENCE {
+ plmn-IdentityIndex-r13 INTEGER (1..maxPLMN-r11),
+ udt-Restricting-r13 UDT-Restricting-r13 OPTIONAL --Need OR
+}
+
+CIOT-EPS-OptimisationInfo-r13 ::= SEQUENCE (SIZE (1.. maxPLMN-r11)) OF CIOT-OptimisationPLMN-r13
+
+CIOT-OptimisationPLMN-r13::= SEQUENCE {
+ up-CIoT-EPS-Optimisation-r13 ENUMERATED {true} OPTIONAL, -- Need OP
+ cp-CIoT-EPS-Optimisation-r13 ENUMERATED {true} OPTIONAL, -- Need OP
+ attachWithoutPDN-Connectivity-r13 ENUMERATED {true} OPTIONAL -- Need OP
+}
+
SystemInformationBlockType3 ::= SEQUENCE {
cellReselectionInfoCommon SEQUENCE {
@@ -3203,6 +3331,10 @@ CQI-ReportConfig-v1310 ::= SEQUENCE {
cqi-ReportPeriodic-v1310 CQI-ReportPeriodic-v1310 OPTIONAL -- Need ON
}
+CQI-ReportConfig-v1320 ::= SEQUENCE {
+ cqi-ReportPeriodic-v1320 CQI-ReportPeriodic-v1320 OPTIONAL -- Need ON
+}
+
CQI-ReportConfigSCell-r10 ::= SEQUENCE {
cqi-ReportModeAperiodic-r10 CQI-ReportModeAperiodic OPTIONAL, -- Need OR
nomPDSCH-RS-EPRE-Offset-r10 INTEGER (-1..6),
@@ -3266,6 +3398,9 @@ CQI-ReportPeriodic-v1310 ::= SEQUENCE {
simultaneousAckNackAndCQI-Format4-Format5-r13 ENUMERATED {setup} OPTIONAL-- Need OR
}
+CQI-ReportPeriodic-v1320 ::= SEQUENCE {
+ periodicityFactorWB-r13 ENUMERATED {n2, n4} OPTIONAL -- Need OR
+}
CQI-ReportPeriodicProcExtToAddModList-r11 ::= SEQUENCE (SIZE (1..maxCQI-ProcExt-r11)) OF CQI-ReportPeriodicProcExt-r11
@@ -3293,6 +3428,8 @@ CQI-ReportPeriodicProcExt-r11 ::= SEQUENCE {
} OPTIONAL, -- Need ON
...,
[[ cri-ReportConfig-r13 CRI-ReportConfig-r13 OPTIONAL -- Need ON
+ ]],
+ [[ periodicityFactorWB-r13 ENUMERATED {n2, n4} OPTIONAL -- Need ON
]]
}
@@ -3470,7 +3607,7 @@ CSI-Process-r11 ::= SEQUENCE {
csi-ProcessId-r11 CSI-ProcessId-r11,
csi-RS-ConfigNZPId-r11 CSI-RS-ConfigNZPId-r11,
csi-IM-ConfigId-r11 CSI-IM-ConfigId-r11,
- p-C-AndCBSRList-r11 SEQUENCE (SIZE (1..2)) OF P-C-AndCBSR-r11,
+ p-C-AndCBSRList-r11 P-C-AndCBSR-Pair-r13a,
cqi-ReportBothProc-r11 CQI-ReportBothProc-r11 OPTIONAL, -- Need OR
cqi-ReportPeriodicProcId-r11 INTEGER (0..maxCQI-ProcExt-r11) OPTIONAL, -- Need OR
cqi-ReportAperiodicProc-r11 CQI-ReportAperiodicProc-r11 OPTIONAL, -- Need OR
@@ -3497,30 +3634,6 @@ CSI-Process-r11 ::= SEQUENCE {
]]
}
-P-C-AndCBSR-r11 ::= SEQUENCE {
- p-C-r11 INTEGER (-8..15),
- codebookSubsetRestriction-r11 BIT STRING
-}
-
-P-C-AndCBSR-r13 ::= SEQUENCE {
- p-C-r13 INTEGER (-8..15),
- cbsr-Selection-r13 CHOICE{
- nonPrecoded-r13 SEQUENCE {
- codebookSubsetRestriction1-r13 BIT STRING,
- codebookSubsetRestriction2-r13 BIT STRING
- },
- beamformedK1a-r13 SEQUENCE {
- codebookSubsetRestriction3-r13 BIT STRING
- },
- beamformedKN-r13 SEQUENCE {
- codebookSubsetRestriction-r13 BIT STRING
- }
- },
- ...
-}
-
-P-C-AndCBSR-PerResourceConfig-r13 ::= SEQUENCE (SIZE (1..2)) OF P-C-AndCBSR-r13
-
CSI-ProcessId-r11 ::= INTEGER (1..maxCSI-Proc-r11)
@@ -3552,6 +3665,17 @@ CSI-RS-Config-v1310 ::= SEQUENCE {
eMIMO-Type-r13 CSI-RS-ConfigEMIMO-r13 OPTIONAL -- Need ON
}
+ZeroTxPowerCSI-RS-Conf-r12 ::= CHOICE {
+ release NULL,
+ setup ZeroTxPowerCSI-RS-r12
+}
+
+ZeroTxPowerCSI-RS-r12 ::= SEQUENCE {
+ zeroTxPowerResourceConfigList-r12 BIT STRING (SIZE (16)),
+ zeroTxPowerSubframeConfig-r12 INTEGER (0..154)
+}
+
+
CSI-RS-ConfigEMIMO-r13 ::= CHOICE {
release NULL,
setup CHOICE {
@@ -3561,7 +3685,7 @@ CSI-RS-ConfigEMIMO-r13 ::= CHOICE {
}
CSI-RS-ConfigNonPrecoded-r13 ::= SEQUENCE {
- p-C-AndCBSRList-r13 P-C-AndCBSR-PerResourceConfig-r13 OPTIONAL, -- Need OR
+ p-C-AndCBSRList-r13 P-C-AndCBSR-Pair-r13 OPTIONAL, -- Need OR
codebookConfigN1-r13 ENUMERATED {n1, n2, n3, n4, n8},
codebookConfigN2-r13 ENUMERATED {n1, n2, n3, n4, n8},
codebookOverSamplingRateConfig-O1-r13 ENUMERATED {n4, n8} OPTIONAL, -- Need OR
@@ -3574,22 +3698,12 @@ CSI-RS-ConfigNonPrecoded-r13 ::= SEQUENCE {
CSI-RS-ConfigBeamformed-r13 ::= SEQUENCE {
csi-RS-ConfigNZPIdListExt-r13 SEQUENCE (SIZE (1..7)) OF CSI-RS-ConfigNZPId-r13 OPTIONAL, -- Need OR
csi-IM-ConfigIdList-r13 SEQUENCE (SIZE (1..8)) OF CSI-IM-ConfigId-r13 OPTIONAL, -- Need OR
- p-C-AndCBSR-PerResourceConfigList-r13 SEQUENCE (SIZE (1..8)) OF P-C-AndCBSR-PerResourceConfig-r13 OPTIONAL, -- Need OR
+ p-C-AndCBSR-PerResourceConfigList-r13 SEQUENCE (SIZE (1..8)) OF P-C-AndCBSR-Pair-r13 OPTIONAL, -- Need OR
ace-For4Tx-PerResourceConfigList-r13 SEQUENCE (SIZE (1..7)) OF BOOLEAN OPTIONAL, -- Need OR
alternativeCodebookEnabledBeamformed-r13 ENUMERATED {true} OPTIONAL, -- Need OR
channelMeasRestriction-r13 ENUMERATED {on} OPTIONAL -- Need OR
}
-ZeroTxPowerCSI-RS-Conf-r12 ::= CHOICE {
- release NULL,
- setup ZeroTxPowerCSI-RS-r12
-}
-
-ZeroTxPowerCSI-RS-r12 ::= SEQUENCE {
- zeroTxPowerResourceConfigList-r12 BIT STRING (SIZE (16)),
- zeroTxPowerSubframeConfig-r12 INTEGER (0..154)
-}
-
CSI-RS-ConfigNZP-r11 ::= SEQUENCE {
csi-RS-ConfigNZPId-r11 CSI-RS-ConfigNZPId-r11,
@@ -3703,7 +3817,7 @@ EPDCCH-SetConfig-r11 ::= SEQUENCE {
mpdcch-config-r13 CHOICE {
release NULL,
setup SEQUENCE {
- csi-NumRepetitionCE-r13 ENUMERATED {v1, v2, v4, v8, v16, v32},
+ csi-NumRepetitionCE-r13 ENUMERATED {sf1, sf2, sf4, sf8, sf16, sf32},
mpdcch-pdsch-HoppingConfig-r13 ENUMERATED {on,off},
mpdcch-StartSF-UESS-r13 CHOICE {
fdd-r13 ENUMERATED {v1, v1dot5, v2, v2dot5, v4,
@@ -3720,6 +3834,7 @@ EPDCCH-SetConfig-r11 ::= SEQUENCE {
EPDCCH-SetConfigId-r11 ::= INTEGER (0..1)
+
EIMTA-MainConfig-r12 ::= CHOICE {
release NULL,
setup SEQUENCE {
@@ -3788,26 +3903,10 @@ LWIP-Configuration-r13 ::= CHOICE {
LWIP-Config-r13 ::= SEQUENCE {
lwip-MobilityConfig-r13 WLAN-MobilityConfig-r13 OPTIONAL, -- Need ON
- tunnelConfigLWIP-r13 TunnelConfigLWIP-r13 OPTIONAL, -- Need ON
- ...
-}
-
-
-TunnelConfigLWIP-r13 ::= SEQUENCE {
- ip-Address-r13 IP-Address-r13,
- ike-Identity-r13 IKE-Identity-r13,
+ tunnelConfigLWIP-r13 TunnelConfigLWIP-r13 OPTIONAL, -- Need ON
...
}
-IKE-Identity-r13 ::= SEQUENCE {
- idI-r13 OCTET STRING
-}
-
-IP-Address-r13 ::= CHOICE {
- ipv4-r13 BIT STRING (SIZE (32)),
- ipv6-r13 BIT STRING (SIZE (128))
-}
-
MAC-MainConfig ::= SEQUENCE {
ul-SCH-Config SEQUENCE {
@@ -3979,6 +4078,33 @@ STAG-ToAddMod-r11 ::= SEQUENCE {
STAG-Id-r11::= INTEGER (1..maxSTAG-r11)
+P-C-AndCBSR-r11 ::= SEQUENCE {
+ p-C-r11 INTEGER (-8..15),
+ codebookSubsetRestriction-r11 BIT STRING
+}
+
+P-C-AndCBSR-r13 ::= SEQUENCE {
+ p-C-r13 INTEGER (-8..15),
+ cbsr-Selection-r13 CHOICE{
+ nonPrecoded-r13 SEQUENCE {
+ codebookSubsetRestriction1-r13 BIT STRING,
+ codebookSubsetRestriction2-r13 BIT STRING
+ },
+ beamformedK1a-r13 SEQUENCE {
+ codebookSubsetRestriction3-r13 BIT STRING
+ },
+ beamformedKN-r13 SEQUENCE {
+ codebookSubsetRestriction-r13 BIT STRING
+ }
+ },
+ ...
+}
+
+P-C-AndCBSR-Pair-r13a ::= SEQUENCE (SIZE (1..2)) OF P-C-AndCBSR-r11
+
+P-C-AndCBSR-Pair-r13 ::= SEQUENCE (SIZE (1..2)) OF P-C-AndCBSR-r13
+
+
PDCCH-ConfigSCell-r13 ::= SEQUENCE {
skipMonitoringDCI-format0-1A-r13 ENUMERATED {true} OPTIONAL -- Need OR
}
@@ -4050,7 +4176,7 @@ PDCP-Config ::= SEQUENCE {
statusFeedback-r13 CHOICE {
release NULL,
setup SEQUENCE {
- statusPDU-TypeForPolling-r13 ENUMERATED {type1, type2} OPTIONAL,
+ statusPDU-TypeForPolling-r13 ENUMERATED {type1, type2} OPTIONAL, -- Need ON
statusPDU-Periodicity-Type1-r13 ENUMERATED {
ms5, ms10, ms20, ms30, ms40, ms50, ms60, ms70, ms80, ms90,
ms100, ms150, ms200, ms300, ms500, ms1000, ms2000, ms5000,
@@ -4228,6 +4354,8 @@ PhysicalConfigDedicated ::= SEQUENCE {
} OPTIONAL, -- Need ON
csi-RS-ConfigNZPToAddModListExt-r13 CSI-RS-ConfigNZPToAddModListExt-r13 OPTIONAL, -- Need ON
csi-RS-ConfigNZPToReleaseListExt-r13 CSI-RS-ConfigNZPToReleaseListExt-r13 OPTIONAL -- Need ON
+ ]],
+ [[ cqi-ReportConfig-v1320 CQI-ReportConfig-v1320 OPTIONAL -- Need ON
]]
}
@@ -4245,7 +4373,7 @@ PhysicalConfigDedicatedSCell-r10 ::= SEQUENCE {
ul-Configuration-r10 SEQUENCE {
antennaInfoUL-r10 AntennaInfoUL-r10 OPTIONAL, -- Need ON
pusch-ConfigDedicatedSCell-r10
- PUSCH-ConfigDedicatedSCell-r10 OPTIONAL, -- Need ON
+ PUSCH-ConfigDedicatedSCell-r10 OPTIONAL, -- Cond PUSCH-SCell1
uplinkPowerControlDedicatedSCell-r10
UplinkPowerControlDedicatedSCell-r10 OPTIONAL, -- Need ON
cqi-ReportConfigSCell-r10 CQI-ReportConfigSCell-r10 OPTIONAL, -- Need ON
@@ -4270,7 +4398,8 @@ PhysicalConfigDedicatedSCell-r10 ::= SEQUENCE {
pdsch-ConfigDedicated-v1130 PDSCH-ConfigDedicated-v1130 OPTIONAL, -- Need ON
-- UL configuration
cqi-ReportConfig-v1130 CQI-ReportConfig-v1130 OPTIONAL, -- Need ON
- pusch-ConfigDedicated-v1130 PUSCH-ConfigDedicated-v1130 OPTIONAL, -- Need ON
+ pusch-ConfigDedicated-v1130
+ PUSCH-ConfigDedicated-v1130 OPTIONAL, -- Cond PUSCH-SCell1
uplinkPowerControlDedicatedSCell-v1130
UplinkPowerControlDedicated-v1130 OPTIONAL -- Need ON
]],
@@ -4284,7 +4413,7 @@ PhysicalConfigDedicatedSCell-r10 ::= SEQUENCE {
]],
[[ pdsch-ConfigDedicated-v1280 PDSCH-ConfigDedicated-v1280 OPTIONAL -- Need ON
]],
- [[ pucch-Cell-r13 ENUMERATED {true} OPTIONAL, -- Cond PUCCH_SCell
+ [[ pucch-Cell-r13 ENUMERATED {true} OPTIONAL, -- Cond PUCCH-SCell1
pucch-SCell CHOICE{
release NULL,
setup SEQUENCE {
@@ -4317,6 +4446,8 @@ PhysicalConfigDedicatedSCell-r10 ::= SEQUENCE {
laa-SCellConfiguration-r13 LAA-SCellConfiguration-r13 OPTIONAL, -- Need ON
csi-RS-ConfigNZPToAddModListExt-r13 CSI-RS-ConfigNZPToAddModListExt-r13 OPTIONAL, -- Need ON
csi-RS-ConfigNZPToReleaseListExt-r13 CSI-RS-ConfigNZPToReleaseListExt-r13 OPTIONAL -- Need ON
+ ]],
+ [[ cqi-ReportConfig-v1320 CQI-ReportConfig-v1320 OPTIONAL -- Need ON
]]
}
@@ -4347,12 +4478,12 @@ PRACH-ConfigSIB ::= SEQUENCE {
}
PRACH-ConfigSIB-v1310 ::= SEQUENCE {
- rsrp-ThresholdsPrachInfoList-r13 RSRP-ThresholdsPrachInfoList-r13,
+ rsrp-ThresholdsPrachInfoList-r13 RSRP-ThresholdsPrachInfoList-r13,
mpdcch-startSF-CSS-RA-r13 CHOICE {
- fdd-r13 ENUMERATED {sf1, sf1dot5, sf2, sf2dot5, sf4, sf5, sf8,
- sf10},
- tdd-r13 ENUMERATED {sf1, sf2, sf4, sf5, sf8, sf10, sf20, spare1}
- } OPTIONAL, -- Need OR
+ fdd-r13 ENUMERATED {v1, v1dot5, v2, v2dot5, v4, v5, v8,
+ v10},
+ tdd-r13 ENUMERATED {v1, v2, v4, v5, v8, v10, v20, spare}
+ } OPTIONAL, -- Cond MP
prach-HoppingOffset-r13 INTEGER (0..94) OPTIONAL, -- Need OR
prach-ParametersListCE-r13 PRACH-ParametersListCE-r13
}
@@ -4363,15 +4494,15 @@ PRACH-Config ::= SEQUENCE {
}
PRACH-Config-v1310 ::= SEQUENCE {
- rsrp-ThresholdsPrachInfoList-r13 RSRP-ThresholdsPrachInfoList-r13 OPTIONAL, -- Need OR
+ rsrp-ThresholdsPrachInfoList-r13 RSRP-ThresholdsPrachInfoList-r13 OPTIONAL, -- Cond HO
mpdcch-startSF-CSS-RA-r13 CHOICE {
fdd-r13 ENUMERATED {v1, v1dot5, v2, v2dot5, v4, v5, v8,
v10},
tdd-r13 ENUMERATED {v1, v2, v4, v5, v8, v10, v20, spare}
- } OPTIONAL, -- Need OR
+ } OPTIONAL, -- Cond MP
prach-HoppingOffset-r13 INTEGER (0..94) OPTIONAL, -- Need OR
- prach-ParametersListCE-r13 PRACH-ParametersListCE-r13 OPTIONAL, -- Need OR
- initial-CE-level-r13 INTEGER (1..maxCE-Level-r13) OPTIONAL -- Need OR
+ prach-ParametersListCE-r13 PRACH-ParametersListCE-r13 OPTIONAL, -- Cond MP
+ initial-CE-level-r13 INTEGER (0..3) OPTIONAL -- Need OR
}
PRACH-ConfigSCell-r10 ::= SEQUENCE {
@@ -4388,8 +4519,8 @@ PRACH-ConfigInfo ::= SEQUENCE {
PRACH-ParametersListCE-r13 ::= SEQUENCE (SIZE(1..maxCE-Level-r13)) OF PRACH-ParametersCE-r13
PRACH-ParametersCE-r13 ::= SEQUENCE {
- prach-ConfigIndex INTEGER (0..63),
- prach-FreqOffset INTEGER (0..94),
+ prach-ConfigIndex-r13 INTEGER (0..63),
+ prach-FreqOffset-r13 INTEGER (0..94),
prach-StartingSubframe-r13 ENUMERATED {sf2, sf4, sf8, sf16, sf32, sf64, sf128,
sf256} OPTIONAL, -- Need OP
maxNumPreambleAttemptCE-r13
@@ -4910,15 +5041,15 @@ BCCH-Config-v1310 ::= SEQUENCE {
}
FreqHoppingParameters-r13 ::= SEQUENCE {
- mpdcch-pdsch-HoppingNB-r13 ENUMERATED {nb2, nb4} OPTIONAL, -- Need OR
+ mpdcch-pdsch-HoppingNB-r13 ENUMERATED {nb2, nb4} OPTIONAL, -- Cond HO
interval-DLHoppingConfigCommonModeA-r13 CHOICE {
interval-FDD-r13 ENUMERATED {int1, int2, int4, int8},
interval-TDD-r13 ENUMERATED {int1, int5, int10, int20}
- } OPTIONAL, -- Need OR
+ } OPTIONAL, -- Cond HO
interval-DLHoppingConfigCommonModeB-r13 CHOICE {
interval-FDD-r13 ENUMERATED {int2, int4, int8, int16},
interval-TDD-r13 ENUMERATED { int5, int10, int20, int40}
- } OPTIONAL, -- Need OR
+ } OPTIONAL, -- Cond HO
interval-ULHoppingConfigCommonModeA-r13 CHOICE {
interval-FDD-r13 ENUMERATED {int1, int2, int4, int8},
interval-TDD-r13 ENUMERATED {int1, int5, int10, int20}
@@ -4928,7 +5059,7 @@ FreqHoppingParameters-r13 ::= SEQUENCE {
interval-TDD-r13 ENUMERATED { int5, int10, int20, int40}
} OPTIONAL, -- Need OR
mpdcch-pdsch-HoppingOffset-r13 INTEGER (1..maxAvailNarrowBands-r13)
- OPTIONAL -- Need OR
+ OPTIONAL -- Cond HO
}
PCCH-Config ::= SEQUENCE {
@@ -5036,7 +5167,7 @@ DRB-ToAddMod ::= SEQUENCE {
[[ rlc-Config-v1310 RLC-Config-v1310 OPTIONAL, -- Need ON
drb-TypeLWA-r13 BOOLEAN OPTIONAL, -- Need ON
drb-TypeLWIP-r13 ENUMERATED {lwip, lwip-DL-only,
- lwip-UL-only, lte} OPTIONAL -- Need ON
+ lwip-UL-only, eutran} OPTIONAL -- Need ON
]]
}
@@ -5118,6 +5249,24 @@ P-a ::= ENUMERATED { dB-6, dB-4dot77, dB-3, dB-1dot77,
dB0, dB1, dB2, dB3}
+RCLWI-Configuration-r13 ::= CHOICE {
+ release NULL,
+ setup SEQUENCE {
+ rclwi-Config-r13 RCLWI-Config-r13
+ }
+}
+
+RCLWI-Config-r13 ::= SEQUENCE {
+ command CHOICE {
+ steerToWLAN-r13 SEQUENCE {
+ mobilityConfig-r13 WLAN-Id-List-r12
+ },
+ steerToLTE-r13 NULL
+ },
+ ...
+}
+
+
RLC-Config ::= CHOICE {
am SEQUENCE {
ul-AM-RLC UL-AM-RLC,
@@ -5516,6 +5665,8 @@ SPS-ConfigUL ::= CHOICE {
p0-UE-PUSCH-PersistentSubframeSet2-r12 INTEGER (-8..7)
}
} OPTIONAL -- Need ON
+ ]],
+ [[ numberOfConfUlSPS-Processes-r13 INTEGER (1..8) OPTIONAL -- Need OR
]]
}
}
@@ -5566,6 +5717,24 @@ TPC-Index ::= CHOICE {
}
+TunnelConfigLWIP-r13 ::= SEQUENCE {
+ ip-Address-r13 IP-Address-r13,
+ ike-Identity-r13 IKE-Identity-r13,
+ ...,
+ [[ lwip-Counter-r13 INTEGER (0..65535) OPTIONAL -- Cond LWIP-Setup
+ ]]
+}
+
+IKE-Identity-r13 ::= SEQUENCE {
+ idI-r13 OCTET STRING
+}
+
+IP-Address-r13 ::= CHOICE {
+ ipv4-r13 BIT STRING (SIZE (32)),
+ ipv6-r13 BIT STRING (SIZE (128))
+}
+
+
UplinkPowerControlCommon ::= SEQUENCE {
p0-NominalPUSCH INTEGER (-126..24),
alpha Alpha-r12,
@@ -5695,6 +5864,7 @@ DeltaTxD-OffsetListPUCCH-v1130 ::= SEQUENCE {
deltaTxD-OffsetPUCCH-Format1bCS-r11 ENUMERATED {dB0, dB-1}
}
+
WLAN-Id-List-r13 ::= SEQUENCE (SIZE (1..maxWLAN-Id-r13)) OF WLAN-Identifiers-r12
@@ -6222,8 +6392,12 @@ MeasId-v1250 ::= INTEGER (maxMeasId-Plus1..maxMeasId-r12)
MeasIdToAddModList ::= SEQUENCE (SIZE (1..maxMeasId)) OF MeasIdToAddMod
+MeasIdToAddModList-v1310 ::= SEQUENCE (SIZE (1..maxMeasId)) OF MeasIdToAddMod-v1310
+
MeasIdToAddModListExt-r12 ::= SEQUENCE (SIZE (1..maxMeasId)) OF MeasIdToAddModExt-r12
+MeasIdToAddModListExt-v1310 ::= SEQUENCE (SIZE (1..maxMeasId)) OF MeasIdToAddMod-v1310
+
MeasIdToAddMod ::= SEQUENCE {
measId MeasId,
measObjectId MeasObjectId,
@@ -6236,14 +6410,10 @@ MeasIdToAddModExt-r12 ::= SEQUENCE {
reportConfigId-r12 ReportConfigId
}
-MeasIdToAddModList-v1310 ::= SEQUENCE (SIZE (1..maxMeasId)) OF MeasIdToAddMod-v1310
-
MeasIdToAddMod-v1310 ::= SEQUENCE {
measObjectId-v1310 MeasObjectId-v1310 OPTIONAL
}
-MeasIdToAddModListExt-v1310 ::= SEQUENCE (SIZE (1..maxMeasId)) OF MeasIdToAddMod-v1310
-
MeasObjectCDMA2000 ::= SEQUENCE {
cdma2000-Type CDMA2000-Type,
@@ -6399,7 +6569,8 @@ MeasObjectToAddModExt-r13 ::= SEQUENCE {
measObjectUTRA-r13 MeasObjectUTRA,
measObjectGERAN-r13 MeasObjectGERAN,
measObjectCDMA2000-r13 MeasObjectCDMA2000,
- ...
+ ...,
+ measObjectWLAN-v1320 MeasObjectWLAN-r13
}
}
@@ -6860,14 +7031,14 @@ ReportConfigInterRAT ::= SEQUENCE {
}
},
...,
- eventW1 SEQUENCE {
+ eventW1-r13 SEQUENCE {
w1-Threshold-r13 WLAN-RSSI-Range-r13
},
- eventW2 SEQUENCE {
+ eventW2-r13 SEQUENCE {
w2-Threshold1-r13 WLAN-RSSI-Range-r13,
w2-Threshold2-r13 WLAN-RSSI-Range-r13
},
- eventW3 SEQUENCE {
+ eventW3-r13 SEQUENCE {
w3-Threshold-r13 WLAN-RSSI-Range-r13
}
},
@@ -7115,6 +7286,9 @@ RAT-Type ::= ENUMERATED {
spare3, spare2, spare1, ...}
+ResumeIdentity-r13 ::= BIT STRING (SIZE(40))
+
+
RRC-TransactionIdentifier ::= INTEGER (0..3)
@@ -7337,7 +7511,7 @@ UE-EUTRA-Capability-v1310-IEs ::= SEQUENCE {
dc-Parameters-v1310 DC-Parameters-v1310 OPTIONAL,
sl-Parameters-v1310 SL-Parameters-v1310 OPTIONAL,
scptm-Parameters-r13 SCPTM-Parameters-r13 OPTIONAL,
- mtc-Parameters-r13 MTC-Parameters-r13 OPTIONAL,
+ ce-Parameters-r13 CE-Parameters-r13 OPTIONAL,
interRAT-ParametersWLAN-r13 IRAT-ParametersWLAN-r13,
laa-Parameters-r13 LAA-Parameters-r13 OPTIONAL,
lwa-Parameters-r13 LWA-Parameters-r13 OPTIONAL,
@@ -7345,6 +7519,15 @@ UE-EUTRA-Capability-v1310-IEs ::= SEQUENCE {
lwip-Parameters-r13 LWIP-Parameters-r13,
fdd-Add-UE-EUTRA-Capabilities-v1310 UE-EUTRA-CapabilityAddXDD-Mode-v1310 OPTIONAL,
tdd-Add-UE-EUTRA-Capabilities-v1310 UE-EUTRA-CapabilityAddXDD-Mode-v1310 OPTIONAL,
+ nonCriticalExtension UE-EUTRA-Capability-v1320-IEs OPTIONAL
+}
+
+UE-EUTRA-Capability-v1320-IEs ::= SEQUENCE {
+ ce-Parameters-v1320 CE-Parameters-v1320 OPTIONAL,
+ phyLayerParameters-v1320 PhyLayerParameters-v1320 OPTIONAL,
+ rf-Parameters-v1320 RF-Parameters-v1320 OPTIONAL,
+ fdd-Add-UE-EUTRA-Capabilities-v1320 UE-EUTRA-CapabilityAddXDD-Mode-v1320 OPTIONAL,
+ tdd-Add-UE-EUTRA-Capabilities-v1320 UE-EUTRA-CapabilityAddXDD-Mode-v1320 OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@@ -7389,6 +7572,11 @@ UE-EUTRA-CapabilityAddXDD-Mode-v1310 ::= SEQUENCE {
phyLayerParameters-v1310 PhyLayerParameters-v1310 OPTIONAL
}
+UE-EUTRA-CapabilityAddXDD-Mode-v1320 ::= SEQUENCE {
+ phyLayerParameters-v1320 PhyLayerParameters-v1320 OPTIONAL,
+ scptm-Parameters-r13 SCPTM-Parameters-r13 OPTIONAL
+}
+
AccessStratumRelease ::= ENUMERATED {
rel8, rel9, rel10, rel11, rel12, rel13,
spare2, spare1, ...}
@@ -7525,6 +7713,56 @@ PhyLayerParameters-v1310 ::= SEQUENCE {
pdsch-CollisionHandling-r13 ENUMERATED {supported} OPTIONAL
}
+PhyLayerParameters-v1320 ::= SEQUENCE {
+ mimo-UE-Parameters-r13 MIMO-UE-Parameters-r13 OPTIONAL
+}
+
+MIMO-UE-Parameters-r13 ::= SEQUENCE {
+ parametersTM9-r13 MIMO-UE-ParametersPerTM-r13 OPTIONAL,
+ parametersTM10-r13 MIMO-UE-ParametersPerTM-r13 OPTIONAL,
+ srs-EnhancementsTDD-r13 ENUMERATED {supported} OPTIONAL,
+ srs-Enhancements-r13 ENUMERATED {supported} OPTIONAL,
+ interferenceMeasRestriction-r13 ENUMERATED {supported} OPTIONAL
+}
+
+MIMO-UE-ParametersPerTM-r13 ::= SEQUENCE {
+ nonPrecoded-r13 MIMO-NonPrecodedCapabilities-r13 OPTIONAL,
+ beamformed-r13 MIMO-UE-BeamformedCapabilities-r13 OPTIONAL,
+ channelMeasRestriction-r13 ENUMERATED {supported} OPTIONAL,
+ dmrs-Enhancements-r13 ENUMERATED {supported} OPTIONAL,
+ csi-RS-EnhancementsTDD-r13 ENUMERATED {supported} OPTIONAL
+}
+
+MIMO-CA-ParametersPerBoBC-r13 ::= SEQUENCE {
+ parametersTM9-r13 MIMO-CA-ParametersPerBoBCPerTM-r13 OPTIONAL,
+ parametersTM10-r13 MIMO-CA-ParametersPerBoBCPerTM-r13 OPTIONAL
+}
+
+MIMO-CA-ParametersPerBoBCPerTM-r13 ::= SEQUENCE {
+ nonPrecoded-r13 MIMO-NonPrecodedCapabilities-r13 OPTIONAL,
+ beamformed-r13 MIMO-BeamformedCapabilityList-r13 OPTIONAL,
+ dmrs-Enhancements-r13 ENUMERATED {different} OPTIONAL
+}
+
+MIMO-NonPrecodedCapabilities-r13 ::= SEQUENCE {
+ config1-r13 ENUMERATED {supported} OPTIONAL,
+ config2-r13 ENUMERATED {supported} OPTIONAL,
+ config3-r13 ENUMERATED {supported} OPTIONAL,
+ config4-r13 ENUMERATED {supported} OPTIONAL
+}
+
+MIMO-UE-BeamformedCapabilities-r13 ::= SEQUENCE {
+ altCodebook-r13 ENUMERATED {supported} OPTIONAL,
+ mimo-BeamformedCapabilities-r13 MIMO-BeamformedCapabilityList-r13
+}
+
+MIMO-BeamformedCapabilityList-r13 ::= SEQUENCE (SIZE (1..maxCSI-Proc-r11)) OF MIMO-BeamformedCapabilities-r13
+
+MIMO-BeamformedCapabilities-r13 ::= SEQUENCE {
+ k-Max-r13 INTEGER (1..8),
+ n-MaxList-r13 BIT STRING (SIZE (1..7)) OPTIONAL
+ }
+
NonContiguousUL-RA-WithinCC-List-r10 ::= SEQUENCE (SIZE (1..maxBands)) OF NonContiguousUL-RA-WithinCC-r10
NonContiguousUL-RA-WithinCC-r10 ::= SEQUENCE {
@@ -7578,7 +7816,7 @@ RF-Parameters-v11d0 ::= SEQUENCE {
}
RF-Parameters-v1250 ::= SEQUENCE {
- supportedBandListEUTRA-v1250 SupportedBandListEUTRA-v1250 OPTIONAL,
+ supportedBandListEUTRA-v1250 SupportedBandListEUTRA-v1250 OPTIONAL,
supportedBandCombination-v1250 SupportedBandCombination-v1250 OPTIONAL,
supportedBandCombinationAdd-v1250 SupportedBandCombinationAdd-v1250 OPTIONAL,
freqBandPriorityAdjustment-r12 ENUMERATED {supported} OPTIONAL
@@ -7602,6 +7840,14 @@ RF-Parameters-v1310 ::= SEQUENCE {
supportedBandListEUTRA-v1310 SupportedBandListEUTRA-v1310 OPTIONAL,
supportedBandCombinationReduced-r13 SupportedBandCombinationReduced-r13 OPTIONAL
}
+
+RF-Parameters-v1320 ::= SEQUENCE {
+ supportedBandListEUTRA-v1320 SupportedBandListEUTRA-v1320 OPTIONAL,
+ supportedBandCombination-v1320 SupportedBandCombination-v1320 OPTIONAL,
+ supportedBandCombinationAdd-v1320 SupportedBandCombinationAdd-v1320 OPTIONAL,
+ supportedBandCombinationReduced-v1320 SupportedBandCombinationReduced-v1320 OPTIONAL
+}
+
SupportedBandCombination-r10 ::= SEQUENCE (SIZE (1..maxBandComb-r10)) OF BandCombinationParameters-r10
SupportedBandCombinationExt-r10 ::= SEQUENCE (SIZE (1..maxBandComb-r10)) OF BandCombinationParametersExt-r10
@@ -7616,6 +7862,8 @@ SupportedBandCombination-v1250 ::= SEQUENCE (SIZE (1..maxBandComb-r10)) OF BandC
SupportedBandCombination-v1270 ::= SEQUENCE (SIZE (1..maxBandComb-r10)) OF BandCombinationParameters-v1270
+SupportedBandCombination-v1320 ::= SEQUENCE (SIZE (1..maxBandComb-r10)) OF BandCombinationParameters-v1320
+
SupportedBandCombinationAdd-r11 ::= SEQUENCE (SIZE (1..maxBandComb-r11)) OF BandCombinationParameters-r11
SupportedBandCombinationAdd-v11d0 ::= SEQUENCE (SIZE (1..maxBandComb-r11)) OF BandCombinationParameters-v10i0
@@ -7624,28 +7872,11 @@ SupportedBandCombinationAdd-v1250 ::= SEQUENCE (SIZE (1..maxBandComb-r11)) OF Ba
SupportedBandCombinationAdd-v1270 ::= SEQUENCE (SIZE (1..maxBandComb-r11)) OF BandCombinationParameters-v1270
-
+SupportedBandCombinationAdd-v1320 ::= SEQUENCE (SIZE (1..maxBandComb-r11)) OF BandCombinationParameters-v1320
SupportedBandCombinationReduced-r13 ::= SEQUENCE (SIZE (1..maxBandComb-r13)) OF BandCombinationParameters-r13
-BandCombinationParameters-r13 ::= SEQUENCE {
- differentFallbackSupported-r13 ENUMERATED {true} OPTIONAL,
- bandParameterList-r13 SEQUENCE (SIZE (1..maxSimultaneousBands-r10)) OF BandParameters-r13,
- supportedBandwidthCombinationSet-r13 SupportedBandwidthCombinationSet-r10 OPTIONAL,
- multipleTimingAdvance-r13 ENUMERATED {supported} OPTIONAL,
- simultaneousRx-Tx-r13 ENUMERATED {supported} OPTIONAL,
- bandInfoEUTRA-r13 BandInfoEUTRA,
- dc-Support-r13 SEQUENCE {
- asynchronous-r13 ENUMERATED {supported} OPTIONAL,
- supportedCellGrouping-r13 CHOICE {
- threeEntries-r13 BIT STRING (SIZE(3)),
- fourEntries-r13 BIT STRING (SIZE(7)),
- fiveEntries-r13 BIT STRING (SIZE(15))
- } OPTIONAL
- } OPTIONAL,
- supportedNAICS-2CRS-AP-r13 BIT STRING (SIZE (1..maxNAICS-Entries-r12)) OPTIONAL,
- commSupportedBandsPerBC-r13 BIT STRING (SIZE (1.. maxBands)) OPTIONAL
-}
+SupportedBandCombinationReduced-v1320 ::= SEQUENCE (SIZE (1..maxBandComb-r13)) OF BandCombinationParameters-v1320
BandCombinationParameters-r10 ::= SEQUENCE (SIZE (1..maxSimultaneousBands-r10)) OF BandParameters-r10
@@ -7696,6 +7927,30 @@ BandCombinationParameters-v1270 ::= SEQUENCE {
BandParameters-v1270 OPTIONAL
}
+BandCombinationParameters-r13 ::= SEQUENCE {
+ differentFallbackSupported-r13 ENUMERATED {true} OPTIONAL,
+ bandParameterList-r13 SEQUENCE (SIZE (1..maxSimultaneousBands-r10)) OF BandParameters-r13,
+ supportedBandwidthCombinationSet-r13 SupportedBandwidthCombinationSet-r10 OPTIONAL,
+ multipleTimingAdvance-r13 ENUMERATED {supported} OPTIONAL,
+ simultaneousRx-Tx-r13 ENUMERATED {supported} OPTIONAL,
+ bandInfoEUTRA-r13 BandInfoEUTRA,
+ dc-Support-r13 SEQUENCE {
+ asynchronous-r13 ENUMERATED {supported} OPTIONAL,
+ supportedCellGrouping-r13 CHOICE {
+ threeEntries-r13 BIT STRING (SIZE(3)),
+ fourEntries-r13 BIT STRING (SIZE(7)),
+ fiveEntries-r13 BIT STRING (SIZE(15))
+ } OPTIONAL
+ } OPTIONAL,
+ supportedNAICS-2CRS-AP-r13 BIT STRING (SIZE (1..maxNAICS-Entries-r12)) OPTIONAL,
+ commSupportedBandsPerBC-r13 BIT STRING (SIZE (1.. maxBands)) OPTIONAL
+}
+
+BandCombinationParameters-v1320 ::= SEQUENCE {
+ bandParameterList-v1320 SEQUENCE (SIZE (1..maxSimultaneousBands-r10)) OF
+ BandParameters-v1320 OPTIONAL,
+ additionalRx-Tx-PerformanceReq-r13 ENUMERATED {supported} OPTIONAL
+}
SupportedBandwidthCombinationSet-r10 ::= BIT STRING (SIZE (1..maxBandwidthCombSet-r10))
@@ -7736,6 +7991,10 @@ BandParameters-r13 ::= SEQUENCE {
supportedCSI-Proc-r13 ENUMERATED {n1, n3, n4} OPTIONAL
}
+BandParameters-v1320 ::= SEQUENCE {
+ bandParametersDL-v1320 MIMO-CA-ParametersPerBoBC-r13
+}
+
BandParametersUL-r10 ::= SEQUENCE (SIZE (1..maxBandwidthClass-r10)) OF CA-MIMO-ParametersUL-r10
BandParametersUL-r13 ::= CA-MIMO-ParametersUL-r10
@@ -7790,6 +8049,8 @@ SupportedBandListEUTRA-v1250 ::= SEQUENCE (SIZE (1..maxBands)) OF SupportedBand
SupportedBandListEUTRA-v1310 ::= SEQUENCE (SIZE (1..maxBands)) OF SupportedBandEUTRA-v1310
+SupportedBandListEUTRA-v1320 ::= SEQUENCE (SIZE (1..maxBands)) OF SupportedBandEUTRA-v1320
+
SupportedBandEUTRA ::= SEQUENCE {
bandEUTRA FreqBandIndicator,
halfDuplex BOOLEAN
@@ -7803,8 +8064,13 @@ SupportedBandEUTRA-v1250 ::= SEQUENCE {
dl-256QAM-r12 ENUMERATED {supported} OPTIONAL,
ul-64QAM-r12 ENUMERATED {supported} OPTIONAL
}
+
SupportedBandEUTRA-v1310 ::= SEQUENCE {
- powerClass-20dBm-r13 ENUMERATED {supported} OPTIONAL
+ ue-PowerClass-5-r13 ENUMERATED {supported} OPTIONAL
+}
+SupportedBandEUTRA-v1320 ::= SEQUENCE {
+ intraFreq-CE-NeedForGaps-r13 ENUMERATED {supported} OPTIONAL,
+ ue-PowerClass-N-r13 ENUMERATED {class1, class2, class4} OPTIONAL
}
MeasParameters ::= SEQUENCE {
@@ -8038,11 +8304,18 @@ SCPTM-Parameters-r13 ::= SEQUENCE {
scptm-AsyncDC-r13 ENUMERATED {supported} OPTIONAL
}
-MTC-Parameters-r13 ::= SEQUENCE {
+CE-Parameters-r13 ::= SEQUENCE {
ce-ModeA-r13 ENUMERATED {supported} OPTIONAL,
ce-ModeB-r13 ENUMERATED {supported} OPTIONAL
}
+CE-Parameters-v1320 ::= SEQUENCE {
+ intraFreqA3-CE-ModeA-r13 ENUMERATED {supported} OPTIONAL,
+ intraFreqA3-CE-ModeB-r13 ENUMERATED {supported} OPTIONAL,
+ intraFreqHO-CE-ModeA-r13 ENUMERATED {supported} OPTIONAL,
+ intraFreqHO-CE-ModeB-r13 ENUMERATED {supported} OPTIONAL
+}
+
LAA-Parameters-r13 ::= SEQUENCE {
crossCarrierSchedulingLAA-DL-r13 ENUMERATED {supported} OPTIONAL,
csi-RS-DRS-RRM-MeasurementsLAA-r13 ENUMERATED {supported} OPTIONAL,
@@ -8101,15 +8374,6 @@ SL-Parameters-v1310 ::= SEQUENCE {
discPeriodicSLSS-r13 ENUMERATED {supported} OPTIONAL
}
-LAA-parameters-r13 ::= SEQUENCE {
- crossCarrierSchedulingLAA-DL-r13 ENUMERATED {supported} OPTIONAL,
- csi-RS-DRS-RRM-MeasurementsLAA-r13 ENUMERATED {supported} OPTIONAL,
- downlinkLAA-r13 ENUMERATED {supported} OPTIONAL,
- endingDwPTS-r13 ENUMERATED {supported} OPTIONAL,
- secondSlotStartingPosition-r13 ENUMERATED {supported} OPTIONAL,
- tm9-LAA-r13 ENUMERATED {supported} OPTIONAL,
- tm10-LAA-r13 ENUMERATED {supported} OPTIONAL
-}
SupportedBandInfoList-r12 ::= SEQUENCE (SIZE (1..maxBands)) OF SupportedBandInfo-r12
@@ -8123,7 +8387,7 @@ FreqBandIndicatorListEUTRA-r12 ::= SEQUENCE (SIZE (1..maxBands)) OF FreqBandInd
UE-RadioPagingInfo-r12 ::= SEQUENCE {
ue-Category-v1250 INTEGER (0) OPTIONAL,
...,
- [[ ue-CategoryDL-M-v1310 ENUMERATED {m1} OPTIONAL,
+ [[ ue-CategoryDL-v1310 ENUMERATED {m1} OPTIONAL,
ce-ModeA-r13 ENUMERATED {true} OPTIONAL,
ce-ModeB-r13 ENUMERATED {true} OPTIONAL
]]
@@ -8331,7 +8595,7 @@ SC-MTCH-Info-r13 ::= SEQUENCE {
MBMSSessionInfo-r13 ::= SEQUENCE {
tmgi-r13 TMGI-r9,
- sessionId-r13 OCTET STRING (SIZE (1)) OPTIONAL -- Need OR
+ sessionId-r13 OCTET STRING (SIZE (1)) OPTIONAL -- Need OR
}
SC-MTCH-SchedulingInfo-r13::= SEQUENCE {
@@ -8979,7 +9243,7 @@ maxSL-DiscPowerClass-r12 INTEGER ::= 3 -- Maximum number of sidelink power clas
maxSL-DiscRxPoolPreconf-r13 INTEGER ::= 16 -- Maximum number of preconfigured sidelink
-- discovery Rx resource pool entries
maxSL-DiscSysInfoReportFreq-r13 INTEGER ::= 8 -- Maximum number of frequencies to include in a
- -- UESidelinkInformation for SI reporting
+ -- SidelinkUEInformation for SI reporting
maxSL-DiscTxPoolPreconf-r13 INTEGER ::= 4 -- Maximum number of preconfigured sidelink
-- discovery Tx resource pool entries
maxSL-GP-r13 INTEGER ::= 8 -- Maximum number of gap patterns that can be requested
diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn
index 25f1b6049f..358c38115d 100644
--- a/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn
+++ b/epan/dissectors/asn1/lte-rrc/EUTRA-Sidelink-Preconf.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V13.1.0 (2016-03)
+-- 3GPP TS 36.331 V13.2.0 (2016-06)
--
EUTRA-Sidelink-Preconf DEFINITIONS AUTOMATIC TAGS ::=
diff --git a/epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn b/epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn
index 6f8b847ed4..4d164ffc7c 100644
--- a/epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn
+++ b/epan/dissectors/asn1/lte-rrc/EUTRA-UE-Variables.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V13.1.0 (2016-03)
+-- 3GPP TS 36.331 V13.2.0 (2016-06)
--
EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
@@ -180,6 +180,14 @@ VarShortMAC-Input ::= SEQUENCE {
c-RNTI C-RNTI
}
+VarShortResumeMAC-Input-r13 ::= SEQUENCE {
+ cellIdentity-r13 CellIdentity,
+ physCellId-r13 PhysCellId,
+ c-RNTI-r13 C-RNTI,
+ resumeDiscriminator-r13 BIT STRING(SIZE(1))
+}
+
+
VarWLAN-MobilityConfig ::= SEQUENCE {
wlan-MobilitySet-r13 WLAN-Id-List-r13 OPTIONAL,
successReportRequested ENUMERATED {true} OPTIONAL
@@ -187,8 +195,7 @@ VarWLAN-MobilityConfig ::= SEQUENCE {
VarWLAN-Status-r13 ::= SEQUENCE {
- status-r13 WLAN-Status-r13,
- wlan-IdentifiersAssociated-r13 WLAN-Identifiers-r12 OPTIONAL
+ status-r13 WLAN-Status-r13
}
diff --git a/epan/dissectors/asn1/lte-rrc/Makefile.am b/epan/dissectors/asn1/lte-rrc/Makefile.am
index 7b98fdc08a..ec704830bb 100644
--- a/epan/dissectors/asn1/lte-rrc/Makefile.am
+++ b/epan/dissectors/asn1/lte-rrc/Makefile.am
@@ -29,7 +29,10 @@ ASN_FILE_LIST = \
EUTRA-RRC-Definitions.asn \
EUTRA-Sidelink-Preconf.asn \
EUTRA-UE-Variables.asn \
- PC5-RRC-Definitions.asn
+ PC5-RRC-Definitions.asn \
+ NBIOT-InterNodeDefinitions.asn \
+ NBIOT-RRC-Definitions.asn \
+ NBIOT-UE-Variables.asn
EXTRA_DIST = \
$(EXTRA_DIST_COMMON) \
diff --git a/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn b/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn
new file mode 100644
index 0000000000..e6609f0751
--- /dev/null
+++ b/epan/dissectors/asn1/lte-rrc/NBIOT-InterNodeDefinitions.asn
@@ -0,0 +1,133 @@
+-- 3GPP TS 36.331 V13.2.0 (2016-06)
+--
+NBIOT-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
+
+BEGIN
+
+IMPORTS
+ C-RNTI,
+ PhysCellId,
+ SecurityAlgorithmConfig,
+ ShortMAC-I
+FROM EUTRA-RRC-Definitions
+
+ AdditionalReestabInfoList
+FROM EUTRA-InterNodeDefinitions
+
+ CarrierFreq-NB-r13,
+ RadioResourceConfigDedicated-NB-r13,
+ UE-Capability-NB-r13,
+ UE-RadioPagingInfo-NB-r13
+FROM NBIOT-RRC-Definitions;
+
+
+HandoverPreparationInformation-NB ::= SEQUENCE {
+ criticalExtensions CHOICE {
+ c1 CHOICE{
+ handoverPreparationInformation-r13 HandoverPreparationInformation-NB-IEs,
+ spare3 NULL, spare2 NULL, spare1 NULL
+ },
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+HandoverPreparationInformation-NB-IEs ::= SEQUENCE {
+ ue-RadioAccessCapabilityInfo-r13 UE-Capability-NB-r13,
+ as-Config-r13 AS-Config-NB,
+ rrm-Config-r13 RRM-Config-NB OPTIONAL,
+ as-Context-r13 AS-Context-NB OPTIONAL,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+UEPagingCoverageInformation-NB ::= SEQUENCE {
+ criticalExtensions CHOICE {
+ c1 CHOICE{
+ uePagingCoverageInformation-r13 UEPagingCoverageInformation-NB-IEs,
+ spare3 NULL, spare2 NULL, spare1 NULL
+ },
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+UEPagingCoverageInformation-NB-IEs ::= SEQUENCE {
+-- the possible value(s) can differ from those sent on Uu
+ npdcch-NumRepetitionPaging-r13 INTEGER (1..2048) OPTIONAL,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+UERadioAccessCapabilityInformation-NB ::= SEQUENCE {
+ criticalExtensions CHOICE {
+ c1 CHOICE{
+ ueRadioAccessCapabilityInformation-r13
+ UERadioAccessCapabilityInformation-NB-IEs,
+ spare3 NULL, spare2 NULL, spare1 NULL
+ },
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+UERadioAccessCapabilityInformation-NB-IEs ::= SEQUENCE {
+ ue-RadioAccessCapabilityInfo-r13 OCTET STRING (CONTAINING UE-Capability-NB-r13),
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+UERadioPagingInformation-NB ::= SEQUENCE {
+ criticalExtensions CHOICE {
+ c1 CHOICE{
+ ueRadioPagingInformation-r13 UERadioPagingInformation-NB-IEs,
+ spare3 NULL, spare2 NULL, spare1 NULL
+ },
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+UERadioPagingInformation-NB-IEs ::= SEQUENCE {
+ ue-RadioPagingInfo-r13 OCTET STRING (CONTAINING UE-RadioPagingInfo-NB-r13),
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+AS-Config-NB ::= SEQUENCE {
+ sourceRadioResourceConfig-r13 RadioResourceConfigDedicated-NB-r13,
+ sourceSecurityAlgorithmConfig-r13 SecurityAlgorithmConfig,
+ sourceUE-Identity-r13 C-RNTI,
+ sourceDl-CarrierFreq-r13 CarrierFreq-NB-r13,
+ ...
+}
+
+
+AS-Context-NB ::= SEQUENCE {
+ reestablishmentInfo-r13 ReestablishmentInfo-NB OPTIONAL,
+ ...
+}
+
+
+ReestablishmentInfo-NB ::= SEQUENCE {
+ sourcePhysCellId-r13 PhysCellId,
+ targetCellShortMAC-I-r13 ShortMAC-I,
+ additionalReestabInfoList-r13 AdditionalReestabInfoList OPTIONAL,
+ ...
+}
+
+
+
+
+RRM-Config-NB ::= SEQUENCE {
+ ue-InactiveTime ENUMERATED {
+ s1, s2, s3, s5, s7, s10, s15, s20,
+ s25, s30, s40, s50, min1, min1s20, min1s40,
+ min2, min2s30, min3, min3s30, min4, min5, min6,
+ min7, min8, min9, min10, min12, min14, min17, min20,
+ min24, min28, min33, min38, min44, min50, hr1,
+ hr1min30, hr2, hr2min30, hr3, hr3min30, hr4, hr5, hr6,
+ hr8, hr10, hr13, hr16, hr20, day1, day1hr12, day2,
+ day2hr12, day3, day4, day5, day7, day10, day14, day19,
+ day24, day30, dayMoreThan30} OPTIONAL,
+ ...
+}
+
+
+END
diff --git a/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn b/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn
new file mode 100644
index 0000000000..5ad869147b
--- /dev/null
+++ b/epan/dissectors/asn1/lte-rrc/NBIOT-RRC-Definitions.asn
@@ -0,0 +1,1184 @@
+-- 3GPP TS 36.331 V13.2.0 (2016-06)
+--
+NBIOT-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
+
+BEGIN
+
+IMPORTS
+ RRCConnectionReestablishmentReject,
+ SecurityModeCommand,
+ SecurityModeComplete,
+ SecurityModeFailure,
+ AdditionalSpectrumEmission,
+ ARFCN-ValueEUTRA-r9,
+ CellIdentity,
+ DedicatedInfoNAS,
+ DRB-Identity,
+ InitialUE-Identity,
+ IntraFreqBlackCellList,
+ IntraFreqNeighCellList,
+ maxBands,
+ maxCellBlack,
+ maxCellInter,
+ maxFBI2,
+ maxFreq,
+ maxMultiBands,
+ maxPageRec,
+ maxPLMN-r11,
+ maxSIB,
+ maxSIB-1,
+ NextHopChainingCount,
+ PagingUE-Identity,
+ PLMN-Identity,
+ P-Max,
+ PowerRampingParameters,
+ PreambleTransMax,
+ PhysCellId,
+ Q-OffsetRange,
+ Q-QualMin-r9,
+ Q-RxLevMin,
+ ReestabUE-Identity,
+ RegisteredMME,
+ ReselectionThreshold,
+ ResumeIdentity-r13,
+ RRC-TransactionIdentifier,
+ RSRP-Range,
+ ShortMAC-I,
+ S-TMSI,
+ SystemInformationBlockType16-r11,
+ SystemInfoValueTagSI-r13,
+ TimeAlignmentTimer,
+ TrackingAreaCode
+FROM EUTRA-RRC-Definitions;
+
+
+BCCH-BCH-Message-NB ::= SEQUENCE {
+ message BCCH-BCH-MessageType-NB
+}
+
+
+BCCH-BCH-MessageType-NB::= MasterInformationBlock-NB
+
+
+
+BCCH-DL-SCH-Message-NB ::= SEQUENCE {
+ message BCCH-DL-SCH-MessageType-NB
+}
+
+BCCH-DL-SCH-MessageType-NB ::= CHOICE {
+ c1 CHOICE {
+ systemInformation-r13 SystemInformation-NB,
+ systemInformationBlockType1-r13 SystemInformationBlockType1-NB
+ },
+ messageClassExtension SEQUENCE {}
+}
+
+
+PCCH-Message-NB ::= SEQUENCE {
+ message PCCH-MessageType-NB
+}
+
+PCCH-MessageType-NB ::= CHOICE {
+ c1 CHOICE {
+ paging-r13 Paging-NB
+ },
+ messageClassExtension SEQUENCE {}
+}
+
+
+DL-CCCH-Message-NB ::= SEQUENCE {
+ message DL-CCCH-MessageType-NB
+}
+
+DL-CCCH-MessageType-NB ::= CHOICE {
+ c1 CHOICE {
+ rrcConnectionReestablishment-r13 RRCConnectionReestablishment-NB,
+ rrcConnectionReestablishmentReject-r13 RRCConnectionReestablishmentReject,
+ rrcConnectionReject-r13 RRCConnectionReject-NB,
+ rrcConnectionSetup-r13 RRCConnectionSetup-NB,
+ spare4 NULL, spare3 NULL, spare2 NULL, spare1 NULL
+ },
+ messageClassExtension SEQUENCE {}
+}
+
+
+DL-DCCH-Message-NB ::= SEQUENCE {
+ message DL-DCCH-MessageType-NB
+}
+
+DL-DCCH-MessageType-NB ::= CHOICE {
+ c1 CHOICE {
+ dlInformationTransfer-r13 DLInformationTransfer-NB,
+ rrcConnectionReconfiguration-r13 RRCConnectionReconfiguration-NB,
+ rrcConnectionRelease-r13 RRCConnectionRelease-NB,
+ securityModeCommand-r13 SecurityModeCommand,
+ ueCapabilityEnquiry-r13 UECapabilityEnquiry-NB,
+ rrcConnectionResume-r13 RRCConnectionResume-NB,
+ spare2 NULL, spare1 NULL
+ },
+ messageClassExtension SEQUENCE {}
+}
+
+
+
+UL-CCCH-Message-NB ::= SEQUENCE {
+ message UL-CCCH-MessageType-NB
+}
+
+UL-CCCH-MessageType-NB ::= CHOICE {
+ c1 CHOICE {
+ rrcConnectionReestablishmentRequest-r13 RRCConnectionReestablishmentRequest-NB,
+ rrcConnectionRequest-r13 RRCConnectionRequest-NB,
+ rrcConnectionResumeRequest-r13 RRCConnectionResumeRequest-NB,
+ spare1 NULL
+ },
+ messageClassExtension SEQUENCE {}
+}
+
+
+UL-DCCH-Message-NB ::= SEQUENCE {
+ message UL-DCCH-MessageType-NB
+}
+
+UL-DCCH-MessageType-NB ::= CHOICE {
+ c1 CHOICE {
+ rrcConnectionReconfigurationComplete-r13 RRCConnectionReconfigurationComplete-NB,
+ rrcConnectionReestablishmentComplete-r13 RRCConnectionReestablishmentComplete-NB,
+ rrcConnectionSetupComplete-r13 RRCConnectionSetupComplete-NB,
+ securityModeComplete-r13 SecurityModeComplete,
+ securityModeFailure-r13 SecurityModeFailure,
+ ueCapabilityInformation-r13 UECapabilityInformation-NB,
+ ulInformationTransfer-r13 ULInformationTransfer-NB,
+ rrcConnectionResumeComplete-r13 RRCConnectionResumeComplete-NB,
+ spare8 NULL, spare7 NULL,
+ spare6 NULL, spare5 NULL, spare4 NULL,
+ spare3 NULL, spare2 NULL, spare1 NULL
+ },
+ messageClassExtension SEQUENCE {}
+}
+
+
+DLInformationTransfer-NB ::= SEQUENCE {
+ rrc-TransactionIdentifier RRC-TransactionIdentifier,
+ criticalExtensions CHOICE {
+ c1 CHOICE {
+ dlInformationTransfer-r13 DLInformationTransfer-NB-r13-IEs,
+ spare1 NULL
+ },
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+DLInformationTransfer-NB-r13-IEs ::= SEQUENCE {
+ dedicatedInfoNAS-r13 DedicatedInfoNAS,
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+MasterInformationBlock-NB ::= SEQUENCE {
+ systemFrameNumber-MSB-r13 BIT STRING (SIZE (4)),
+ hyperSFN-LSB-r13 BIT STRING (SIZE (2)),
+ schedulingInfoSIB1-r13 INTEGER (0..15),
+ systemInfoValueTag-r13 INTEGER (0..31),
+ ab-Enabled-r13 BOOLEAN,
+ operationModeInfo-r13 CHOICE {
+ inband-SamePCI-r13 Inband-SamePCI-NB-r13,
+ inband-DifferentPCI-r13 Inband-DifferentPCI-NB-r13,
+ guardband-r13 Guardband-NB-r13,
+ standalone-r13 Standalone-NB-r13
+ },
+ spare BIT STRING (SIZE (11))
+}
+
+ChannelRasterOffset-NB-r13 ::= ENUMERATED {khz-7dot5, khz-2dot5, khz2dot5, khz7dot5}
+
+Guardband-NB-r13 ::= SEQUENCE {
+ rasterOffset-r13 ChannelRasterOffset-NB-r13,
+ spare BIT STRING (SIZE (3))
+}
+
+Inband-SamePCI-NB-r13 ::= SEQUENCE {
+ eutra-CRS-SequenceInfo-r13 INTEGER (0..31)
+}
+
+Inband-DifferentPCI-NB-r13 ::= SEQUENCE {
+ eutra-NumCRS-Ports-r13 ENUMERATED {same, four},
+ rasterOffset-r13 ChannelRasterOffset-NB-r13,
+ spare BIT STRING (SIZE (2))
+}
+
+Standalone-NB-r13 ::= SEQUENCE {
+ spare BIT STRING (SIZE (5))
+}
+
+
+Paging-NB ::= SEQUENCE {
+ pagingRecordList-r13 PagingRecordList-NB-r13 OPTIONAL, -- Need ON
+ systemInfoModification-r13 ENUMERATED {true} OPTIONAL, -- Need ON
+ systemInfoModification-eDRX-r13 ENUMERATED {true} OPTIONAL, -- Need ON
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+PagingRecordList-NB-r13 ::= SEQUENCE (SIZE (1..maxPageRec)) OF PagingRecord-NB-r13
+
+PagingRecord-NB-r13 ::= SEQUENCE {
+ ue-Identity-r13 PagingUE-Identity,
+ ...
+}
+
+
+RRCConnectionReconfiguration-NB ::= SEQUENCE {
+ rrc-TransactionIdentifier RRC-TransactionIdentifier,
+ criticalExtensions CHOICE {
+ c1 CHOICE{
+ rrcConnectionReconfiguration-r13 RRCConnectionReconfiguration-NB-r13-IEs,
+ spare1 NULL
+ },
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+RRCConnectionReconfiguration-NB-r13-IEs ::= SEQUENCE {
+ dedicatedInfoNASList-r13 SEQUENCE (SIZE(1..maxDRB-NB-r13)) OF
+ DedicatedInfoNAS OPTIONAL, -- Need ON
+ radioResourceConfigDedicated-r13 RadioResourceConfigDedicated-NB-r13 OPTIONAL, -- Need ON
+ fullConfig-r13 ENUMERATED {true} OPTIONAL, -- Cond Reestab
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+RRCConnectionReconfigurationComplete-NB ::= SEQUENCE {
+ rrc-TransactionIdentifier RRC-TransactionIdentifier,
+ criticalExtensions CHOICE {
+ rrcConnectionReconfigurationComplete-r13 RRCConnectionReconfigurationComplete-NB-r13-IEs,
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+RRCConnectionReconfigurationComplete-NB-r13-IEs ::= SEQUENCE {
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+
+RRCConnectionReestablishment-NB ::= SEQUENCE {
+ rrc-TransactionIdentifier RRC-TransactionIdentifier,
+ criticalExtensions CHOICE {
+ c1 CHOICE{
+ rrcConnectionReestablishment-r13 RRCConnectionReestablishment-NB-r13-IEs,
+ spare1 NULL
+ },
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+RRCConnectionReestablishment-NB-r13-IEs ::= SEQUENCE {
+ radioResourceConfigDedicated-r13 RadioResourceConfigDedicated-NB-r13,
+ nextHopChainingCount-r13 NextHopChainingCount,
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+RRCConnectionReestablishmentComplete-NB ::= SEQUENCE {
+ rrc-TransactionIdentifier RRC-TransactionIdentifier,
+ criticalExtensions CHOICE {
+ rrcConnectionReestablishmentComplete-r13 RRCConnectionReestablishmentComplete-NB-r13-IEs,
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+RRCConnectionReestablishmentComplete-NB-r13-IEs ::= SEQUENCE {
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+RRCConnectionReestablishmentRequest-NB ::= SEQUENCE {
+ criticalExtensions CHOICE {
+ rrcConnectionReestablishmentRequest-r13
+ RRCConnectionReestablishmentRequest-NB-r13-IEs,
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+RRCConnectionReestablishmentRequest-NB-r13-IEs ::= SEQUENCE {
+ ue-Identity-r13 ReestabUE-Identity,
+ reestablishmentCause-r13 ReestablishmentCause-NB-r13,
+ spare BIT STRING (SIZE (25))
+}
+
+
+ReestablishmentCause-NB-r13 ::= ENUMERATED {
+ reconfigurationFailure, otherFailure,
+ spare2, spare1}
+
+
+RRCConnectionReject-NB ::= SEQUENCE {
+ criticalExtensions CHOICE {
+ c1 CHOICE {
+ rrcConnectionReject-r13 RRCConnectionReject-NB-r13-IEs,
+ spare1 NULL
+ },
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+RRCConnectionReject-NB-r13-IEs ::= SEQUENCE {
+ extendedWaitTime-r13 INTEGER (1..1800),
+ rrc-SuspendIndication-r13 ENUMERATED {true} OPTIONAL, -- Need ON
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+RRCConnectionRelease-NB ::= SEQUENCE {
+ rrc-TransactionIdentifier RRC-TransactionIdentifier,
+ criticalExtensions CHOICE {
+ c1 CHOICE {
+ rrcConnectionRelease-r13 RRCConnectionRelease-NB-r13-IEs,
+ spare1 NULL
+ },
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+RRCConnectionRelease-NB-r13-IEs ::= SEQUENCE {
+ releaseCause-r13 ReleaseCause-NB-r13,
+ resumeIdentity-r13 ResumeIdentity-r13 OPTIONAL, -- Need OR
+ extendedWaitTime-r13 INTEGER (1..1800) OPTIONAL, -- Need ON
+ redirectedCarrierInfo-r13 RedirectedCarrierInfo-NB-r13 OPTIONAL, -- Need ON
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+ReleaseCause-NB-r13 ::= ENUMERATED {loadBalancingTAUrequired, other,
+ rrc-Suspend, spare1}
+
+RedirectedCarrierInfo-NB-r13::= CarrierFreq-NB-r13
+
+RRCConnectionRequest-NB ::= SEQUENCE {
+ criticalExtensions CHOICE {
+ rrcConnectionRequest-r13 RRCConnectionRequest-NB-r13-IEs,
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+RRCConnectionRequest-NB-r13-IEs ::= SEQUENCE {
+ ue-Identity-r13 InitialUE-Identity,
+ establishmentCause-r13 EstablishmentCause-NB-r13,
+ multiToneSupport-r13 ENUMERATED {true} OPTIONAL,
+ multiCarrierSupport-r13 ENUMERATED {true} OPTIONAL,
+ spare BIT STRING (SIZE (22))
+}
+
+
+RRCConnectionResume-NB ::= SEQUENCE {
+ rrc-TransactionIdentifier RRC-TransactionIdentifier,
+ criticalExtensions CHOICE {
+ c1 CHOICE {
+ rrcConnectionResume-r13 RRCConnectionResume-NB-r13-IEs,
+ spare1 NULL
+ },
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+RRCConnectionResume-NB-r13-IEs ::= SEQUENCE {
+ radioResourceConfigDedicated-r13 RadioResourceConfigDedicated-NB-r13 OPTIONAL, -- Need ON
+ nextHopChainingCount-r13 NextHopChainingCount,
+ drb-ContinueROHC-r13 ENUMERATED {true} OPTIONAL, -- Need OP
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+RRCConnectionResumeComplete-NB ::= SEQUENCE {
+ rrc-TransactionIdentifier RRC-TransactionIdentifier,
+ criticalExtensions CHOICE {
+ rrcConnectionResumeComplete-r13 RRCConnectionResumeComplete-NB-r13-IEs,
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+RRCConnectionResumeComplete-NB-r13-IEs ::= SEQUENCE {
+ selectedPLMN-Identity-r13 INTEGER (1..maxPLMN-r11) OPTIONAL,
+ dedicatedInfoNAS-r13 DedicatedInfoNAS OPTIONAL,
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+RRCConnectionResumeRequest-NB ::= SEQUENCE {
+ criticalExtensions CHOICE {
+ rrcConnectionResumeRequest-r13 RRCConnectionResumeRequest-NB-r13-IEs,
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+RRCConnectionResumeRequest-NB-r13-IEs ::= SEQUENCE {
+ resumeID-r13 ResumeIdentity-r13,
+ shortResumeMAC-I-r13 ShortMAC-I,
+ resumeCause-r13 EstablishmentCause-NB-r13,
+ spare BIT STRING (SIZE (9))
+}
+
+
+RRCConnectionSetup-NB ::= SEQUENCE {
+ rrc-TransactionIdentifier RRC-TransactionIdentifier,
+ criticalExtensions CHOICE {
+ c1 CHOICE {
+ rrcConnectionSetup-r13 RRCConnectionSetup-NB-r13-IEs,
+ spare1 NULL
+ },
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+RRCConnectionSetup-NB-r13-IEs ::= SEQUENCE {
+ radioResourceConfigDedicated-r13 RadioResourceConfigDedicated-NB-r13,
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+RRCConnectionSetupComplete-NB ::= SEQUENCE {
+ rrc-TransactionIdentifier RRC-TransactionIdentifier,
+ criticalExtensions CHOICE{
+ rrcConnectionSetupComplete-r13 RRCConnectionSetupComplete-NB-r13-IEs,
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+RRCConnectionSetupComplete-NB-r13-IEs ::= SEQUENCE {
+ selectedPLMN-Identity-r13 INTEGER (1..maxPLMN-r11),
+ s-TMSI-r13 S-TMSI OPTIONAL,
+ registeredMME-r13 RegisteredMME OPTIONAL,
+ dedicatedInfoNAS-r13 DedicatedInfoNAS,
+ attachWithoutPDN-Connectivity-r13 ENUMERATED {true} OPTIONAL,
+ up-CIoT-EPS-Optimisation-r13 ENUMERATED {true} OPTIONAL,
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+SystemInformation-NB ::= SEQUENCE {
+ criticalExtensions CHOICE {
+ systemInformation-r13 SystemInformation-NB-r13-IEs,
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+SystemInformation-NB-r13-IEs ::= SEQUENCE {
+ sib-TypeAndInfo-r13 SEQUENCE (SIZE (1..maxSIB)) OF CHOICE {
+ sib2-r13 SystemInformationBlockType2-NB-r13,
+ sib3-r13 SystemInformationBlockType3-NB-r13,
+ sib4-r13 SystemInformationBlockType4-NB-r13,
+ sib5-r13 SystemInformationBlockType5-NB-r13,
+ sib14-r13 SystemInformationBlockType14-NB-r13,
+ sib16-r13 SystemInformationBlockType16-NB-r13,
+ ...
+ },
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+SystemInformationBlockType1-NB ::= SEQUENCE {
+ hyperSFN-MSB-r13 BIT STRING (SIZE (8)),
+ cellAccessRelatedInfo-r13 SEQUENCE {
+ plmn-IdentityList-r13 PLMN-IdentityList-NB-r13,
+ trackingAreaCode-r13 TrackingAreaCode,
+ cellIdentity-r13 CellIdentity,
+ cellBarred-r13 ENUMERATED {barred, notBarred},
+ intraFreqReselection-r13 ENUMERATED {allowed, notAllowed}
+ },
+ cellSelectionInfo-r13 SEQUENCE {
+ q-RxLevMin-r13 Q-RxLevMin,
+ q-QualMin-r13 Q-QualMin-r9
+ },
+ p-Max-r13 P-Max OPTIONAL, -- Need OP
+ freqBandIndicator-r13 FreqBandIndicator-NB-r13,
+ freqBandInfo-r13 NS-PmaxList-NB-r13 OPTIONAL, -- Need OR
+ multiBandInfoList-r13 MultiBandInfoList-NB-r13 OPTIONAL, -- Need OR
+ downlinkBitmap-r13 DL-Bitmap-NB-r13 OPTIONAL, -- Need OP,
+ eutraControlRegionSize-r13 ENUMERATED {n1, n2, n3} OPTIONAL, -- Cond inband
+ nrs-CRS-PowerOffset-r13 ENUMERATED {dB-6, dB-4dot77, dB-3,
+ dB-1dot77, dB0, dB1,
+ dB1dot23, dB2, dB3,
+ dB4, dB4dot23, dB5,
+ dB6, dB7, dB8,
+ dB9} OPTIONAL, -- Cond inband-SamePCI
+ schedulingInfoList-r13 SchedulingInfoList-NB-r13,
+ si-WindowLength-r13 ENUMERATED {ms160, ms320, ms480, ms640,
+ ms960, ms1280, ms1600, spare1},
+ si-RadioFrameOffset-r13 INTEGER (1..15) OPTIONAL, -- Need OP
+ systemInfoValueTagList-r13 SystemInfoValueTagList-NB-r13 OPTIONAL, -- Need OR
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+PLMN-IdentityList-NB-r13 ::= SEQUENCE (SIZE (1..maxPLMN-r11)) OF PLMN-IdentityInfo-NB-r13
+
+PLMN-IdentityInfo-NB-r13 ::= SEQUENCE {
+ plmn-Identity-r13 PLMN-Identity,
+ cellReservedForOperatorUse-r13 ENUMERATED {reserved, notReserved},
+ attachWithoutPDN-Connectivity-r13 ENUMERATED {true} OPTIONAL -- Need OP
+}
+
+SchedulingInfoList-NB-r13 ::= SEQUENCE (SIZE (1..maxSI-Message-NB-r13)) OF SchedulingInfo-NB-r13
+
+SchedulingInfo-NB-r13::= SEQUENCE {
+ si-Periodicity-r13 ENUMERATED {rf64, rf128, rf256, rf512,
+ rf1024, rf2048, rf4096, spare},
+ si-RepetitionPattern-r13 ENUMERATED {every2ndRF, every4thRF,
+ every8thRF, every16thRF},
+ sib-MappingInfo-r13 SIB-MappingInfo-NB-r13,
+ si-TB-r13 ENUMERATED {b56, b120, b208, b256, b328, b440, b552, b680}
+}
+
+SystemInfoValueTagList-NB-r13 ::= SEQUENCE (SIZE (1.. maxSI-Message-NB-r13)) OF
+ SystemInfoValueTagSI-r13
+
+SIB-MappingInfo-NB-r13 ::= SEQUENCE (SIZE (0..maxSIB-1)) OF SIB-Type-NB-r13
+
+SIB-Type-NB-r13 ::= ENUMERATED {
+ sibType3-NB-r13, sibType4-NB-r13, sibType5-NB-r13,
+ sibType14-NB-r13, sibType16-NB-r13, spare3, spare2, spare1}
+
+
+
+UECapabilityEnquiry-NB ::= SEQUENCE {
+ rrc-TransactionIdentifier RRC-TransactionIdentifier,
+ criticalExtensions CHOICE {
+ c1 CHOICE {
+ ueCapabilityEnquiry-r13 UECapabilityEnquiry-NB-r13-IEs,
+ spare1 NULL
+ },
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+UECapabilityEnquiry-NB-r13-IEs ::= SEQUENCE {
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+UECapabilityInformation-NB ::= SEQUENCE {
+ rrc-TransactionIdentifier RRC-TransactionIdentifier,
+ criticalExtensions CHOICE{
+ ueCapabilityInformation-r13 UECapabilityInformation-NB-r13-IEs,
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+UECapabilityInformation-NB-r13-IEs ::= SEQUENCE {
+ ue-Capability-Container-r13 UE-Capability-NB-r13,
+ ue-RadioPagingInfo-r13 UE-RadioPagingInfo-NB-r13,
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+ULInformationTransfer-NB ::= SEQUENCE {
+ criticalExtensions CHOICE {
+ ulInformationTransfer-r13 ULInformationTransfer-NB-r13-IEs,
+ criticalExtensionsFuture SEQUENCE {}
+ }
+}
+
+ULInformationTransfer-NB-r13-IEs ::= SEQUENCE {
+ dedicatedInfoNAS-r13 DedicatedInfoNAS,
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+
+SystemInformationBlockType2-NB-r13 ::= SEQUENCE {
+ radioResourceConfigCommon-r13 RadioResourceConfigCommonSIB-NB-r13,
+ ue-TimersAndConstants-r13 UE-TimersAndConstants-NB-r13,
+ freqInfo-r13 SEQUENCE {
+ ul-CarrierFreq-r13 CarrierFreq-NB-r13 OPTIONAL,-- Need OP
+ additionalSpectrumEmission-r13 AdditionalSpectrumEmission
+ },
+ timeAlignmentTimerCommon-r13 TimeAlignmentTimer,
+ multiBandInfoList-r13 SEQUENCE (SIZE (1..maxMultiBands)) OF AdditionalSpectrumEmission OPTIONAL,-- Need OR
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ ...
+}
+
+
+SystemInformationBlockType3-NB-r13 ::= SEQUENCE {
+ cellReselectionInfoCommon-r13 SEQUENCE {
+ q-Hyst-r13 ENUMERATED {
+ dB0, dB1, dB2, dB3, dB4, dB5, dB6, dB8, dB10,
+ dB12, dB14, dB16, dB18, dB20, dB22, dB24
+ }
+ },
+ cellReselectionServingFreqInfo-r13 SEQUENCE {
+ s-NonIntraSearch-r13 ReselectionThreshold
+ },
+ intraFreqCellReselectionInfo-r13 SEQUENCE {
+ q-RxLevMin-r13 Q-RxLevMin,
+ q-QualMin-r13 Q-QualMin-r9 OPTIONAL, -- Need OP
+ p-Max-r13 P-Max OPTIONAL, -- Need OP
+ s-IntraSearchP-r13 ReselectionThreshold,
+ t-Reselection-r13 T-Reselection-NB-r13
+ },
+ freqBandInfo-r13 NS-PmaxList-NB-r13 OPTIONAL, -- Need OR
+ multiBandInfoList-r13 SEQUENCE (SIZE (1..maxMultiBands)) OF
+ NS-PmaxList-NB-r13 OPTIONAL, -- Need OR
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ ...
+}
+
+
+SystemInformationBlockType4-NB-r13 ::= SEQUENCE {
+ intraFreqNeighCellList-r13 IntraFreqNeighCellList OPTIONAL, -- Need OR
+ intraFreqBlackCellList-r13 IntraFreqBlackCellList OPTIONAL, -- Need OR
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ ...
+}
+
+
+
+SystemInformationBlockType5-NB-r13 ::= SEQUENCE {
+ interFreqCarrierFreqList-r13 InterFreqCarrierFreqList-NB-r13,
+ t-Reselection-r13 T-Reselection-NB-r13,
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ ...
+}
+
+
+InterFreqCarrierFreqList-NB-r13 ::= SEQUENCE (SIZE (1..maxFreq)) OF InterFreqCarrierFreqInfo-NB-r13
+
+
+InterFreqCarrierFreqInfo-NB-r13 ::= SEQUENCE {
+ dl-CarrierFreq-r13 CarrierFreq-NB-r13,
+ q-RxLevMin-r13 Q-RxLevMin,
+ q-QualMin-r13 Q-QualMin-r9 OPTIONAL, -- Need OP
+ p-Max-r13 P-Max OPTIONAL, -- Need OP
+ q-OffsetFreq-r13 Q-OffsetRange DEFAULT dB0,
+ interFreqNeighCellList-r13 InterFreqNeighCellList-NB-r13 OPTIONAL, -- Need OR
+ interFreqBlackCellList-r13 InterFreqBlackCellList-NB-r13 OPTIONAL, -- Need OR
+ multiBandInfoList-r13 MultiBandInfoList-NB-r13 OPTIONAL, -- Need OR
+ ...
+}
+
+InterFreqNeighCellList-NB-r13 ::= SEQUENCE (SIZE (1..maxCellInter)) OF PhysCellId
+
+
+InterFreqBlackCellList-NB-r13 ::= SEQUENCE (SIZE (1..maxCellBlack)) OF PhysCellId
+
+
+
+SystemInformationBlockType14-NB-r13 ::= SEQUENCE {
+ ab-Param-r13 CHOICE {
+ ab-Common-r13 AB-Config-NB-r13,
+ ab-PerPLMN-List-r13 SEQUENCE (SIZE (1..maxPLMN-r11)) OF AB-ConfigPLMN-NB-r13
+ } OPTIONAL, -- Need OR
+ lateNonCriticalExtension OCTET STRING OPTIONAL,
+ ...
+}
+
+AB-ConfigPLMN-NB-r13 ::= SEQUENCE {
+ ab-Config-r13 AB-Config-NB-r13 OPTIONAL -- Need OR
+}
+
+AB-Config-NB-r13 ::= SEQUENCE {
+ ab-Category-r13 ENUMERATED {a, b, c},
+ ab-BarringBitmap-r13 BIT STRING (SIZE(10)),
+ ab-BarringExceptionData-r13 ENUMERATED {true} OPTIONAL, -- Need OP
+ ab-BarringForSpecialAC-r13 BIT STRING (SIZE(5))
+}
+
+
+SystemInformationBlockType16-NB-r13 ::= SystemInformationBlockType16-r11
+
+
+CarrierConfigDedicated-NB-r13 ::= SEQUENCE {
+ dl-CarrierConfig-r13 DL-CarrierConfigDedicated-NB-r13,
+ ul-CarrierConfig-r13 UL-CarrierConfigDedicated-NB-r13
+}
+
+DL-CarrierConfigDedicated-NB-r13 ::= SEQUENCE {
+ dl-CarrierFreq-r13 CarrierFreq-NB-r13,
+ downlinkBitmapNonAnchor-r13 CHOICE {
+ useNoBitmap-r13 NULL,
+ useAnchorBitmap-r13 NULL,
+ explicitBitmapConfiguration-r13 DL-Bitmap-NB-r13,
+ spare NULL
+ } OPTIONAL, -- Need ON
+ dl-GapNonAnchor-r13 CHOICE {
+ useNoGap-r13 NULL,
+ useAnchorGapConfig-r13 NULL,
+ explicitGapConfiguration-r13 DL-GapConfig-NB-r13,
+ spare NULL
+ } OPTIONAL, -- Need ON
+ inbandCarrierInfo-r13 SEQUENCE {
+ samePCI-Indicator-r13 CHOICE {
+ samePCI-r13 SEQUENCE {
+ indexToMidPRB-r13 INTEGER (-55..54)
+ },
+ differentPCI-r13 SEQUENCE {
+ eutra-NumCRS-Ports-r13 ENUMERATED {same, four}
+ }
+ } OPTIONAL, -- Cond anchor-guardband
+ eutraControlRegionSize-r13 ENUMERATED {n1, n2, n3}
+ } OPTIONAL, -- Cond non-anchor-inband
+ ...
+}
+
+UL-CarrierConfigDedicated-NB-r13 ::= SEQUENCE {
+ ul-CarrierFreq-r13 CarrierFreq-NB-r13 OPTIONAL, -- Need OP
+ ...
+}
+
+
+CarrierFreq-NB-r13 ::= SEQUENCE {
+ carrierFreq-r13 ARFCN-ValueEUTRA-r9,
+ carrierFreqOffset-r13 ENUMERATED {
+ v-10, v-9, v-8, v-7, v-6, v-5, v-4, v-3, v-2, v-1, v-0dot5,
+ v0, v1, v2, v3, v4, v5, v6, v7, v8, v9
+ } OPTIONAL -- Need ON
+}
+
+
+DL-Bitmap-NB-r13 ::= CHOICE {
+ subframePattern10-r13 BIT STRING (SIZE (10)),
+ subframePattern40-r13 BIT STRING (SIZE (40))
+}
+
+
+
+DL-GapConfig-NB-r13 ::= SEQUENCE {
+ dl-GapThreshold-r13 ENUMERATED {n32, n64, n128, n256},
+ dl-GapPeriodicity-r13 ENUMERATED {sf64, sf128, sf256, sf512},
+ dl-GapDurationCoeff-r13 ENUMERATED {oneEighth, oneFourth, threeEighth, oneHalf}
+}
+
+
+LogicalChannelConfig-NB-r13 ::= SEQUENCE {
+ priority-r13 INTEGER (1..16) OPTIONAL, -- Cond UL
+ logicalChannelSR-Prohibit-r13 BOOLEAN OPTIONAL, -- Need ON
+ ...
+}
+
+
+MAC-MainConfig-NB-r13 ::= SEQUENCE {
+ ul-SCH-Config-r13 SEQUENCE {
+ periodicBSR-Timer-r13 PeriodicBSR-Timer-NB-r13 OPTIONAL, -- Need ON
+ retxBSR-Timer-r13 RetxBSR-Timer-NB-r13
+ } OPTIONAL, -- Need ON
+ drx-Config-r13 DRX-Config-NB-r13 OPTIONAL, -- Need ON
+ timeAlignmentTimerDedicated-r13 TimeAlignmentTimer,
+ logicalChannelSR-Config-r13 CHOICE {
+ release NULL,
+ setup SEQUENCE {
+ logicalChannelSR-ProhibitTimer-r13 ENUMERATED {
+ pp2, pp8, pp32, pp128, pp512,
+ pp1024, pp2048, spare}
+ }
+ } OPTIONAL, -- Need ON
+ ...
+}
+
+PeriodicBSR-Timer-NB-r13 ::= ENUMERATED {
+ pp2, pp4, pp8, pp16, pp64, pp128, infinity, spare}
+
+RetxBSR-Timer-NB-r13 ::= ENUMERATED {
+ pp4, pp16, pp64, pp128, pp256, pp512, infinity, spare}
+
+DRX-Config-NB-r13 ::= CHOICE {
+ release NULL,
+ setup SEQUENCE {
+ onDurationTimer-r13 ENUMERATED {
+ pp1, pp2, pp3, pp4, pp8, pp16, pp32, spare},
+ drx-InactivityTimer-r13 ENUMERATED {
+ pp0, pp1, pp2, pp3, pp4, pp8, pp16, pp32},
+ drx-RetransmissionTimer-r13 ENUMERATED {
+ pp0, pp1, pp2, pp4, pp6, pp8, pp16, pp24,
+ pp33, spare7, spare6, spare5,
+ spare4, spare3, spare2, spare1},
+ drx-Cycle-r13 ENUMERATED {
+ sf256, sf512, sf1024, sf1536, sf2048, sf3072,
+ sf4096, sf4608, sf6144, sf7680, sf8192, sf9216,
+ spare4, spare3, spare2, spare1},
+ drx-StartOffset-r13 INTEGER (0..255),
+ drx-ULRetransmissionTimer-r13 ENUMERATED {
+ pp0, pp1, pp2, pp4, pp6, pp8, pp16, pp24,
+ pp33, pp40, pp64, pp80, pp96,
+ pp112, pp128, pp160, pp320}
+ }
+}
+
+
+
+NPDCCH-ConfigDedicated-NB-r13 ::= SEQUENCE {
+ npdcch-NumRepetitions-r13 ENUMERATED {r1, r2, r4, r8, r16, r32, r64, r128,
+ r256, r512, r1024, r2048,
+ spare4, spare3, spare2, spare1},
+ npdcch-StartSF-USS-r13 ENUMERATED {v1dot5, v2, v4, v8, v16, v32, v48, v64},
+ npdcch-Offset-USS-r13 ENUMERATED {zero, oneEighth, oneFourth, threeEighth}
+}
+
+
+
+NPDSCH-ConfigCommon-NB-r13 ::= SEQUENCE {
+ nrs-Power-r13 INTEGER (-60..50)
+}
+
+
+NPRACH-ConfigSIB-NB-r13 ::= SEQUENCE {
+ nprach-CP-Length-r13 ENUMERATED {us66dot7, us266dot7},
+ rsrp-ThresholdsPrachInfoList-r13 RSRP-ThresholdsNPRACH-InfoList-NB-r13 OPTIONAL, -- need OR
+ nprach-ParametersList-r13 NPRACH-ParametersList-NB-r13
+}
+
+NPRACH-ParametersList-NB-r13 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF NPRACH-Parameters-NB-r13
+
+NPRACH-Parameters-NB-r13::= SEQUENCE {
+ nprach-Periodicity-r13 ENUMERATED {ms40, ms80, ms160, ms240,
+ ms320, ms640, ms1280, ms2560},
+ nprach-StartTime-r13 ENUMERATED {ms8, ms16, ms32, ms64,
+ ms128, ms256, ms512, ms1024},
+ nprach-SubcarrierOffset-r13 ENUMERATED {n0, n12, n24, n36, n2, n18, n34, spare1},
+ nprach-NumSubcarriers-r13 ENUMERATED {n12, n24, n36, n48},
+ nprach-SubcarrierMSG3-RangeStart-r13 ENUMERATED {zero, oneThird, twoThird, one},
+ maxNumPreambleAttemptCE-r13 ENUMERATED {n3, n4, n5, n6, n7, n8, n10, spare1},
+ numRepetitionsPerPreambleAttempt-r13 ENUMERATED {n1, n2, n4, n8, n16, n32, n64, n128},
+ npdcch-NumRepetitions-RA-r13 ENUMERATED {r1, r2, r4, r8, r16, r32, r64, r128,
+ r256, r512, r1024, r2048,
+ spare4, spare3, spare2, spare1},
+ npdcch-StartSF-CSS-RA-r13 ENUMERATED {v1dot5, v2, v4, v8, v16, v32, v48, v64},
+ npdcch-Offset-RA-r13 ENUMERATED {zero, oneEighth, oneFourth, threeEighth}
+}
+
+RSRP-ThresholdsNPRACH-InfoList-NB-r13 ::= SEQUENCE (SIZE(1..2)) OF RSRP-Range
+
+
+NPUSCH-ConfigCommon-NB-r13 ::= SEQUENCE {
+ ack-NACK-NumRepetitions-Msg4-r13 SEQUENCE (SIZE(1.. maxNPRACH-Resources-NB-r13)) OF
+ ACK-NACK-NumRepetitions-NB-r13,
+ srs-SubframeConfig-r13 ENUMERATED {
+ sc0, sc1, sc2, sc3, sc4, sc5, sc6, sc7,
+ sc8, sc9, sc10, sc11, sc12, sc13, sc14, sc15
+ } OPTIONAL, -- Need OR
+ dmrs-Config-r13 SEQUENCE {
+ threeTone-BaseSequence-r13 INTEGER (0..12) OPTIONAL, -- Need OP
+ threeTone-CyclicShift-r13 INTEGER (0..2),
+ sixTone-BaseSequence-r13 INTEGER (0..14) OPTIONAL, -- Need OP
+ sixTone-CyclicShift-r13 INTEGER (0..3),
+ twelveTone-BaseSequence-r13 INTEGER (0..30) OPTIONAL -- Need OP
+ } OPTIONAL, -- Need OR
+ ul-ReferenceSignalsNPUSCH-r13 UL-ReferenceSignalsNPUSCH-NB-r13
+}
+
+UL-ReferenceSignalsNPUSCH-NB-r13 ::= SEQUENCE {
+ groupHoppingEnabled-r13 BOOLEAN,
+ groupAssignmentNPUSCH-r13 INTEGER (0..29)
+}
+
+NPUSCH-ConfigDedicated-NB-r13 ::= SEQUENCE {
+ ack-NACK-NumRepetitions-r13 ACK-NACK-NumRepetitions-NB-r13 OPTIONAL, -- Need ON
+ npusch-AllSymbols-r13 BOOLEAN OPTIONAL, -- Cond SRS
+ groupHoppingDisabled-r13 ENUMERATED {true} OPTIONAL -- Need OR
+}
+
+ACK-NACK-NumRepetitions-NB-r13 ::= ENUMERATED {r1, r2, r4, r8, r16, r32, r64, r128}
+
+
+
+PDCP-Config-NB-r13 ::= SEQUENCE {
+ discardTimer-r13 ENUMERATED {
+ ms5120, ms10240, ms20480, ms40960,
+ ms81920, infinity, spare2, spare1
+ } OPTIONAL, -- Cond Setup
+ headerCompression-r13 CHOICE {
+ notUsed NULL,
+ rohc SEQUENCE {
+ maxCID-r13 INTEGER (1..16383) DEFAULT 15,
+ profiles-r13 SEQUENCE {
+ profile0x0002 BOOLEAN,
+ profile0x0003 BOOLEAN,
+ profile0x0004 BOOLEAN,
+ profile0x0006 BOOLEAN,
+ profile0x0102 BOOLEAN,
+ profile0x0103 BOOLEAN,
+ profile0x0104 BOOLEAN
+ },
+ ...
+ }
+ },
+ ...
+}
+
+
+PhysicalConfigDedicated-NB-r13 ::= SEQUENCE {
+ carrierConfigDedicated-r13 CarrierConfigDedicated-NB-r13 OPTIONAL, -- Need ON
+ npdcch-ConfigDedicated-r13 NPDCCH-ConfigDedicated-NB-r13 OPTIONAL, -- Need ON
+ npusch-ConfigDedicated-r13 NPUSCH-ConfigDedicated-NB-r13 OPTIONAL, -- Need ON
+ uplinkPowerControlDedicated-r13 UplinkPowerControlDedicated-NB-r13 OPTIONAL, -- Need ON
+ ...
+}
+
+
+
+RACH-ConfigCommon-NB-r13 ::= SEQUENCE {
+ preambleTransMax-CE-r13 PreambleTransMax,
+ powerRampingParameters-r13 PowerRampingParameters,
+ rach-InfoList-r13 RACH-InfoList-NB-r13,
+ connEstFailOffset-r13 INTEGER (0..15) OPTIONAL, -- Need OP
+ ...
+}
+
+RACH-InfoList-NB-r13 ::= SEQUENCE (SIZE (1.. maxNPRACH-Resources-NB-r13)) OF RACH-Info-NB-r13
+
+RACH-Info-NB-r13 ::= SEQUENCE {
+ ra-ResponseWindowSize-r13 ENUMERATED {
+ pp2, pp3, pp4, pp5, pp6, pp7, pp8, pp10},
+ mac-ContentionResolutionTimer-r13 ENUMERATED {
+ pp1, pp2, pp3, pp4, pp8, pp16, pp32, pp64}
+}
+
+
+RadioResourceConfigCommonSIB-NB-r13 ::= SEQUENCE {
+ rach-ConfigCommon-r13 RACH-ConfigCommon-NB-r13,
+ bcch-Config-r13 BCCH-Config-NB-r13,
+ pcch-Config-r13 PCCH-Config-NB-r13,
+ nprach-Config-r13 NPRACH-ConfigSIB-NB-r13,
+ npdsch-ConfigCommon-r13 NPDSCH-ConfigCommon-NB-r13,
+ npusch-ConfigCommon-r13 NPUSCH-ConfigCommon-NB-r13,
+ dl-Gap-r13 DL-GapConfig-NB-r13 OPTIONAL, -- Need OP
+ uplinkPowerControlCommon-r13 UplinkPowerControlCommon-NB-r13,
+ ...
+}
+
+BCCH-Config-NB-r13 ::= SEQUENCE {
+ modificationPeriodCoeff-r13 ENUMERATED {n16, n32, n64, n128}
+}
+
+
+PCCH-Config-NB-r13 ::= SEQUENCE {
+ defaultPagingCycle-r13 ENUMERATED {rf128, rf256, rf512, rf1024},
+ nB-r13 ENUMERATED {
+ fourT, twoT, oneT, halfT, quarterT, one8thT,
+ one16thT, one32ndT, one64thT,
+ one128thT, one256thT, one512thT, one1024thT,
+ spare3, spare2, spare1},
+ npdcch-NumRepetitionPaging-r13 ENUMERATED {
+ r1, r2, r4, r8, r16, r32, r64, r128,
+ r256, r512, r1024, r2048,
+ spare4, spare3, spare2, spare1}
+}
+
+
+RadioResourceConfigDedicated-NB-r13 ::= SEQUENCE {
+ srb-ToAddModList-r13 SRB-ToAddModList-NB-r13 OPTIONAL, -- Need ON
+ drb-ToAddModList-r13 DRB-ToAddModList-NB-r13 OPTIONAL, -- Need ON
+ drb-ToReleaseList-r13 DRB-ToReleaseList-NB-r13 OPTIONAL, -- Need ON
+ mac-MainConfig-r13 CHOICE {
+ explicitValue-r13 MAC-MainConfig-NB-r13,
+ defaultValue-r13 NULL
+ } OPTIONAL, -- Need ON
+ physicalConfigDedicated-r13 PhysicalConfigDedicated-NB-r13 OPTIONAL, -- Need ON
+ rlf-TimersAndConstants-r13 RLF-TimersAndConstants-NB-r13 OPTIONAL, -- Need ON
+ ...
+}
+
+SRB-ToAddModList-NB-r13 ::= SEQUENCE (SIZE (1)) OF SRB-ToAddMod-NB-r13
+
+SRB-ToAddMod-NB-r13 ::= SEQUENCE {
+ rlc-Config-r13 CHOICE {
+ explicitValue RLC-Config-NB-r13,
+ defaultValue NULL
+ } OPTIONAL, -- Cond Setup
+ logicalChannelConfig-r13 CHOICE {
+ explicitValue LogicalChannelConfig-NB-r13,
+ defaultValue NULL
+ } OPTIONAL, -- Cond Setup
+ ...
+}
+
+DRB-ToAddModList-NB-r13 ::= SEQUENCE (SIZE (1..maxDRB-NB-r13)) OF DRB-ToAddMod-NB-r13
+
+DRB-ToAddMod-NB-r13 ::= SEQUENCE {
+ eps-BearerIdentity-r13 INTEGER (0..15) OPTIONAL, -- Cond DRB-Setup
+ drb-Identity-r13 DRB-Identity,
+ pdcp-Config-r13 PDCP-Config-NB-r13 OPTIONAL, -- Cond Setup
+ rlc-Config-r13 RLC-Config-NB-r13 OPTIONAL, -- Cond Setup
+ logicalChannelIdentity-r13 INTEGER (3..10) OPTIONAL, -- Cond DRB-Setup
+ logicalChannelConfig-r13 LogicalChannelConfig-NB-r13 OPTIONAL, -- Cond Setup
+ ...
+}
+
+DRB-ToReleaseList-NB-r13 ::= SEQUENCE (SIZE (1..maxDRB-NB-r13)) OF DRB-Identity
+
+
+RLC-Config-NB-r13 ::= CHOICE {
+ am SEQUENCE {
+ ul-AM-RLC-r13 UL-AM-RLC-NB-r13,
+ dl-AM-RLC-r13 DL-AM-RLC-NB-r13
+ },
+ ...
+}
+
+
+UL-AM-RLC-NB-r13 ::= SEQUENCE {
+ t-PollRetransmit-r13 T-PollRetransmit-NB-r13,
+ maxRetxThreshold-r13 ENUMERATED {t1, t2, t3, t4, t6, t8, t16, t32}
+}
+
+DL-AM-RLC-NB-r13 ::= SEQUENCE {
+ enableStatusReportSN-Gap-r13 ENUMERATED {true} OPTIONAL
+}
+
+T-PollRetransmit-NB-r13 ::= ENUMERATED {
+ ms250, ms500, ms1000, ms2000, ms3000, ms4000,
+ ms6000, ms10000, ms15000, ms25000, ms40000, ms60000,
+ ms90000, ms120000, ms180000, spare1}
+
+
+
+
+RLF-TimersAndConstants-NB-r13 ::= CHOICE {
+ release NULL,
+ setup SEQUENCE {
+ t301-r13 ENUMERATED {
+ ms2500, ms4000, ms6000, ms10000,
+ ms15000, ms25000, ms40000, ms60000},
+ t310-r13 ENUMERATED {
+ ms0, ms200, ms500, ms1000, ms2000, ms4000, ms8000},
+ n310-r13 ENUMERATED {
+ n1, n2, n3, n4, n6, n8, n10, n20},
+ t311-r13 ENUMERATED {
+ ms1000, ms3000, ms5000, ms10000, ms15000,
+ ms20000, ms30000},
+ n311-r13 ENUMERATED {
+ n1, n2, n3, n4, n5, n6, n8, n10},
+ ...
+ }
+}
+
+
+
+UplinkPowerControlCommon-NB-r13 ::= SEQUENCE {
+ p0-NominalNPUSCH-r13 INTEGER (-126..24),
+ alpha-r13 ENUMERATED {al0, al04, al05, al06, al07, al08, al09, al1},
+ deltaPreambleMsg3-r13 INTEGER (-1..6)
+}
+
+UplinkPowerControlDedicated-NB-r13 ::= SEQUENCE {
+ p0-UE-NPUSCH-r13 INTEGER (-8..7)
+}
+
+
+FreqBandIndicator-NB-r13 ::= INTEGER (1.. maxFBI2)
+
+
+MultiBandInfoList-NB-r13 ::= SEQUENCE (SIZE (1..maxMultiBands)) OF MultiBandInfo-NB-r13
+
+MultiBandInfo-NB-r13 ::= SEQUENCE {
+ freqBandIndicator-r13 FreqBandIndicator-NB-r13 OPTIONAL, -- Need OR
+ freqBandInfo-r13 NS-PmaxList-NB-r13 OPTIONAL -- Need OR
+}
+
+
+NS-PmaxList-NB-r13 ::= SEQUENCE (SIZE (1..maxNS-Pmax-NB-r13)) OF NS-PmaxValue-NB-r13
+
+NS-PmaxValue-NB-r13 ::= SEQUENCE {
+ additionalPmax-r13 P-Max OPTIONAL, -- Need OR
+ additionalSpectrumEmission-r13 AdditionalSpectrumEmission
+}
+
+
+T-Reselection-NB-r13 ::= ENUMERATED {s0, s3, s6, s9, s12, s15, s18, s21}
+
+
+EstablishmentCause-NB-r13 ::= ENUMERATED {
+ mt-Access, mo-Signalling, mo-Data, mo-ExceptionData,
+ spare4, spare3, spare2, spare1}
+
+
+UE-Capability-NB-r13 ::= SEQUENCE {
+ accessStratumRelease-r13 AccessStratumRelease-NB-r13,
+ ue-Category-NB-r13 ENUMERATED {nb1} OPTIONAL,
+ multipleDRB-r13 ENUMERATED {supported} OPTIONAL,
+ pdcp-Parameters-r13 PDCP-Parameters-NB-r13 OPTIONAL,
+ phyLayerParameters-r13 PhyLayerParameters-NB-r13,
+ rf-Parameters-r13 RF-Parameters-NB-r13,
+ nonCriticalExtension SEQUENCE {} OPTIONAL
+}
+
+AccessStratumRelease-NB-r13 ::= ENUMERATED {rel13, spare7, spare6, spare5, spare4, spare3, spare2, spare1, ...}
+
+PDCP-Parameters-NB-r13 ::= SEQUENCE {
+ supportedROHC-Profiles-r13 SEQUENCE {
+ profile0x0002 BOOLEAN,
+ profile0x0003 BOOLEAN,
+ profile0x0004 BOOLEAN,
+ profile0x0006 BOOLEAN,
+ profile0x0102 BOOLEAN,
+ profile0x0103 BOOLEAN,
+ profile0x0104 BOOLEAN
+ },
+ maxNumberROHC-ContextSessions-r13 ENUMERATED {cs2, cs4, cs8, cs12} DEFAULT cs2,
+ ...
+}
+
+PhyLayerParameters-NB-r13 ::= SEQUENCE {
+ multiTone-r13 ENUMERATED {supported} OPTIONAL,
+ multiCarrier-r13 ENUMERATED {supported} OPTIONAL
+ }
+
+RF-Parameters-NB-r13 ::= SEQUENCE {
+ supportedBandList-r13 SupportedBandList-NB-r13,
+ multiNS-Pmax-r13 ENUMERATED {supported} OPTIONAL
+}
+
+SupportedBandList-NB-r13 ::= SEQUENCE (SIZE (1..maxBands)) OF SupportedBand-NB-r13
+
+SupportedBand-NB-r13 ::= SEQUENCE {
+ band-r13 FreqBandIndicator-NB-r13,
+ powerClassNB-20dBm-r13 ENUMERATED {supported} OPTIONAL
+}
+
+
+
+UE-RadioPagingInfo-NB-r13 ::= SEQUENCE {
+ ue-Category-NB-r13 ENUMERATED {nb1} OPTIONAL,
+ ...
+}
+
+
+UE-TimersAndConstants-NB-r13 ::= SEQUENCE {
+ t300-r13 ENUMERATED {
+ ms2500, ms4000, ms6000, ms10000,
+ ms15000, ms25000, ms40000, ms60000},
+ t301-r13 ENUMERATED {
+ ms2500, ms4000, ms6000, ms10000,
+ ms15000, ms25000, ms40000, ms60000},
+ t310-r13 ENUMERATED {
+ ms0, ms200, ms500, ms1000, ms2000, ms4000, ms8000},
+ n310-r13 ENUMERATED {
+ n1, n2, n3, n4, n6, n8, n10, n20},
+ t311-r13 ENUMERATED {
+ ms1000, ms3000, ms5000, ms10000, ms15000,
+ ms20000, ms30000},
+ n311-r13 ENUMERATED {
+ n1, n2, n3, n4, n5, n6, n8, n10},
+ ...
+}
+
+
+maxNPRACH-Resources-NB-r13 INTEGER ::= 3 -- Maximum number of NPRACH resources for NB-IoT
+maxDRB-NB-r13 INTEGER ::= 2 -- Maximum number of Data Radio Bearers for NB-IoT
+maxNS-Pmax-NB-r13 INTEGER ::= 4 -- Maximum number of NS and P-Max values per band
+maxSI-Message-NB-r13 INTEGER ::= 8 -- Maximum number of SI messages for NB-IoT
+
+
+END
diff --git a/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn b/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn
new file mode 100644
index 0000000000..a75c55c4c3
--- /dev/null
+++ b/epan/dissectors/asn1/lte-rrc/NBIOT-UE-Variables.asn
@@ -0,0 +1,19 @@
+-- 3GPP TS 36.331 V13.2.0 (2016-06)
+--
+NBIOT-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
+
+BEGIN
+
+IMPORTS
+ VarShortMAC-Input,
+ VarShortResumeMAC-Input-r13
+
+FROM EUTRA-UE-Variables;
+
+VarShortMAC-Input-NB-r13 ::= VarShortMAC-Input
+
+VarShortResumeMAC-Input-NB-r13 ::= VarShortResumeMAC-Input-r13
+
+
+
+END
diff --git a/epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn b/epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn
index af4b8e86c7..0196c9666d 100644
--- a/epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn
+++ b/epan/dissectors/asn1/lte-rrc/PC5-RRC-Definitions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 36.331 V13.1.0 (2016-03)
+-- 3GPP TS 36.331 V13.2.0 (2016-06)
--
PC5-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
diff --git a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
index 16cd043740..42030f8f3b 100644
--- a/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
+++ b/epan/dissectors/asn1/lte-rrc/lte-rrc.cnf
@@ -26,8 +26,12 @@ HandoverCommand
HandoverCommand_PDU
HandoverPreparationInformation
HandoverPreparationInformation_PDU
+HandoverPreparationInformation-NB
+HandoverPreparationInformation-NB_PDU
UERadioAccessCapabilityInformation
UERadioAccessCapabilityInformation_PDU
+UERadioAccessCapabilityInformation-NB
+UERadioAccessCapabilityInformation-NB_PDU
UE-EUTRA-Capability
UE-EUTRA-Capability_PDU
#.END
@@ -35,7 +39,9 @@ UE-EUTRA-Capability_PDU
#.PDU
HandoverCommand
HandoverPreparationInformation
+HandoverPreparationInformation-NB
UERadioAccessCapabilityInformation
+UERadioAccessCapabilityInformation-NB
BCCH-BCH-Message @bcch.bch
BCCH-DL-SCH-Message @bcch.dl.sch
BCCH-DL-SCH-Message-BR @bcch.dl.sch.br
@@ -49,6 +55,13 @@ SC-MCCH-Message-r13 @sc.mcch
UECapabilityInformation @ue_cap_info
UE-EUTRA-Capability @ue_eutra_cap
SBCCH-SL-BCH-Message @sbcch.sl.bch
+BCCH-BCH-Message-NB @bcch.bch.nb
+BCCH-DL-SCH-Message-NB @bcch.dl.sch.nb
+PCCH-Message-NB @pcch.nb
+DL-CCCH-Message-NB @dl.ccch.nb
+DL-DCCH-Message-NB @dl.dcch.nb
+UL-CCCH-Message-NB @ul.ccch.nb
+UL-DCCH-Message-NB @ul.dcch.nb
#.END
#.OMIT_ASSIGNMENT
@@ -58,7 +71,6 @@ CellsTriggeredList
CSI-RS-TriggeredList-r12
DRB-InfoListSCG-r12
DRB-InfoSCG-r12
-LAA-parameters-r13
LogMeasInfoList2-r10
MeasResultServCellListSCG-r12
MeasResultServCellListSCG-Ext-r13
@@ -83,8 +95,12 @@ SL-PreconfigSync-r12
SL-Preconfiguration-r12
SL-TxPoolIdentity-r13
UEPagingCoverageInformation
+UEPagingCoverageInformation-NB
+UEPagingCoverageInformation-NB-IEs
UEPagingCoverageInformation-r13-IEs
UERadioPagingInformation
+UERadioPagingInformation-NB
+UERadioPagingInformation-NB-IEs
UERadioPagingInformation-r12-IEs
UERadioPagingInformation-v1310-IEs
VarConnEstFailReport-r11
@@ -101,17 +117,25 @@ VarMobilityHistoryReport-r12
VarRLF-Report-r10
VarRLF-Report-r11
VarShortMAC-Input
+VarShortMAC-Input-NB-r13
+VarShortResumeMAC-Input-NB-r13
+VarShortResumeMAC-Input-r13
VarWLAN-MobilityConfig
VarWLAN-Status-r13
#.NO_EMIT ONLY_VALS
EAB-Config-r11/eab-Category-r11
+AB-Config-NB-r13/ab-Category-r13
#.MAKE_ENUM
RAT-Type TYPE_PREFIX
Handover/targetRAT-Type TYPE_PREFIX
SI-OrPSI-GERAN TYPE_PREFIX
+#
+# EUTRA-RRC-Definitions.asn
+#
+
#.FN_HDR UL-DCCH-Message
actx->pinfo->link_dir = P2P_DIR_UL;
@@ -349,6 +373,9 @@ if(ue_cap_tvb){
proto_tree_add_bits_item(subtree, hf_lte_rrc_modifiedMPR_Behavior_r10_mpr_ampr_31, modifiedMPR_Behavior_r10_tvb, 31, 1, ENC_BIG_ENDIAN);
}
+ #.TYPE_RENAME
+IRAT-ParametersWLAN-r13/supportedBandListWLAN-r13 supportedBandListWLAN_r13
+
#.TYPE_ATTR
MasterInformationBlock/schedulingInfoSIB1-BR-r13 TYPE=FT_UINT32 DISPLAY=BASE_DEC|BASE_EXT_STRING STRINGS=&lte_rrc_schedulingInfoSIB1_BR_r13_vals_ext
@@ -1470,6 +1497,10 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(&lte_rrc_duration_val)
col_append_str(actx->pinfo->cinfo, COL_INFO, "RNReconfiguration-r10");
+#.FN_HDR RRCConnectionResume-r13
+
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionResume-r13");
+
#.FN_HDR RRCConnectionReestablishmentRequest
col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishmentRequest");
@@ -1576,13 +1607,13 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(&lte_rrc_duration_val)
col_append_str(actx->pinfo->cinfo, COL_INFO, "WLANConnectionStatusReport-r13");
-#.FN_HDR SCPTMConfiguration-r13
+#.FN_HDR RRCConnectionResumeComplete-r13
- col_append_str(actx->pinfo->cinfo, COL_INFO, "SCPTMConfiguration-r13");
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionResumeComplete-r13");
-#.FN_HDR MasterInformationBlock-SL
+#.FN_HDR SCPTMConfiguration-r13
- col_append_str(actx->pinfo->cinfo, COL_INFO, "MasterInformationBlock-SL");
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "SCPTMConfiguration-r13");
#.FN_BODY Paging/systemInfoModification
%(DEFAULT_BODY)s
@@ -1667,7 +1698,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(&lte_rrc_duration_val)
set_mac_lte_channel_mapping(drb_mapping);
}
- /* Also tell RLC how many PDCP sequence number bits and wether it should use extended LI */
+ /* Also tell RLC how many PDCP sequence number bits and whether it should use extended LI */
p_rlc_lte_info = (rlc_lte_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_rlc_lte, 0);
if (p_rlc_lte_info) {
if (drb_mapping->pdcp_sn_size_present) {
@@ -1822,6 +1853,9 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(&lte_rrc_duration_val)
set_mac_lte_simult_pucch_pusch(p_mac_lte_info->ueid, private_data_get_simult_pucch_pusch_cell_type(actx), TRUE, actx->pinfo);
}
+#.TYPE_RENAME
+PUCCH-ConfigDedicated-r13/pucch-Format-r13/channelSelection-r13/n1PUCCH-AN-CS-r13/setup/n1PUCCH-AN-CS-List-r13 n1PUCCH_AN_CS_List_r13
+
#.FN_BODY RACH-ConfigCommon/preambleInfo
%(DEFAULT_BODY)s
/* Initialise to invalid value */
@@ -2205,3 +2239,202 @@ SL-DiscSysInfoReport-r13/cellSelectionInfo-r13/q-RxLevMinOffset-r13 STRINGS=VALS
#.FN_BODY P0-SL-r12
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, "dBm");
+
+#
+# PC5-RRC-Definitions
+#
+
+#.FN_HDR MasterInformationBlock-SL
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "MasterInformationBlock-SL");
+
+#
+# NBIOT-RRC-Definitions
+#
+
+#.FN_HDR UL-DCCH-Message-NB
+ actx->pinfo->link_dir = P2P_DIR_UL;
+
+#.FN_HDR DL-DCCH-Message-NB
+ actx->pinfo->link_dir = P2P_DIR_DL;
+
+#.FN_HDR MasterInformationBlock-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "MasterInformationBlock-NB");
+
+#.FN_HDR SystemInformation-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation-NB [ ");
+
+#.FN_BODY SystemInformation-NB
+%(DEFAULT_BODY)s
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "]");
+
+#.FN_HDR SystemInformationBlockType1-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformationBlockType1-NB");
+
+#.FN_HDR SystemInformationBlockType2-NB-r13
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB2 ");
+
+#.FN_HDR SystemInformationBlockType3-NB-r13
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB3 ");
+
+#.FN_HDR SystemInformationBlockType4-NB-r13
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB4 ");
+
+#.FN_HDR SystemInformationBlockType5-NB-r13
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB5 ");
+
+#.FN_HDR SystemInformationBlockType14-NB-r13
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB14 ");
+
+#.FN_HDR Paging-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "Paging-NB");
+
+#.FN_HDR RRCConnectionReestablishment-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishment-NB");
+
+#.FN_HDR RRCConnectionReestablishmentReject
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishmentReject");
+
+#.FN_HDR RRCConnectionReject-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReject-NB");
+
+#.FN_HDR RRCConnectionSetup-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetup-NB");
+
+#.FN_HDR DLInformationTransfer-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "DLInformationTransfer-NB");
+
+#.FN_HDR RRCConnectionReconfiguration-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReconfiguration-NB");
+
+#.FN_HDR RRCConnectionRelease-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease-NB");
+
+#.FN_HDR UECapabilityEnquiry-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityEnquiry-NB");
+
+#.FN_HDR RRCConnectionResume-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionResume-NB");
+
+#.FN_HDR RRCConnectionReestablishmentRequest-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishmentRequest-NB");
+
+#.FN_HDR RRCConnectionRequest-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRequest-NB");
+
+#.FN_HDR RRCConnectionResumeRequest-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionResumeRequest-NB");
+
+#.FN_HDR RRCConnectionReconfigurationComplete-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReconfigurationComplete-NB");
+
+#.FN_HDR RRCConnectionReestablishmentComplete-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReestablishmentComplete-NB");
+
+#.FN_HDR RRCConnectionSetupComplete-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetupComplete-NB");
+
+#.FN_HDR UECapabilityInformation-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformation-NB");
+
+#.FN_HDR ULInformationTransfer-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "ULInformationTransfer-NB");
+
+#.FN_HDR RRCConnectionResumeComplete-NB
+ col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionResumeComplete-NB");
+
+#.FN_BODY RRCConnectionReject-NB-r13-IEs/extendedWaitTime-r13
+%(DEFAULT_BODY)s
+ proto_item_append_text(actx->created_item, "s");
+
+#.FN_BODY RRCConnectionRelease-NB-r13-IEs/extendedWaitTime-r13
+%(DEFAULT_BODY)s
+ proto_item_append_text(actx->created_item, "s");
+
+#.TYPE_RENAME
+SystemInformationBlockType2-NB-r13/multiBandInfoList-r13 AdditionalSpectrumEmission_r13
+
+#.TYPE_ATTR
+AB-Config-NB-r13/ab-Category-r13 STRINGS=VALS(lte_rrc_eab_category_vals)
+
+#.FN_BODY NPDSCH-ConfigCommon-NB-r13/nrs-Power-r13
+%(DEFAULT_BODY)s
+ proto_item_append_text(actx->created_item, "dBm");
+
+#.FN_BODY RACH-ConfigCommon-NB-r13/connEstFailOffset-r13
+%(DEFAULT_BODY)s
+ proto_item_append_text(actx->created_item, "dB");
+
+#.FN_BODY DRB-ToAddMod-NB-r13
+ struct mac_lte_info *p_mac_lte_info;
+ struct rlc_lte_info *p_rlc_lte_info;
+ /* Get the struct and clear it out */
+ drb_mapping_t *drb_mapping = private_data_get_drb_mapping(actx);
+ memset(drb_mapping, 0, sizeof(*drb_mapping));
+%(DEFAULT_BODY)s
+ /* Need UE identifier */
+ p_mac_lte_info = (mac_lte_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_mac_lte, 0);
+ if (p_mac_lte_info) {
+ drb_mapping->ueid = p_mac_lte_info->ueid;
+ /* Tell MAC about this mapping */
+ set_mac_lte_channel_mapping(drb_mapping);
+ }
+
+ /* Also tell RLC how many PDCP sequence number bits and whether it should use extended LI */
+ p_rlc_lte_info = (rlc_lte_info *)p_get_proto_data(wmem_file_scope(), actx->pinfo, proto_rlc_lte, 0);
+ if (p_rlc_lte_info) {
+ if (drb_mapping->pdcp_sn_size_present) {
+ set_rlc_lte_drb_pdcp_seqnum_length(actx->pinfo,
+ p_rlc_lte_info->ueid,
+ drb_mapping->drbid,
+ drb_mapping->pdcp_sn_size);
+ }
+ if (drb_mapping->rlcMode_present) {
+ set_rlc_lte_drb_li_field(actx->pinfo,
+ p_rlc_lte_info->ueid,
+ drb_mapping->drbid,
+ drb_mapping->rlc_ul_ext_li_field,
+ drb_mapping->rlc_dl_ext_li_field);
+ }
+ }
+
+ /* Clear out the struct again */
+ memset(&drb_mapping, 0, sizeof(drb_mapping));
+
+#.FN_BODY RLC-Config-NB-r13
+ drb_mapping_t *mapping = private_data_get_drb_mapping(actx);
+%(DEFAULT_BODY)s
+ if (mapping != NULL) {
+ mapping->rlcMode = RLC_AM_MODE;
+ mapping->rlcMode_present = TRUE;
+ mapping->pdcp_sn_size = 7;
+ mapping->pdcp_sn_size_present = TRUE;
+ }
+
+#.FN_BODY DRB-ToAddMod-NB-r13/logicalChannelIdentity-r13 VAL_PTR=&value
+ guint32 value;
+ drb_mapping_t *mapping = private_data_get_drb_mapping(actx);
+%(DEFAULT_BODY)s
+ if (mapping != NULL) {
+ mapping->lcid = (guint8)value;
+ mapping->lcid_present = TRUE;
+ }
+
+#.FN_BODY LogicalChannelConfig-NB-r13/priority-r13 VAL_PTR=&value
+ guint32 value;
+ drb_mapping_t *mapping = private_data_get_drb_mapping(actx);
+%(DEFAULT_BODY)s
+ if (mapping != NULL) {
+ mapping->ul_priority = value;
+ mapping->ul_priority_present = TRUE;
+ }
+
+#.FN_BODY UplinkPowerControlCommon-NB-r13/p0-NominalNPUSCH-r13
+%(DEFAULT_BODY)s
+ proto_item_append_text(actx->created_item, "dBm");
+
+#.TYPE_ATTR
+UplinkPowerControlCommon-NB-r13/deltaPreambleMsg3-r13 STRINGS=VALS(lte_rrc_deltaPreambleMsg3_vals)
+
+#.FN_BODY UplinkPowerControlDedicated-NB-r13/p0-UE-NPUSCH-r13
+%(DEFAULT_BODY)s
+ proto_item_append_text(actx->created_item, "dB"); \ No newline at end of file
diff --git a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
index 4771f3dd11..0af1cd94fe 100644
--- a/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
+++ b/epan/dissectors/asn1/lte-rrc/packet-lte-rrc-template.c
@@ -1,7 +1,7 @@
/* packet-lte-rrc-template.c
* Routines for Evolved Universal Terrestrial Radio Access (E-UTRA);
* Radio Resource Control (RRC) protocol specification
- * (3GPP TS 36.331 V13.1.0 Release 13) packet dissection
+ * (3GPP TS 36.331 V13.2.0 Release 13) packet dissection
* Copyright 2008, Vincent Helfre
* Copyright 2009-2016, Pascal Quantin
*
@@ -2903,7 +2903,6 @@ dissect_lte_rrc_DL_DCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
return tvb_captured_length(tvb);
}
-
static int
dissect_lte_rrc_UL_CCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
{
@@ -3061,6 +3060,111 @@ dissect_lte_rrc_SC_MCCH(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
return tvb_captured_length(tvb);
}
+static int
+dissect_lte_rrc_DL_CCCH_NB(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
+{
+ proto_item *ti;
+ proto_tree *lte_rrc_tree;
+
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC DL_CCCH_NB");
+ col_clear(pinfo->cinfo, COL_INFO);
+
+ ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
+ lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
+ dissect_DL_CCCH_Message_NB_PDU(tvb, pinfo, lte_rrc_tree, NULL);
+ return tvb_captured_length(tvb);
+}
+
+static int
+dissect_lte_rrc_DL_DCCH_NB(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
+{
+ proto_item *ti;
+ proto_tree *lte_rrc_tree;
+
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC DL_DCCH_NB");
+ col_clear(pinfo->cinfo, COL_INFO);
+
+ ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
+ lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
+ dissect_DL_DCCH_Message_NB_PDU(tvb, pinfo, lte_rrc_tree, NULL);
+ return tvb_captured_length(tvb);
+}
+
+static int
+dissect_lte_rrc_UL_CCCH_NB(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
+{
+ proto_item *ti;
+ proto_tree *lte_rrc_tree;
+
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC UL_CCCH_NB");
+ col_clear(pinfo->cinfo, COL_INFO);
+
+ ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
+ lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
+ dissect_UL_CCCH_Message_NB_PDU(tvb, pinfo, lte_rrc_tree, NULL);
+ return tvb_captured_length(tvb);
+}
+
+static int
+dissect_lte_rrc_UL_DCCH_NB(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
+{
+ proto_item *ti;
+ proto_tree *lte_rrc_tree;
+
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC UL_DCCH_NB");
+ col_clear(pinfo->cinfo, COL_INFO);
+
+ ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
+ lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
+ dissect_UL_DCCH_Message_NB_PDU(tvb, pinfo, lte_rrc_tree, NULL);
+ return tvb_captured_length(tvb);
+}
+
+static int
+dissect_lte_rrc_BCCH_BCH_NB(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
+{
+ proto_item *ti;
+ proto_tree *lte_rrc_tree;
+
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC BCCH_BCH_NB");
+ col_clear(pinfo->cinfo, COL_INFO);
+
+ ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
+ lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
+ dissect_BCCH_BCH_Message_NB_PDU(tvb, pinfo, lte_rrc_tree, NULL);
+ return tvb_captured_length(tvb);
+}
+
+static int
+dissect_lte_rrc_BCCH_DL_SCH_NB(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
+{
+ proto_item *ti;
+ proto_tree *lte_rrc_tree;
+
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC DL_SCH_NB");
+ col_clear(pinfo->cinfo, COL_INFO);
+
+ ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
+ lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
+ dissect_BCCH_DL_SCH_Message_NB_PDU(tvb, pinfo, lte_rrc_tree, NULL);
+ return tvb_captured_length(tvb);
+}
+
+static int
+dissect_lte_rrc_PCCH_NB(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
+{
+ proto_item *ti;
+ proto_tree *lte_rrc_tree;
+
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "LTE RRC PCCH_NB");
+ col_clear(pinfo->cinfo, COL_INFO);
+
+ ti = proto_tree_add_item(tree, proto_lte_rrc, tvb, 0, -1, ENC_NA);
+ lte_rrc_tree = proto_item_add_subtree(ti, ett_lte_rrc);
+ dissect_PCCH_Message_NB_PDU(tvb, pinfo, lte_rrc_tree, NULL);
+ return tvb_captured_length(tvb);
+}
+
static void
lte_rrc_init_protocol(void)
{
@@ -3873,6 +3977,13 @@ void proto_register_lte_rrc(void) {
register_dissector("lte_rrc.handover_prep_info", dissect_lte_rrc_Handover_Preparation_Info, proto_lte_rrc);
register_dissector("lte_rrc.sbcch_sl_bch", dissect_lte_rrc_SBCCH_SL_BCH, proto_lte_rrc);
register_dissector("lte_rrc.sc_mcch", dissect_lte_rrc_SC_MCCH, proto_lte_rrc);
+ register_dissector("lte_rrc.dl_ccch.nb", dissect_lte_rrc_DL_CCCH_NB, proto_lte_rrc);
+ register_dissector("lte_rrc.dl_dcch.nb", dissect_lte_rrc_DL_DCCH_NB, proto_lte_rrc);
+ register_dissector("lte_rrc.ul_ccch.nb", dissect_lte_rrc_UL_CCCH_NB, proto_lte_rrc);
+ register_dissector("lte_rrc.ul_dcch.nb", dissect_lte_rrc_UL_DCCH_NB, proto_lte_rrc);
+ register_dissector("lte_rrc.bcch_bch.nb", dissect_lte_rrc_BCCH_BCH_NB, proto_lte_rrc);
+ register_dissector("lte_rrc.bcch_dl_sch.nb", dissect_lte_rrc_BCCH_DL_SCH_NB, proto_lte_rrc);
+ register_dissector("lte_rrc.pcch.nb", dissect_lte_rrc_PCCH_NB, proto_lte_rrc);
/* Register fields and subtrees */
proto_register_field_array(proto_lte_rrc, hf, array_length(hf));
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-25 06:55:18 +0000