LTE RRC: upgrade dissector to v12.3.0

Change-Id: Iac974bf505bed270fc1f9409a7d61c80ebca17a5
Reviewed-on: https://code.wireshark.org/review/5691
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2014-12-09 23:46:05 +01:00
parent 4921e55990
commit 34cd063ae8
6 changed files with 5032 additions and 809 deletions

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V11.8.0 (2014-06)
-- 3GPP TS 36.331 V12.3.0 (2014-09)
--
EUTRA-InterNodeDefinitions DEFINITIONS AUTOMATIC TAGS ::=
@ -8,6 +8,7 @@ IMPORTS
AntennaInfoCommon,
ARFCN-ValueEUTRA,
ARFCN-ValueEUTRA-v9e0,
ARFCN-ValueEUTRA-r9,
CellIdentity,
C-RNTI,
DL-DCCH-Message,
@ -29,7 +30,9 @@ IMPORTS
SystemInformationBlockType2,
UEAssistanceInformation-r11,
UECapabilityInformation,
UE-CapabilityRAT-ContainerList
UE-CapabilityRAT-ContainerList,
UE-RadioPagingInfo-r12,
WLAN-OffloadConfig-r12
FROM EUTRA-RRC-Definitions;
@ -90,6 +93,12 @@ HandoverPreparationInformation-v9e0-IEs ::= SEQUENCE {
HandoverPreparationInformation-v1130-IEs ::= SEQUENCE {
as-Context-v1130 AS-Context-v1130 OPTIONAL, -- Cond HO2
nonCriticalExtension HandoverPreparationInformation-v12xy-IEs OPTIONAL
}
HandoverPreparationInformation-v12xy-IEs ::= SEQUENCE {
ue-SupportedEARFCN-r12 ARFCN-ValueEUTRA-r9 OPTIONAL, -- Cond HO3
as-Config-v12xy AS-Config-v12xy OPTIONAL, -- Cond HO2
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -113,6 +122,24 @@ UERadioAccessCapabilityInformation-r8-IEs ::= SEQUENCE {
}
UERadioPagingInformation ::= SEQUENCE {
criticalExtensions CHOICE {
c1 CHOICE{
ueRadioPagingInformation-r12 UERadioPagingInformation-r12-IEs,
spare7 NULL,
spare6 NULL, spare5 NULL, spare4 NULL,
spare3 NULL, spare2 NULL, spare1 NULL
},
criticalExtensionsFuture SEQUENCE {}
}
}
UERadioPagingInformation-r12-IEs ::= SEQUENCE {
ue-RadioPagingInfo-r12 OCTET STRING (CONTAINING UE-RadioPagingInfo-r12),
nonCriticalExtension SEQUENCE {} OPTIONAL
}
AS-Config ::= SEQUENCE {
sourceMeasConfig MeasConfig,
sourceRadioResourceConfig RadioResourceConfigDedicated,
@ -140,6 +167,10 @@ AS-Config-v9e0 ::= SEQUENCE {
sourceDl-CarrierFreq-v9e0 ARFCN-ValueEUTRA-v9e0
}
AS-Config-v12xy ::= SEQUENCE {
sourceWlan-OffloadConfig-r12 WLAN-OffloadConfig-r12 OPTIONAL
}
AS-Context ::= SEQUENCE {
reestablishmentInfo ReestablishmentInfo OPTIONAL -- Cond HO

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V11.8.0 (2014-06)
-- 3GPP TS 36.331 V12.3.0 (2014-09)
--
EUTRA-RRC-Definitions DEFINITIONS AUTOMATIC TAGS ::=
@ -413,9 +413,21 @@ LoggedMeasurementConfiguration-v1080-IEs ::= SEQUENCE {
LoggedMeasurementConfiguration-v1130-IEs ::= SEQUENCE {
plmn-IdentityList-r11 PLMN-IdentityList3-r11 OPTIONAL, -- Need OR
areaConfiguration-v1130 AreaConfiguration-v1130 OPTIONAL, -- Need OR
nonCriticalExtension LoggedMeasurementConfiguration-v12xy-IEs OPTIONAL
}
LoggedMeasurementConfiguration-v12xy-IEs ::= SEQUENCE {
targetMBSFN-AreaList-r12 TargetMBSFN-AreaList-r12 OPTIONAL, -- Need OR
nonCriticalExtension SEQUENCE {} OPTIONAL
}
TargetMBSFN-AreaList-r12 ::= SEQUENCE (SIZE (0..8)) OF TargetMBSFN-Area-r12
TargetMBSFN-Area-r12 ::= SEQUENCE {
mbsfn-AreaId-r12 INTEGER (0..255) OPTIONAL, -- Need OR
carrierFreq-r12 ARFCN-ValueEUTRA-r9
}
MasterInformationBlock ::= SEQUENCE {
dl-Bandwidth ENUMERATED {
@ -494,6 +506,11 @@ MBSFNAreaConfiguration-r9 ::= SEQUENCE {
MBSFNAreaConfiguration-v930-IEs ::= SEQUENCE {
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension MBSFNAreaConfiguration-v12xy-IEs OPTIONAL
}
MBSFNAreaConfiguration-v12xy-IEs ::= SEQUENCE {
pmch-InfoListExt-r12 PMCH-InfoListExt-r12 OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -766,6 +783,18 @@ RRCConnectionReconfiguration-v1020-IEs ::= SEQUENCE {
RRCConnectionReconfiguration-v1130-IEs ::= SEQUENCE {
systemInfomationBlockType1Dedicated-r11 OCTET STRING (CONTAINING SystemInformationBlockType1) OPTIONAL, -- Need ON
nonCriticalExtension RRCConnectionReconfiguration-v12xy-IEs OPTIONAL -- Need OP
}
RRCConnectionReconfiguration-v12xy-IEs ::= SEQUENCE {
wlan-OffloadDedicated-r12 CHOICE {
release NULL,
setup SEQUENCE {
wlan-OffloadConfig-r12 WLAN-OffloadConfig-r12,
t350-r12 ENUMERATED {min5, min10, min20, min30, min60,
min120, min180, spare1} OPTIONAL-- Need ON
}
} OPTIONAL, -- Need ON
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -829,6 +858,11 @@ RRCConnectionReconfigurationComplete-v1020-IEs ::= SEQUENCE {
RRCConnectionReconfigurationComplete-v1130-IEs ::= SEQUENCE {
connEstFailInfoAvailable-r11 ENUMERATED {true} OPTIONAL,
nonCriticalExtension RRCConnectionReconfigurationComplete-v12xy-IEs OPTIONAL
}
RRCConnectionReconfigurationComplete-v12xy-IEs ::= SEQUENCE {
logMeasAvailableMBSFN-r12 ENUMERATED {true} OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -888,6 +922,11 @@ RRCConnectionReestablishmentComplete-v1020-IEs ::= SEQUENCE {
RRCConnectionReestablishmentComplete-v1130-IEs ::= SEQUENCE {
connEstFailInfoAvailable-r11 ENUMERATED {true} OPTIONAL,
nonCriticalExtension RRCConnectionReestablishmentComplete-v12xy-IEs OPTIONAL
}
RRCConnectionReestablishmentComplete-v12xy-IEs ::= SEQUENCE {
logMeasAvailableMBSFN-r12 ENUMERATED {true} OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -1210,6 +1249,13 @@ RRCConnectionSetupComplete-v1020-IEs ::= SEQUENCE {
RRCConnectionSetupComplete-v1130-IEs ::= SEQUENCE {
connEstFailInfoAvailable-r11 ENUMERATED {true} OPTIONAL,
nonCriticalExtension RRCConnectionSetupComplete-v12xy-IEs OPTIONAL
}
RRCConnectionSetupComplete-v12xy-IEs ::= SEQUENCE {
mobilityState-r12 ENUMERATED {normal, medium, high, spare} OPTIONAL,
mobilityHistoryAvail-r12 ENUMERATED {true} OPTIONAL,
logMeasAvailableMBSFN-r12 ENUMERATED {true} OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -1306,7 +1352,8 @@ SystemInformation-r8-IEs ::= SEQUENCE {
sib13-v920 SystemInformationBlockType13-r9,
sib14-v1130 SystemInformationBlockType14-r11,
sib15-v1130 SystemInformationBlockType15-r11,
sib16-v1130 SystemInformationBlockType16-r11
sib16-v1130 SystemInformationBlockType16-r11,
sib17-v12xy SystemInformationBlockType17-r12
},
nonCriticalExtension SystemInformation-v8a0-IEs OPTIONAL
}
@ -1369,6 +1416,13 @@ SystemInformationBlockType1-v920-IEs ::= SEQUENCE {
SystemInformationBlockType1-v1130-IEs ::= SEQUENCE {
tdd-Config-v1130 TDD-Config-v1130 OPTIONAL, -- Cond TDD-OR
cellSelectionInfo-v1130 CellSelectionInfo-v1130 OPTIONAL, -- Cond WB-RSRQ
nonCriticalExtension SystemInformationBlockType1-v12xy-IEs OPTIONAL
}
SystemInformationBlockType1-v12xy-IEs ::= SEQUENCE {
cellAccessRelatedInfo-v12xy SEQUENCE {
category0Allowed-r12 ENUMERATED {true} OPTIONAL -- Need OR
},
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -1394,7 +1448,7 @@ SIB-Type ::= ENUMERATED {
sibType7, sibType8, sibType9, sibType10,
sibType11, sibType12-v920, sibType13-v920,
sibType14-v1130, sibType15-v1130,
sibType16-v1130, spare2, spare1, ...}
sibType16-v1130, sibType17-v12xy, spare1, ...}
CellSelectionInfo-v920 ::= SEQUENCE {
q-QualMin-r9 Q-QualMin-r9,
@ -1472,6 +1526,11 @@ UECapabilityInformation-r8-IEs ::= SEQUENCE {
UECapabilityInformation-v8a0-IEs ::= SEQUENCE {
lateNonCriticalExtension OCTET STRING OPTIONAL,
nonCriticalExtension UECapabilityInformation-v12xy-IEs OPTIONAL
}
UECapabilityInformation-v12xy-IEs ::= SEQUENCE {
ue-RadioPagingInfo-r12 UE-RadioPagingInfo-r12 OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -1505,6 +1564,11 @@ UEInformationRequest-v1020-IEs ::= SEQUENCE {
UEInformationRequest-v1130-IEs ::= SEQUENCE {
connEstFailReportReq-r11 ENUMERATED {true} OPTIONAL, -- Need ON
nonCriticalExtension UEInformationRequest-v12xy-IEs OPTIONAL
}
UEInformationRequest-v12xy-IEs ::= SEQUENCE {
mobilityHistoryReportReq-r12 ENUMERATED {true} OPTIONAL, -- Need ON
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -1548,6 +1612,11 @@ UEInformationResponse-v1020-IEs ::= SEQUENCE {
UEInformationResponse-v1130-IEs ::= SEQUENCE {
connEstFailReport-r11 ConnEstFailReport-r11 OPTIONAL,
nonCriticalExtension UEInformationResponse-v12xy-IEs OPTIONAL
}
UEInformationResponse-v12xy-IEs ::= SEQUENCE {
mobilityHistoryReport-r12 MobilityHistoryReport-r12 OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -1584,7 +1653,7 @@ RLF-Report-r9 ::= SEQUENCE {
c-RNTI-r11 C-RNTI,
rlf-Cause-r11 ENUMERATED {
t310-Expiry, randomAccessProblem,
rlc-MaxNumRetx, spare1},
rlc-MaxNumRetx, t312-Expiry-r12},
timeSinceFailure-r11 TimeSinceFailure-r11
} OPTIONAL,
previousUTRA-CellId-r11 SEQUENCE {
@ -1602,7 +1671,12 @@ RLF-Report-r9 ::= SEQUENCE {
tdd-r11 PhysCellIdUTRA-TDD
}
} OPTIONAL
]],
[[ failedPCellId-v12xy SEQUENCE {
tac-FailedPCell-r12 TrackingAreaCode
} OPTIONAL
]]
}
RLF-Report-v9e0 ::= SEQUENCE {
@ -1664,9 +1738,34 @@ LogMeasInfo-r10 ::= SEQUENCE {
} OPTIONAL,
...,
[[ measResultListEUTRA-v1090 MeasResultList2EUTRA-v9e0 OPTIONAL
]],
[[ measResultListMBSFN-r12 MeasResultListMBSFN-r12 OPTIONAL
]]
}
MeasResultListMBSFN-r12 ::= SEQUENCE (SIZE (1..8)) OF MeasResultMBSFN-r12
MeasResultMBSFN-r12 ::= SEQUENCE {
mbsfn-Area-r12 SEQUENCE {
mbsfn-AreaId-r12 INTEGER(0..255),
carrierFreq-r12 ARFCN-ValueEUTRA-r9
},
rsrpResultMBSFN-r12 RSRP-Range,
rsrqResultMBSFN-r12 RSRQ-Range,
signallingBLER-Result-r12 BLER-Range-r12 OPTIONAL,
dataBLER-MCH-ResultList-r12 DataBLER-MCH-ResultList-r12 OPTIONAL
}
DataBLER-MCH-ResultList-r12 ::= SEQUENCE (SIZE (1.. maxPMCH-PerMBSFN)) OF DataBLER-MCH-Result-r12
DataBLER-MCH-Result-r12 ::= SEQUENCE {
mch-Index-r12 INTEGER (1..maxPMCH-PerMBSFN),
dataBLER-Result-r12 BLER-Range-r12
}
BLER-Range-r12 ::= INTEGER(0..31)
MeasResultList2GERAN-r10 ::= SEQUENCE (SIZE (1..maxCellListGERAN)) OF MeasResultListGERAN
ConnEstFailReport-r11 ::= SEQUENCE {
@ -1694,6 +1793,8 @@ NumberOfPreamblesSent-r11::= INTEGER (1..200)
TimeSinceFailure-r11 ::= INTEGER (0..172800)
MobilityHistoryReport-r12 ::= VisitedCellInfoList-r12
ULHandoverPreparationTransfer ::= SEQUENCE {
criticalExtensions CHOICE {
@ -1765,6 +1866,11 @@ SystemInformationBlockType2 ::= SEQUENCE {
ssac-BarringForMMTEL-Video-r9 AC-BarringConfig OPTIONAL -- Need OP
]],
[[ ac-BarringForCSFB-r10 AC-BarringConfig OPTIONAL -- Need OP
]],
[[
ac-BarringSkipForMMTELVoice-r12 ENUMERATED {true} OPTIONAL, -- Need OP
ac-BarringSkipForMMTELVideo-r12 ENUMERATED {true} OPTIONAL, -- Need OP
ac-BarringSkipForSMS-r12 ENUMERATED {true} OPTIONAL -- Need OP
]]
}
@ -2242,6 +2348,30 @@ SystemInformationBlockType16-r11 ::= SEQUENCE {
}
SystemInformationBlockType17-r12 ::= SEQUENCE {
wlan-OffloadPerPLMN-List-r12 SEQUENCE (SIZE (1..maxPLMN-r11)) OF
WLAN-OffloadPerPLMN-r12 OPTIONAL, -- Need OR
lateNonCriticalExtension OCTET STRING OPTIONAL,
...
}
WLAN-OffloadPerPLMN-r12 ::= SEQUENCE {
plmn-Identity-r12 INTEGER (1..maxPLMN-r11),
wlan-OffloadConfigCommon-r12 WLAN-OffloadConfig-r12,
wlan-Id-List-r12 WLAN-Id-List-r12 OPTIONAL
}
WLAN-Id-List-r12 ::= SEQUENCE (SIZE (1..maxWLAN-Id-r12)) OF WLAN-Id-r12
WLAN-Id-r12 ::= SEQUENCE {
wlan-Identifiers CHOICE {
ssid OCTET STRING (SIZE (1..32)),
bssid OCTET STRING (SIZE (6)),
hessid OCTET STRING (SIZE (6))
}
}
AntennaInfoCommon ::= SEQUENCE {
antennaPortsCount ENUMERATED {an1, an2, an4, spare1}
}
@ -2285,6 +2415,10 @@ AntennaInfoDedicated-r10 ::= SEQUENCE {
}
}
AntennaInfoDedicated-v12xx ::= SEQUENCE {
alternativeCodebookEnabledFor4TX-r12 ENUMERATED {true} OPTIONAL -- Cond TMY
}
AntennaInfoUL-r10 ::= SEQUENCE {
transmissionModeUL-r10 ENUMERATED {tm1, tm2, spare6, spare5,
@ -2323,6 +2457,17 @@ CQI-ReportConfig-v1130 ::= SEQUENCE {
cqi-ReportBoth-r11 CQI-ReportBoth-r11
}
CQI-ReportConfig-v12x0 ::= SEQUENCE {
csi-SubframePatternConfig-r12 CHOICE {
release NULL,
setup SEQUENCE {
csi-MeasSubframeSet-r12 BIT STRING (SIZE (10))
}
} OPTIONAL, -- Need ON
cqi-ReportBoth-r12 CQI-ReportBoth-r12,
cqi-ReportAperiodic-v12x0 CQI-ReportAperiodic-v12x0 OPTIONAL -- Need ON
}
CQI-ReportConfigSCell-r10 ::= SEQUENCE {
cqi-ReportModeAperiodic-r10 CQI-ReportModeAperiodic OPTIONAL, -- Need OR
nomPDSCH-RS-EPRE-Offset-r10 INTEGER (-1..6),
@ -2418,6 +2563,17 @@ CQI-ReportAperiodic-r10 ::= CHOICE {
}
}
CQI-ReportAperiodic-v12x0 ::= CHOICE {
release NULL,
setup SEQUENCE {
aperiodicCSI-Trigger-r12 SEQUENCE {
trigger-SubframeSetIndicator-r12 ENUMERATED {s1, s2},
trigger1-SubframeSetIndicator-r12 BIT STRING (SIZE (8)),
trigger2-SubframeSetIndicator-r12 BIT STRING (SIZE (8))
}
}
}
CQI-ReportAperiodicProc-r11 ::= SEQUENCE {
cqi-ReportModeAperiodic-r11 CQI-ReportModeAperiodic,
trigger01-r11 BOOLEAN,
@ -2427,7 +2583,7 @@ CQI-ReportAperiodicProc-r11 ::= SEQUENCE {
CQI-ReportModeAperiodic ::= ENUMERATED {
rm12, rm20, rm22, rm30, rm31,
spare3, spare2, spare1
rm32-v12xx, spare2, spare1
}
CQI-ReportBoth-r11 ::= SEQUENCE {
@ -2437,10 +2593,20 @@ CQI-ReportBoth-r11 ::= SEQUENCE {
csi-ProcessToAddModList-r11 CSI-ProcessToAddModList-r11 OPTIONAL -- Need ON
}
CQI-ReportBoth-r12 ::= SEQUENCE {
csi-IM-ConfigToReleaseList-r12 CSI-IM-ConfigToReleaseList-r12 OPTIONAL, -- Need ON
csi-IM-ConfigToAddModList-r12 CSI-IM-ConfigToAddModList-r12 OPTIONAL -- Need ON
}
CSI-IM-ConfigToAddModList-r11 ::= SEQUENCE (SIZE (1..maxCSI-IM-r11)) OF CSI-IM-Config-r11
CSI-IM-ConfigToAddModList-r12 ::= SEQUENCE (SIZE (1..maxCSI-IM-r12)) OF CSI-IM-Config-r12
CSI-IM-ConfigToReleaseList-r11 ::= SEQUENCE (SIZE (1..maxCSI-IM-r11)) OF CSI-IM-ConfigId-r11
CSI-IM-ConfigToReleaseList-r12 ::= SEQUENCE (SIZE (1..maxCSI-IM-r12)) OF CSI-IM-ConfigId-r12
CSI-ProcessToAddModList-r11 ::= SEQUENCE (SIZE (1..maxCSI-Proc-r11)) OF CSI-Process-r11
CSI-ProcessToReleaseList-r11 ::= SEQUENCE (SIZE (1..maxCSI-Proc-r11)) OF CSI-ProcessId-r11
@ -2451,6 +2617,7 @@ CQI-ReportBothProc-r11 ::= SEQUENCE {
}
CQI-ReportPeriodicProcExtId-r11 ::= INTEGER (1..maxCQI-ProcExt-r11)
@ -2474,8 +2641,16 @@ CSI-IM-Config-r11 ::= SEQUENCE {
...
}
CSI-IM-Config-r12 ::= SEQUENCE {
csi-IM-ConfigId-r12 CSI-IM-ConfigId-r12,
resourceConfig-r12 INTEGER (0..31),
subframeConfig-r12 INTEGER (0..154),
...
}
CSI-IM-ConfigId-r11 ::= INTEGER (1..maxCSI-IM-r11)
CSI-IM-ConfigId-r12 ::= INTEGER (1..maxCSI-IM-r12)
CSI-Process-r11 ::= SEQUENCE {
@ -2486,7 +2661,11 @@ CSI-Process-r11 ::= SEQUENCE {
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
...
...,
[[ alternativeCodebookEnabledFor4TXProc-r12 ENUMERATED {true} OPTIONAL, -- Need OR
csi-IM-ConfigIdList-r12 SEQUENCE (SIZE (1..2)) OF CSI-IM-ConfigId-r12 OPTIONAL, -- Cond CSIIMREL12
cqi-ReportAperiodicProcSecond-r12 CQI-ReportAperiodicProc-r11 OPTIONAL -- Need OR
]]
}
P-C-AndCBSR-r11 ::= SEQUENCE {
@ -2517,6 +2696,16 @@ CSI-RS-Config-r10 ::= SEQUENCE {
} OPTIONAL -- Need ON
}
CSI-RS-Config2-r12 ::= SEQUENCE {
zeroTxPowerCSI-RS-r12 CHOICE {
release NULL,
setup SEQUENCE {
zeroTxPowerResourceConfigList-r12 BIT STRING (SIZE (16)),
zeroTxPowerSubframeConfig-r12 INTEGER (0..154)
}
} OPTIONAL -- Need ON
}
CSI-RS-ConfigNZP-r11 ::= SEQUENCE {
csi-RS-ConfigNZPId-r11 CSI-RS-ConfigNZPId-r11,
@ -2595,11 +2784,36 @@ EPDCCH-SetConfig-r11 ::= SEQUENCE {
dmrs-ScramblingSequenceInt-r11 INTEGER (0..503),
pucch-ResourceStartOffset-r11 INTEGER (0..2047),
re-MappingQCL-ConfigId-r11 PDSCH-RE-MappingQCL-ConfigId-r11 OPTIONAL, -- Need OR
...
...,
[[ csi-RS-ConfigZPId-Second-r12 CSI-RS-ConfigZPId-r11 OPTIONAL -- Need OR
]]
}
EPDCCH-SetConfigId-r11 ::= INTEGER (0..1)
EIMTA-MainConfig-r12 ::= CHOICE {
release NULL,
setup SEQUENCE {
eimta-RNTI-r12 C-RNTI,
eimta-CommandPeriodicity-r12 ENUMERATED {sf10, sf20, sf40, sf80},
eimta-CommandSubframeSet-r12 BIT STRING (SIZE(10))
}
}
EIMTA-MainConfigServCell-r12 ::= CHOICE {
release NULL,
setup SEQUENCE {
eimta-ReConfigIndex-r12 INTEGER (1..5),
eimta-HarqReferenceConfig-r12 ENUMERATED {sa2,sa4,sa5},
mbsfn-SubframeConfigList-v12x0 CHOICE {
release NULL,
setup SEQUENCE {
subframeConfigList-r12 MBSFN-SubframeConfigList
}
}
}
}
LogicalChannelConfig ::= SEQUENCE {
ul-SpecificParameters SEQUENCE {
@ -2661,7 +2875,10 @@ MAC-MainConfig ::= SEQUENCE {
[[ stag-ToReleaseList-r11 STAG-ToReleaseList-r11 OPTIONAL, -- Need ON
stag-ToAddModList-r11 STAG-ToAddModList-r11 OPTIONAL, -- Need ON
drx-Config-v1130 DRX-Config-v1130 OPTIONAL -- Need ON
]],
[[ e-HARQ-Pattern-r12 BOOLEAN OPTIONAL -- Need ON
]]
}
MAC-MainConfigSCell-r11 ::= SEQUENCE {
@ -2880,9 +3097,17 @@ PhysicalConfigDedicated ::= SEQUENCE {
pucch-ConfigDedicated-v1130 PUCCH-ConfigDedicated-v1130 OPTIONAL, -- Need ON
pusch-ConfigDedicated-v1130 PUSCH-ConfigDedicated-v1130 OPTIONAL, -- Need ON
uplinkPowerControlDedicated-v1130 UplinkPowerControlDedicated-v1130 OPTIONAL -- Need ON
]],
[[ antennaInfo-v12xx AntennaInfoDedicated-v12xx OPTIONAL, -- Cond AI-r10
eimta-MainConfig-r12 EIMTA-MainConfig-r12 OPTIONAL, -- Need ON
eimta-MainConfigPCell-r12 EIMTA-MainConfigServCell-r12 OPTIONAL, -- Cond eimta
pucch-ConfigDedicated-v12x0 PUCCH-ConfigDedicated-v12x0 OPTIONAL, -- Cond eimta
cqi-ReportConfigPCell-v12x0 CQI-ReportConfig-v12x0 OPTIONAL, -- Need ON
uplinkPowerControlDedicated-v12x0 UplinkPowerControlDedicated-v12x0 OPTIONAL, -- Need ON
pusch-ConfigDedicated-v12x0 PUSCH-ConfigDedicated-v12x0 OPTIONAL, -- Cond TwoSetsUL
csi-RS-Config2-r12 CSI-RS-Config2-r12 OPTIONAL -- Need OR
]]
}
PhysicalConfigDedicatedSCell-r10 ::= SEQUENCE {
-- DL configuration as well as configuration applicable for DL and UL
nonUL-Configuration-r10 SEQUENCE {
@ -2915,6 +3140,12 @@ PhysicalConfigDedicatedSCell-r10 ::= SEQUENCE {
cqi-ReportConfig-v1130 CQI-ReportConfig-v1130 OPTIONAL, -- Need ON
pusch-ConfigDedicated-v1130 PUSCH-ConfigDedicated-v1130 OPTIONAL, -- Need ON
uplinkPowerControlDedicatedSCell-v1130 UplinkPowerControlDedicated-v1130 OPTIONAL -- Need ON
]],
[[ antennaInfo-v12xx AntennaInfoDedicated-v12xx OPTIONAL, -- Need ON
eimta-MainConfigSCell-r12 EIMTA-MainConfigServCell-r12 OPTIONAL, -- Cond eimta
cqi-ReportConfigSCell-v12x0 CQI-ReportConfig-v12x0 OPTIONAL, -- Need ON
uplinkPowerControlDedicatedSCell-v12x0 UplinkPowerControlDedicated-v12x0 OPTIONAL, -- Need ON
csi-RS-Config2-r12 CSI-RS-Config2-r12 OPTIONAL -- Need OR
]]
}
@ -3014,6 +3245,15 @@ PUCCH-ConfigDedicated-v1130 ::= SEQUENCE {
} OPTIONAL -- Need ON
}
PUCCH-ConfigDedicated-v12x0 ::= SEQUENCE {
n1PUCCH-Param-r12 CHOICE {
release NULL,
setup SEQUENCE {
n1PUCCH-AN-r12 INTEGER (0..2047)
}
}
}
N1PUCCH-AN-CS-r10 ::= SEQUENCE (SIZE (1..4)) OF INTEGER (0..2047)
@ -3053,6 +3293,22 @@ PUSCH-ConfigDedicated-v1130 ::= SEQUENCE {
}
}
PUSCH-ConfigDedicated-v12x0::= SEQUENCE {
uciOnPUSCH CHOICE {
release NULL,
setup SEQUENCE {
betaOffset-ACK-Index-SubframeSet2-r12 INTEGER (0..15),
betaOffset-RI-Index-SubframeSet2-r12 INTEGER (0..15),
betaOffset-CQI-Index-SubframeSet2-r12 INTEGER (0..15),
betaOffsetMC-r12 SEQUENCE {
betaOffset-ACK-Index-MC-SubframeSet2-r12 INTEGER (0..15),
betaOffset-RI-Index-MC-SubframeSet2-r12 INTEGER (0..15),
betaOffset-CQI-Index-MC-SubframeSet2-r12 INTEGER (0..15)
} OPTIONAL -- Need OR
}
}
}
PUSCH-ConfigDedicatedSCell-r10 ::= SEQUENCE {
groupHoppingDisabled-r10 ENUMERATED {true} OPTIONAL, -- Need OR
dmrs-WithOCC-Activated-r10 ENUMERATED {true} OPTIONAL -- Need OR
@ -3098,6 +3354,15 @@ RACH-ConfigCommon ::= SEQUENCE {
...
}
RACH-ConfigCommon-v12xy ::= SEQUENCE {
txFailParams-r12 SEQUENCE {
connEstFailCount-r12 ENUMERATED {n1, n2, n3, n4},
connEstFailOffsetValidity-r12 ENUMERATED {s30, s60, s120, s240,
s300, s420, s600, s900},
connEstFailOffset-r12 INTEGER (0..15) OPTIONAL -- Need OP
}
}
RACH-ConfigCommonSCell-r11 ::= SEQUENCE {
powerRampingParameters-r11 PowerRampingParameters,
ra-SupervisionInfo-r11 SEQUENCE {
@ -3139,6 +3404,8 @@ RadioResourceConfigCommonSIB ::= SEQUENCE {
ul-CyclicPrefixLength UL-CyclicPrefixLength,
...,
[[ uplinkPowerControlCommon-v1020 UplinkPowerControlCommon-v1020 OPTIONAL -- Need OR
]],
[[ rach-ConfigCommon-v12xy RACH-ConfigCommon-v12xy OPTIONAL -- Need OR
]]
}
@ -3311,7 +3578,11 @@ RLC-Config ::= CHOICE {
um-Uni-Directional-DL SEQUENCE {
dl-UM-RLC DL-UM-RLC
},
...
...,
am-v12xy SEQUENCE {
ul-AM-RLC-r12 UL-AM-RLC-r12,
dl-AM-RLC-r12 DL-AM-RLC-r12
}
}
UL-AM-RLC ::= SEQUENCE {
@ -3322,11 +3593,21 @@ UL-AM-RLC ::= SEQUENCE {
t1, t2, t3, t4, t6, t8, t16, t32}
}
UL-AM-RLC-r12 ::= SEQUENCE {
ul-AM-RLC-r12 UL-AM-RLC,
extended-RLC-LI-Field-r12 BOOLEAN
}
DL-AM-RLC ::= SEQUENCE {
t-Reordering T-Reordering,
t-StatusProhibit T-StatusProhibit
}
DL-AM-RLC-r12 ::= SEQUENCE {
dl-AM-RLC-r12 DL-AM-RLC,
extended-RLC-LI-Field-r12 BOOLEAN
}
UL-UM-RLC ::= SEQUENCE {
sn-FieldLength SN-FieldLength
}
@ -3565,7 +3846,12 @@ SPS-ConfigUL ::= CHOICE {
p0-UE-PUSCH-Persistent INTEGER (-8..7)
} OPTIONAL, -- Need OP
twoIntervalsConfig ENUMERATED {true} OPTIONAL, -- Cond TDD
...
...,
[[ p0-Persistent-SubframeSet2-r12 SEQUENCE {
p0-NominalPUSCH-Persistent-SubframeSet2-r12 INTEGER (-126..24),
p0-UE-PUSCH-Persistent-SubframeSet2-r12 INTEGER (-8..7)
} OPTIONAL -- Cond TwoSetsUL
]]
}
}
@ -3646,6 +3932,18 @@ UplinkPowerControlDedicated-v1130 ::= SEQUENCE {
deltaTxD-OffsetListPUCCH-v1130 DeltaTxD-OffsetListPUCCH-v1130 OPTIONAL -- Need OR
}
UplinkPowerControlDedicated-v12x0 ::= SEQUENCE {
set2PowerControlParameter CHOICE {
release NULL,
setup SEQUENCE {
tpc-SubframeSet-r12 BIT STRING (SIZE(10)),
p0-NominalPUSCH-SubframeSet2-r12 INTEGER (-126..24),
alpha-SubframeSet2-r12 ENUMERATED {al0, al04, al05, al06, al07, al08, al09, al1},
p0-UE-PUSCH-SubframeSet2-r12 INTEGER (-8..7)
}
}
}
UplinkPowerControlDedicatedSCell-r10 ::= SEQUENCE {
p0-UE-PUSCH-r10 INTEGER (-8..7),
deltaMCS-Enabled-r10 ENUMERATED {en0, en1},
@ -4123,7 +4421,14 @@ MeasObjectEUTRA ::= SEQUENCE {
measSubframePatternConfigNeigh-r10 MeasSubframePatternConfigNeigh-r10 OPTIONAL -- Need ON
]],
[[widebandRSRQ-Meas-r11 BOOLEAN OPTIONAL -- Cond WB-RSRQ
]],
[[altTTT-CellsToRemoveList-r12 CellIndexList OPTIONAL, -- Need ON
altTTT-CellsToAddModList-r12 AltTTT-CellsToAddModList-r12 OPTIONAL -- Need ON
]],
[[t312-r12 ENUMERATED {ms0, ms50, ms100, ms200, ms300, ms400, ms500,
ms1000} OPTIONAL -- Need ON
]]
}
MeasObjectEUTRA-v9e0 ::= SEQUENCE {
@ -4158,6 +4463,13 @@ MeasSubframePatternConfigNeigh-r10 ::= CHOICE {
MeasSubframeCellList-r10 ::= SEQUENCE (SIZE (1..maxCellMeas)) OF PhysCellIdRange
AltTTT-CellsToAddModList-r12 ::= SEQUENCE (SIZE (1..maxCellMeas)) OF AltTTT-CellsToAddMod-r12
AltTTT-CellsToAddMod-r12 ::= SEQUENCE {
cellIndex INTEGER (1..maxCellMeas),
physCellIdRange PhysCellIdRange
}
MeasObjectGERAN ::= SEQUENCE {
carrierFreqs CarrierFreqsGERAN,
@ -4261,6 +4573,8 @@ MeasResultEUTRA ::= SEQUENCE {
rsrqResult RSRQ-Range OPTIONAL,
...,
[[ additionalSI-Info-r9 AdditionalSI-Info-r9 OPTIONAL
]],
[[ primaryPLMN-Suitable-r12 ENUMERATED {true} OPTIONAL
]]
}
}
@ -4299,6 +4613,8 @@ MeasResultUTRA ::= SEQUENCE {
utra-EcN0 INTEGER (0..49) OPTIONAL,
...,
[[ additionalSI-Info-r9 AdditionalSI-Info-r9 OPTIONAL
]],
[[ primaryPLMN-Suitable-r12 ENUMERATED {true} OPTIONAL
]]
}
}
@ -4429,6 +4745,9 @@ ReportConfigEUTRA ::= SEQUENCE {
]],
[[ includeLocationInfo-r10 ENUMERATED {true} OPTIONAL, -- Need OR
reportAddNeighMeas-r10 ENUMERATED {setup} OPTIONAL -- Need OR
]],
[[ alternativeTimeToTrigger-r12 TimeToTrigger OPTIONAL, -- Need OR
useT312-r12 ENUMERATED {setup} OPTIONAL -- Cond event
]]
}
@ -4709,7 +5028,7 @@ UE-EUTRA-Capability-v9h0-IEs ::= SEQUENCE {
UE-EUTRA-Capability-v10c0-IEs ::= SEQUENCE {
otdoa-PositioningCapabilities-r10 OTDOA-PositioningCapabilities-r10 OPTIONAL,
--Following field is only to be used for late extensions from REL-10
-- Following field is only to be used for late extensions from REL-10
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -4779,6 +5098,15 @@ UE-EUTRA-Capability-v1180-IEs ::= SEQUENCE {
mbms-Parameters-r11 MBMS-Parameters-r11 OPTIONAL,
fdd-Add-UE-EUTRA-Capabilities-v1180 UE-EUTRA-CapabilityAddXDD-Mode-v1180 OPTIONAL,
tdd-Add-UE-EUTRA-Capabilities-v1180 UE-EUTRA-CapabilityAddXDD-Mode-v1180 OPTIONAL,
nonCriticalExtension UE-EUTRA-Capability-v12xy-IEs OPTIONAL
}
UE-EUTRA-Capability-v12xy-IEs ::= SEQUENCE {
phyLayerParameters-v12xy PhyLayerParameters-v12xy OPTIONAL,
rlc-Parameters-r12 RLC-Parameters-r12 OPTIONAL,
ue-BasedNetwPerfMeasParameters-v12xy UE-BasedNetwPerfMeasParameters-v12xy OPTIONAL,
ue-Category-v12xy INTEGER (0) OPTIONAL,
measParameters-v12xy MeasParameters-v12xy OPTIONAL,
nonCriticalExtension SEQUENCE {} OPTIONAL
}
@ -4818,6 +5146,10 @@ AccessStratumRelease ::= ENUMERATED {
rel8, rel9, rel10, rel11, spare4, spare3,
spare2, spare1, ...}
RLC-Parameters-r12 ::= SEQUENCE {
extended-RLC-LI-Field-r12 ENUMERATED {supported}
}
PDCP-Parameters ::= SEQUENCE {
supportedROHC-Profiles SEQUENCE {
profile0x0001 BOOLEAN,
@ -4881,6 +5213,16 @@ PhyLayerParameters-v1170 ::= SEQUENCE {
interBandTDD-CA-WithDifferentConfig-r11 BIT STRING (SIZE (2)) OPTIONAL
}
PhyLayerParameters-v12xy ::= SEQUENCE {
e-HARQ-Pattern-FDD-r12 ENUMERATED {supported} OPTIONAL,
tdd-FDD-CA-PCellDuplex-r12 BIT STRING (SIZE (2)) OPTIONAL,
phy-TDD-ReConfig-TDDPCell-r12 ENUMERATED {supported} OPTIONAL,
phy-TDD-ReConfig-FDDPCell-r12 ENUMERATED {supported} OPTIONAL,
pusch-SRS-PowerControl-SubframeSet-r12 ENUMERATED {supported} OPTIONAL,
csi-SubframeSet-r12 ENUMERATED {supported} OPTIONAL
}
NonContiguousUL-RA-WithinCC-List-r10 ::= SEQUENCE (SIZE (1..maxBands)) OF NonContiguousUL-RA-WithinCC-r10
NonContiguousUL-RA-WithinCC-r10 ::= SEQUENCE {
@ -4913,7 +5255,7 @@ RF-Parameters-v1130 ::= SEQUENCE {
RF-Parameters-v1180 ::= SEQUENCE {
freqBandRetrieval-r11 ENUMERATED {supported} OPTIONAL,
reportedFrequencyBands-r11 SEQUENCE (SIZE (1.. maxBands)) OF FreqBandIndicator-r11 OPTIONAL,
requestedBands-r11 SEQUENCE (SIZE (1.. maxBands)) OF FreqBandIndicator-r11 OPTIONAL,
supportedBandCombinationAdd-r11 SupportedBandCombinationAdd-r11 OPTIONAL
}
@ -5021,6 +5363,11 @@ MeasParameters-v1130 ::= SEQUENCE {
rsrqMeasWideband-r11 ENUMERATED {supported} OPTIONAL
}
MeasParameters-v12xy ::= SEQUENCE {
timerT312-r12 ENUMERATED {supported} OPTIONAL,
alternativeTimeToTrigger-r12 ENUMERATED {supported} OPTIONAL
}
BandListEUTRA ::= SEQUENCE (SIZE (1..maxBands)) OF BandInfoEUTRA
BandCombinationListEUTRA-r10 ::= SEQUENCE (SIZE (1..maxBandComb-r10)) OF BandInfoEUTRA
@ -5175,6 +5522,10 @@ UE-BasedNetwPerfMeasParameters-r10 ::= SEQUENCE {
standaloneGNSS-Location-r10 ENUMERATED {supported} OPTIONAL
}
UE-BasedNetwPerfMeasParameters-v12xy ::= SEQUENCE {
loggedMBSFNMeasurements-r12 ENUMERATED {supported}
}
OTDOA-PositioningCapabilities-r10 ::= SEQUENCE {
otdoa-UE-Assisted-r10 ENUMERATED {supported},
interFreqRSTD-Measurement-r10 ENUMERATED {supported} OPTIONAL
@ -5192,6 +5543,12 @@ MBMS-Parameters-r11 ::= SEQUENCE {
}
UE-RadioPagingInfo-r12 ::= SEQUENCE {
ue-Category-v12xy INTEGER (0) OPTIONAL,
...
}
UE-TimersAndConstants ::= SEQUENCE {
t300 ENUMERATED {
ms100, ms200, ms300, ms400, ms600, ms1000, ms1500,
@ -5212,6 +5569,56 @@ UE-TimersAndConstants ::= SEQUENCE {
}
VisitedCellInfoList-r12 ::= SEQUENCE (SIZE (1..maxCellHistory-r12)) OF VisitedCellInfo-r12
VisitedCellInfo-r12 ::= SEQUENCE {
visitedCellId-r12 CHOICE {
cellGlobalId-r12 CellGlobalIdEUTRA,
pci-arfcn-r12 SEQUENCE {
physCellId-r12 PhysCellId,
carrierFreq-r12 ARFCN-ValueEUTRA-r9
}
} OPTIONAL,
timeSpent-r12 INTEGER (0..4095)
}
WLAN-OffloadConfig-r12 ::= SEQUENCE {
thresholdRSRP-r12 SEQUENCE {
thresholdRSRP-Low-r12 RSRP-Range,
thresholdRSRP-High-r12 RSRP-Range
} OPTIONAL, -- Need OR
thresholdRSRQ-r12 SEQUENCE {
thresholdRSRQ-Low-r12 RSRQ-Range,
thresholdRSRQ-High-r12 RSRQ-Range
} OPTIONAL, -- Need OR
thresholdChannelUtilization-r12 SEQUENCE {
thresholdChannelUtilizationLow-r12 INTEGER (0..255),
thresholdChannelUtilizationHigh-r12 INTEGER (0..255)
} OPTIONAL, -- Need OR
thresholdBackhaul-Bandwidth-r12 SEQUENCE {
thresholdBackhaulDL-BandwidthLow-r12 WLAN-backhaulRate,
thresholdBackhaulDL-BandwidthHigh-r12 WLAN-backhaulRate,
thresholdBackhaulUL-BandwidthLow-r12 WLAN-backhaulRate,
thresholdBackhaulUL-BandwidthHigh-r12 WLAN-backhaulRate
} OPTIONAL, -- Need OR
thresholdBeaconRSSI-r12 SEQUENCE {
thresholdBeaconRSSI-Low-r12 INTEGER (0..255),
thresholdBeaconRSSI-High-r12 INTEGER (0..255)
} OPTIONAL, -- Need OR
offloadPreferenceIndicator-r12 BIT STRING (SIZE (16)) OPTIONAL, -- Need OR
t-SteeringWLAN-r12 T-Reselection,
...
}
WLAN-backhaulRate ::= ENUMERATED
{r0, r2, r4, r8, r16, r32, r64, r128, r256, r512,
r1024, r2048, r4096, r8192, r16384, r32768, r65536, r131072,
r262144, r524288, r1048576, r2097152, r4194304, r8388608,
r16777216, r33554432, r67108864, r134217728, r268435456,
r536870912, r1073741824, r2147483648, r4294967296}
MBMS-NotificationConfig-r9 ::= SEQUENCE {
notificationRepetitionCoeff-r9 ENUMERATED {n2, n4},
notificationOffset-r9 INTEGER (0..10),
@ -5247,12 +5654,20 @@ MBSFN-SubframeConfig ::= SEQUENCE {
PMCH-InfoList-r9 ::= SEQUENCE (SIZE (0..maxPMCH-PerMBSFN)) OF PMCH-Info-r9
PMCH-InfoListExt-r12 ::= SEQUENCE (SIZE (0..maxPMCH-PerMBSFN)) OF PMCH-InfoExt-r12
PMCH-Info-r9 ::= SEQUENCE {
pmch-Config-r9 PMCH-Config-r9,
mbms-SessionInfoList-r9 MBMS-SessionInfoList-r9,
...
}
PMCH-InfoExt-r12 ::= SEQUENCE {
pmch-Config-r12 PMCH-Config-r12,
mbms-SessionInfoList-r12 MBMS-SessionInfoList-r9,
...
}
MBMS-SessionInfoList-r9 ::= SEQUENCE (SIZE (0..maxSessionPerPMCH)) OF MBMS-SessionInfo-r9
MBMS-SessionInfo-r9 ::= SEQUENCE {
@ -5270,6 +5685,14 @@ PMCH-Config-r9 ::= SEQUENCE {
...
}
PMCH-Config-r12 ::= SEQUENCE {
sf-AllocEnd-r12 INTEGER (0..1535),
dataMCS-r12 INTEGER (0..28),
mch-SchedulingPeriod-r12 ENUMERATED {
rf4, rf8, rf16, rf32, rf64, rf128, rf256, rf512, rf1024},
...
}
TMGI-r9 ::= SEQUENCE {
plmn-Id-r9 CHOICE {
plmn-Index-r9 INTEGER (1..maxPLMN-r11),
@ -5279,6 +5702,7 @@ TMGI-r9 ::= SEQUENCE {
}
maxBandComb-r10 INTEGER ::= 128 -- Maximum number of band combinations.
maxBandComb-r11 INTEGER ::= 256 -- Maximum number of additional band combinations.
maxBands INTEGER ::= 64 -- Maximum number of bands listed in EUTRA UE caps
@ -5288,6 +5712,7 @@ maxBandwidthCombSet-r10 INTEGER ::= 32 -- Maximum number of bandwidth combinati
maxCDMA-BandClass INTEGER ::= 32 -- Maximum value of the CDMA band classes
maxCellBlack INTEGER ::= 16 -- Maximum number of blacklisted physical cell identity
-- ranges listed in SIB type 4 and 5
maxCellHistory-r12 INTEGER ::= 16 -- Maximum number of visited EUTRA cells reported
maxCellInfoGERAN-r9 INTEGER ::= 32 -- Maximum number of GERAN cells for which system in-
-- formation can be provided as redirection assistance
maxCellInfoUTRA-r9 INTEGER ::= 16 -- Maximum number of UTRA cells for which system
@ -5295,6 +5720,8 @@ maxCellInfoUTRA-r9 INTEGER ::= 16 -- Maximum number of UTRA cells for which sy
-- assistance
maxCSI-IM-r11 INTEGER ::= 3 -- Maximum number of CSI-IM configurations
-- (per carrier frequency)
maxCSI-IM-r12 INTEGER ::= 4 -- Maximum number of CSI-IM configurations
-- (per carrier frequency)
maxCSI-Proc-r11 INTEGER ::= 4 -- Maximum number of CSI RS processes (per carrier
-- frequency)
maxCSI-RS-NZP-r11 INTEGER ::= 3 -- Maximum number of CSI RS resource
@ -5372,6 +5799,7 @@ maxSubframePatternIDC-r11 INTEGER ::= 8 -- Maximum number of subframe reservatio
-- E-UTRAN for use.
maxUTRA-FDD-Carrier INTEGER ::= 16 -- Maximum number of UTRA FDD carrier frequencies
maxUTRA-TDD-Carrier INTEGER ::= 16 -- Maximum number of UTRA TDD carrier frequencies
maxWLAN-Id-r12 INTEGER ::= 16 -- Maximum number of WLAN identifiers
END

View File

@ -1,4 +1,4 @@
-- 3GPP TS 36.331 V11.8.0 (2014-06)
-- 3GPP TS 36.331 V12.3.0 (2014-09)
--
EUTRA-UE-Variables DEFINITIONS AUTOMATIC TAGS ::=
@ -33,7 +33,9 @@ IMPORTS
ReportConfigToAddModList,
RLF-Report-r9,
RSRP-Range,
TargetMBSFN-AreaList-r12,
TraceReference-r10,
VisitedCellInfoList-r12,
maxCellMeas,
maxMeasId
FROM EUTRA-RRC-Definitions;
@ -58,6 +60,14 @@ VarLogMeasConfig-r11 ::= SEQUENCE {
loggingInterval-r10 LoggingInterval-r10
}
VarLogMeasConfig-r12 ::= SEQUENCE {
areaConfiguration-r10 AreaConfiguration-r10 OPTIONAL,
areaConfiguration-v1130 AreaConfiguration-v1130 OPTIONAL,
loggingDuration-r10 LoggingDuration-r10,
loggingInterval-r10 LoggingInterval-r10,
targetMBSFN-AreaList-r12 TargetMBSFN-AreaList-r12 OPTIONAL
}
VarLogMeasReport-r10 ::= SEQUENCE {
traceReference-r10 TraceReference-r10,
@ -122,6 +132,8 @@ CellsTriggeredList ::= SEQUENCE (SIZE (1..maxCellMeas)) OF CHOICE {
},
physCellIdCDMA2000 PhysCellIdCDMA2000
}
VarMobilityHistoryReport-r12 ::= VisitedCellInfoList-r12
VarRLF-Report-r10 ::= SEQUENCE {
rlf-Report-r10 RLF-Report-r9,

View File

@ -16,6 +16,7 @@ SupportedBandUTRA-FDD
T-PollRetransmit
T-Reordering
T-StatusProhibit
WLAN-backhaulRate
#.EXPORTS
HandoverCommand
@ -59,6 +60,10 @@ VarRLF-Report-r10
VarLogMeasConfig-r11
VarLogMeasReport-r11
VarRLF-Report-r11
VarLogMeasConfig-r12
VarMobilityHistoryReport-r12
UERadioPagingInformation
UERadioPagingInformation-r12-IEs
#.MAKE_ENUM
RAT-Type TYPE_PREFIX
@ -232,6 +237,16 @@ if(ue_cap_tvb){
proto_tree_add_bits_item(subtree, hf_lte_rrc_interBandTDD_CA_WithDifferentConfig_bit2, inter_band_tdd_ca_tvb, 1, 1, ENC_BIG_ENDIAN);
}
#.FN_BODY PhyLayerParameters-v12xy/tdd-FDD-CA-PCellDuplex-r12 VAL_PTR = &pcellduplex_tvb
tvbuff_t *pcellduplex_tvb=NULL;
proto_tree *subtree;
%(DEFAULT_BODY)s
if (pcellduplex_tvb) {
subtree = proto_item_add_subtree(actx->created_item, ett_lte_rrc_tdd_FDD_CA_PCellDuplex_r12);
proto_tree_add_bits_item(subtree, hf_lte_rrc_tdd_FDD_CA_PCellDuplex_r12_bit1, pcellduplex_tvb, 0, 1, ENC_BIG_ENDIAN);
proto_tree_add_bits_item(subtree, hf_lte_rrc_tdd_FDD_CA_PCellDuplex_r12_bit2, pcellduplex_tvb, 1, 1, ENC_BIG_ENDIAN);
}
#.FN_BODY Handover
/* Initialise to invalid value */
private_data_set_rat_target_type(actx, 0xFF);
@ -691,6 +706,21 @@ SystemInformationBlockType16-r11/timeInfo-r11/timeInfoUTC-r11 TYPE = FT_UINT64
proto_tree_add_time(subtree, hf_lte_rrc_utc_time, tvb, old_offset>>3, (old_offset&0x07) ? 6 : 5, &ts);
proto_tree_add_time(subtree, hf_lte_rrc_local_time, tvb, old_offset>>3, (old_offset&0x07) ? 6 : 5, &ts);
#.TYPE_ATTR
WLAN-Id-r12/wlan-Identifiers/ssid TYPE=FT_STRING DISPLAY=STR_ASCII
#.FN_BODY WLAN-Id-r12/wlan-Identifiers/ssid VAL_PTR=&ssid_tvb HF_INDEX=-1
tvbuff_t *ssid_tvb = NULL;
%(DEFAULT_BODY)s
actx->created_item = proto_tree_add_item(tree, hf_index, ssid_tvb, 0, -1, ENC_ASCII|ENC_NA);
#.TYPE_ATTR
WLAN-Id-r12/wlan-Identifiers/bssid TYPE=FT_ETHER
#.TYPE_ATTR
WLAN-Id-r12/wlan-Identifiers/hessid TYPE=FT_ETHER
#.FN_BODY RRCConnectionReject-r8-IEs/waitTime
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, "s");
@ -813,6 +843,14 @@ CQI-ReportConfigSCell-r10/nomPDSCH-RS-EPRE-Offset-r10 STRINGS=VALS(lte_rrc_nomPD
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, "dB");
#.FN_BODY SPS-ConfigUL/setup/eag_1/p0-Persistent-SubframeSet2-r12/p0-NominalPUSCH-Persistent-SubframeSet2-r12
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, "dBm");
#.FN_BODY SPS-ConfigUL/setup/eag_1/p0-Persistent-SubframeSet2-r12/p0-UE-PUSCH-Persistent-SubframeSet2-r12
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, "dB");
#.TYPE_ATTR
UplinkPowerControlCommon/deltaPreambleMsg3 STRINGS=VALS(lte_rrc_deltaPreambleMsg3_vals)
@ -839,6 +877,14 @@ UplinkPowerControlCommonSCell-v11x0/deltaPreambleMsg3-r11 STRINGS=VALS(lte_rrc_d
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, "dB");
#.FN_BODY UplinkPowerControlDedicated-v12x0/set2PowerControlParameter/setup/p0-NominalPUSCH-SubframeSet2-r12
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, "dBm");
#.FN_BODY UplinkPowerControlDedicated-v12x0/set2PowerControlParameter/setup/p0-UE-PUSCH-SubframeSet2-r12
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, "dB");
#.FN_BODY UplinkPowerControlDedicatedSCell-r10/p0-UE-PUSCH-r10
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, "dB");
@ -1009,6 +1055,10 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(&lte_rrc_duration_val)
col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB16 ");
#.FN_HDR SystemInformationBlockType17-r12
col_append_str(actx->pinfo->cinfo, COL_INFO, "SIB17 ");
#.FN_HDR MBSFNAreaConfiguration-r9
col_append_str(actx->pinfo->cinfo, COL_INFO, "MBSFNAreaConfiguration-r9");
@ -1250,15 +1300,22 @@ 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 */
if (drb_mapping->pdcp_sn_size_present) {
/* Also tell RLC how many PDCP sequence number bits and wether 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 */
@ -1287,6 +1344,22 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(&lte_rrc_duration_val)
}
}
#.FN_BODY UL-AM-RLC-r12/extended-RLC-LI-Field-r12 VAL_PTR=&ext_li_field
gboolean ext_li_field;
drb_mapping_t *mapping = private_data_get_drb_mapping(actx);
%(DEFAULT_BODY)s
if (mapping != NULL) {
mapping->rlc_ul_ext_li_field = ext_li_field;
}
#.FN_BODY DL-AM-RLC-r12/extended-RLC-LI-Field-r12 VAL_PTR=&ext_li_field
gboolean ext_li_field;
drb_mapping_t *mapping = private_data_get_drb_mapping(actx);
%(DEFAULT_BODY)s
if (mapping != NULL) {
mapping->rlc_dl_ext_li_field = ext_li_field;
}
#.FN_BODY DRB-ToAddMod/logicalChannelIdentity VAL_PTR=&value
guint32 value;
drb_mapping_t *mapping = private_data_get_drb_mapping(actx);
@ -1361,6 +1434,9 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(&lte_rrc_duration_val)
/* Reset again */
private_data_set_ra_preambles(actx, 0);
#.FN_BODY RACH-ConfigCommon-v12xy/txFailParams-r12/connEstFailOffset-r12
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, "dB");
#.FN_BODY DRX-Config/setup/onDurationTimer VAL_PTR=&value
guint32 value;
@ -1645,3 +1721,18 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(&lte_rrc_duration_val)
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [cause=%%s]",
val_to_str(value, lte_rrc_ReleaseCause_vals, "Unknown"));
#.FN_BODY VisitedCellInfo-r12/timeSpent-r12
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, "s");
#.FN_BODY WLAN-OffloadConfig-r12/thresholdChannelUtilization-r12/thresholdChannelUtilizationLow-r12
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " (BSS load)");
#.FN_BODY WLAN-OffloadConfig-r12/thresholdChannelUtilization-r12/thresholdChannelUtilizationHigh-r12
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " (BSS load)");
#.FN_BODY WLAN-backhaulRate
%(DEFAULT_BODY)s
proto_item_append_text(actx->created_item, " Kbps");

View File

@ -1,7 +1,7 @@
/* packet-lte-rrc-template.c
* Routines for Evolved Universal Terrestrial Radio Access (E-UTRA);
* Radio Resource Control (RRC) protocol specification
* (3GPP TS 36.331 V11.8.0 Release 11) packet dissection
* (3GPP TS 36.331 V12.3.0 Release 12) packet dissection
* Copyright 2008, Vincent Helfre
* Copyright 2009-2014, Pascal Quantin
*
@ -188,6 +188,8 @@ static int hf_lte_rrc_warningMessageSegment_nb_pages = -1;
static int hf_lte_rrc_warningMessageSegment_decoded_page = -1;
static int hf_lte_rrc_interBandTDD_CA_WithDifferentConfig_bit1 = -1;
static int hf_lte_rrc_interBandTDD_CA_WithDifferentConfig_bit2 = -1;
static int hf_lte_rrc_tdd_FDD_CA_PCellDuplex_r12_bit1 = -1;
static int hf_lte_rrc_tdd_FDD_CA_PCellDuplex_r12_bit2 = -1;
static int hf_lte_rrc_sr_config_periodicity = -1;
static int hf_lte_rrc_sr_config_subframe_offset = -1;
static int hf_lte_rrc_cdma_time = -1;
@ -214,6 +216,7 @@ static gint ett_lte_rrc_warningType = -1;
static gint ett_lte_rrc_dataCodingScheme = -1;
static gint ett_lte_rrc_warningMessageSegment = -1;
static gint ett_lte_rrc_interBandTDD_CA_WithDifferentConfig = -1;
static gint ett_lte_rrc_tdd_FDD_CA_PCellDuplex_r12 = -1;
static gint ett_lte_rrc_sr_ConfigIndex = -1;
static expert_field ei_lte_rrc_number_pages_le15 = EI_INIT;
@ -1828,6 +1831,16 @@ static const true_false_string lte_rrc_interBandTDD_CA_WithDifferentConfig_bit2_
"SCell DL subframes are neither superset nor subset of PCell by SIB1 configuration - Not supported",
};
static const true_false_string lte_rrc_tdd_FDD_CA_PCellDuplex_r12_bit1_val = {
"TDD PCell - Supported",
"TDD PCell - Not supported"
};
static const true_false_string lte_rrc_tdd_FDD_CA_PCellDuplex_r12_bit2_val = {
"FDD PCell - Supported",
"FDD PCell - Not supported"
};
/*****************************************************************************/
/* Packet private data */
/* For this dissector, all access to actx->private_data should be made */
@ -2876,6 +2889,14 @@ void proto_register_lte_rrc(void) {
{ "Bit 2", "lte-rrc.interBandTDD_CA_WithDifferentConfig.bit2",
FT_BOOLEAN, BASE_NONE, TFS(&lte_rrc_interBandTDD_CA_WithDifferentConfig_bit2_val), 0,
NULL, HFILL }},
{ &hf_lte_rrc_tdd_FDD_CA_PCellDuplex_r12_bit1,
{ "Bit 1", "lte-rrc.tdd_FDD_CA_PCellDuplex_r12.bit1",
FT_BOOLEAN, BASE_NONE, TFS(&lte_rrc_tdd_FDD_CA_PCellDuplex_r12_bit1_val), 0,
NULL, HFILL }},
{ &hf_lte_rrc_tdd_FDD_CA_PCellDuplex_r12_bit2,
{ "Bit 2", "lte-rrc.tdd_FDD_CA_PCellDuplex_r12.bit2",
FT_BOOLEAN, BASE_NONE, TFS(&lte_rrc_tdd_FDD_CA_PCellDuplex_r12_bit2_val), 0,
NULL, HFILL }},
{ &hf_lte_rrc_sr_config_periodicity,
{ "Periodicity", "lte-rrc.sr_Periodicity",
FT_UINT16, BASE_DEC, NULL, 0x0,
@ -2921,6 +2942,7 @@ void proto_register_lte_rrc(void) {
&ett_lte_rrc_dataCodingScheme,
&ett_lte_rrc_warningMessageSegment,
&ett_lte_rrc_interBandTDD_CA_WithDifferentConfig,
&ett_lte_rrc_tdd_FDD_CA_PCellDuplex_r12,
&ett_lte_rrc_sr_ConfigIndex
};

File diff suppressed because it is too large Load Diff