diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-11-17 15:36:53 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-11-17 15:36:53 +0000 |
| commit | 3ffa66319e343e268a201785d12d4f5becf0c308 (patch) | |
| tree | 2df4b575a6f835c106572151c97538c387335c86 | |
| parent | e65f69766a702d82506fff5f339b7f46c5dcf492 (diff) | |
- Update to 3GPP TS 25.413 V9.4.0 (2010-09).
- Fill the value_strings.
svn path=/trunk/; revision=34928
| -rw-r--r-- | asn1/rnsap/RNSAP-CommonDataTypes.asn | 2 | ||||
| -rw-r--r-- | asn1/rnsap/RNSAP-Constants.asn | 212 | ||||
| -rw-r--r-- | asn1/rnsap/RNSAP-Containers.asn | 1 | ||||
| -rw-r--r-- | asn1/rnsap/RNSAP-IEs.asn | 80 | ||||
| -rw-r--r-- | asn1/rnsap/RNSAP-PDU-Contents.asn | 167 | ||||
| -rw-r--r-- | asn1/rnsap/RNSAP-PDU-Descriptions.asn | 2 | ||||
| -rw-r--r-- | asn1/rnsap/rnsap.cnf | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-rnsap.c | 554 |
8 files changed, 926 insertions, 93 deletions
diff --git a/asn1/rnsap/RNSAP-CommonDataTypes.asn b/asn1/rnsap/RNSAP-CommonDataTypes.asn index 7def319e98..6e5a27d876 100644 --- a/asn1/rnsap/RNSAP-CommonDataTypes.asn +++ b/asn1/rnsap/RNSAP-CommonDataTypes.asn @@ -1,6 +1,6 @@ -- RNSAP-CommonDataTypes.asn -- --- Taken from 3GPP TS 25.423 V9.2.3 (2010-03) +-- Taken from 3GPP TS 25.423 V9.4.0 (2010-09) -- http://www.3gpp.org/ftp/Specs/archive/25_series/25.423/25423-790.zip/25423-790.DOC -- -- 9.3.5 Common Definitions diff --git a/asn1/rnsap/RNSAP-Constants.asn b/asn1/rnsap/RNSAP-Constants.asn index 64f40211a5..e750917ab7 100644 --- a/asn1/rnsap/RNSAP-Constants.asn +++ b/asn1/rnsap/RNSAP-Constants.asn @@ -1,6 +1,6 @@ -- RNSAP-Constants.asn -- --- Taken from 3GPP TS 25.423 V9.2.3 (2010-03) +-- Taken from 3GPP TS 25.423 V9.4.0 (2010-09) -- http://www.3gpp.org/ftp/Specs/archive/25_series/25.423/25423-790.zip/25423-790.DOC -- -- 9.3.6 Constant Definitions @@ -80,6 +80,8 @@ id-iurDeactivateTrace ProcedureCode ::= 43 id-iurInvokeTrace ProcedureCode ::= 44 id-mBMSAttach ProcedureCode ::= 45 id-mBMSDetach ProcedureCode ::= 46 +--WS extension +id-Not-used-47 ProcedureCode ::= 47 id-directInformationTransfer ProcedureCode ::= 48 id-enhancedRelocation ProcedureCode ::= 49 id-enhancedRelocationCancel ProcedureCode ::= 50 @@ -298,6 +300,8 @@ id-MessageStructure ProtocolIE-ID ::= 57 id-MeasurementID ProtocolIE-ID ::= 93 id-Neighbouring-GSM-CellInformation ProtocolIE-ID ::= 13 id-Neighbouring-UMTS-CellInformationItem ProtocolIE-ID ::= 95 +--WS extension +id-Unknown-305 ProtocolIE-ID ::= 304 id-NRT-Load-Information-Value ProtocolIE-ID ::= 305 id-NRT-Load-Information-Value-IncrDecrThres ProtocolIE-ID ::= 306 id-PagingArea-PagingRqst ProtocolIE-ID ::= 102 @@ -305,6 +309,8 @@ id-FACH-FlowControlInformation ProtocolIE-ID ::= 103 id-PartialReportingIndicator ProtocolIE-ID ::= 472 id-Permanent-NAS-UE-Identity ProtocolIE-ID ::= 17 id-PowerAdjustmentType ProtocolIE-ID ::= 107 +--WS extension +id-Unknown-108 ProtocolIE-ID ::= 108 id-RANAP-RelocationInformation ProtocolIE-ID ::= 109 id-RL-Information-PhyChReconfRqstFDD ProtocolIE-ID ::= 110 id-RL-Information-PhyChReconfRqstTDD ProtocolIE-ID ::= 111 @@ -363,13 +369,18 @@ id-SAI ProtocolIE-ID ::= 156 id-SRNC-ID ProtocolIE-ID ::= 157 id-SuccessfulRL-InformationResponse-RL-AdditionFailureFDD ProtocolIE-ID ::= 159 id-SuccessfulRL-InformationResponse-RL-SetupFailureFDD ProtocolIE-ID ::= 160 +--WS extension +id-Unknown-161 ProtocolIE-ID ::= 161 +id-Unknown-162 ProtocolIE-ID ::= 162 id-TransportBearerID ProtocolIE-ID ::= 163 id-TransportBearerRequestIndicator ProtocolIE-ID ::= 164 id-TransportLayerAddress ProtocolIE-ID ::= 165 id-TypeOfError ProtocolIE-ID ::= 140 id-UC-ID ProtocolIE-ID ::= 166 id-UL-CCTrCH-AddInformation-RL-ReconfPrepTDD ProtocolIE-ID ::= 167 +id-Unknown-168 ProtocolIE-ID ::= 168 id-UL-CCTrCH-InformationAddList-RL-ReconfPrepTDD ProtocolIE-ID ::= 169 +id-Unknown-170 ProtocolIE-ID ::= 170 id-UL-CCTrCH-InformationItem-RL-SetupRqstTDD ProtocolIE-ID ::= 171 id-UL-CCTrCH-InformationList-RL-SetupRqstTDD ProtocolIE-ID ::= 172 id-UL-CCTrCH-InformationListIE-PhyChReconfRqstTDD ProtocolIE-ID ::= 173 @@ -385,11 +396,20 @@ id-UL-DPCH-InformationItem-RL-SetupRspTDD ProtocolIE-ID ::= 182 id-UL-DPCH-InformationAddListIE-RL-ReconfReadyTDD ProtocolIE-ID ::= 183 id-UL-SIRTarget ProtocolIE-ID ::= 184 id-URA-Information ProtocolIE-ID ::= 185 +--WS extension +id-Unknown-186 ProtocolIE-ID ::= 186 +id-Unknown-187 ProtocolIE-ID ::= 187 id-UnsuccessfulRL-InformationResponse-RL-AdditionFailureFDD ProtocolIE-ID ::= 188 id-UnsuccessfulRL-InformationResponse-RL-SetupFailureFDD ProtocolIE-ID ::= 189 id-UnsuccessfulRL-InformationResponse-RL-SetupFailureTDD ProtocolIE-ID ::= 190 +--WS extension +id-Unknown-191 ProtocolIE-ID ::= 191 +id-Unknown-192 ProtocolIE-ID ::= 192 id-Active-Pattern-Sequence-Information ProtocolIE-ID ::= 193 id-AdjustmentRatio ProtocolIE-ID ::= 194 +--WS extension +id-Unknown-195 ProtocolIE-ID ::= 195 +id-Unknown-196 ProtocolIE-ID ::= 196 id-CauseLevel-RL-AdditionFailureFDD ProtocolIE-ID ::= 197 id-CauseLevel-RL-AdditionFailureTDD ProtocolIE-ID ::= 198 id-CauseLevel-RL-ReconfFailure ProtocolIE-ID ::= 199 @@ -419,11 +439,15 @@ id-Unused-ProtocolIE-ID-228 ProtocolIE-ID ::= 228 id-Unused-ProtocolIE-ID-324 ProtocolIE-ID ::= 324 id-Unused-ProtocolIE-ID-229 ProtocolIE-ID ::= 229 id-DSCHToBeAddedOrModifiedList-RL-ReconfReadyTDD ProtocolIE-ID ::= 230 +--WS extension +id-Unknown-231 ProtocolIE-ID ::= 231 id-Unused-ProtocolIE-ID-29 ProtocolIE-ID ::= 29 id-Unused-ProtocolIE-ID-225 ProtocolIE-ID ::= 225 id-GA-Cell ProtocolIE-ID ::= 232 id-GA-CellAdditionalShapes ProtocolIE-ID ::= 3 id-Unused-ProtocolIE-ID-246 ProtocolIE-ID ::= 246 +--WS extension +id-Unknown-254 ProtocolIE-ID ::= 254 id-Transmission-Gap-Pattern-Sequence-Information ProtocolIE-ID ::= 255 id-UL-CCTrCH-DeleteInformation-RL-ReconfPrepTDD ProtocolIE-ID ::= 256 id-UL-CCTrCH-ModifyInformation-RL-ReconfPrepTDD ProtocolIE-ID ::= 257 @@ -488,6 +512,8 @@ id-DL-DPCH-LCR-InformationItem-RL-AdditionRspTDD ProtocolIE-ID ::= 94 id-DSCH-LCR-InformationListIEs-RL-AdditionRspTDD ProtocolIE-ID ::= 96 id-USCH-LCR-InformationListIEs-RL-AdditionRspTDD ProtocolIE-ID ::= 97 id-UL-DPCH-LCR-InformationAddListIE-RL-ReconfReadyTDD ProtocolIE-ID ::= 98 +--WS extension +id-Unknown-99 ProtocolIE-ID ::= 99 id-UL-Timeslot-LCR-InformationModifyList-RL-ReconfReadyTDD ProtocolIE-ID ::= 100 id-DL-DPCH-LCR-InformationAddListIE-RL-ReconfReadyTDD ProtocolIE-ID ::= 101 id-DL-Timeslot-LCR-InformationModifyList-RL-ReconfReadyTDD ProtocolIE-ID ::= 104 @@ -508,6 +534,8 @@ id-TUTRANGPSMeasurementThresholdInformation ProtocolIE-ID ::= 241 id-UL-Timeslot-ISCP-Value ProtocolIE-ID ::= 242 id-UL-Timeslot-ISCP-Value-IncrDecrThres ProtocolIE-ID ::= 243 id-Rx-Timing-Deviation-Value-LCR ProtocolIE-ID ::= 293 +--WS extension +id-Unknown-294 ProtocolIE-ID ::= 294 id-DPC-Mode-Change-SupportIndicator ProtocolIE-ID ::= 19 id-Unused-ProtocolIE-ID-247 ProtocolIE-ID ::= 247 id-Unused-ProtocolIE-ID-295 ProtocolIE-ID ::= 295 @@ -527,7 +555,11 @@ id-CellCapabilityContainer-TDD-LCR ProtocolIE-ID ::= 302 id-RL-Specific-DCH-Info ProtocolIE-ID ::= 317 id-RL-ReconfigurationRequestFDD-RL-InformationList ProtocolIE-ID ::= 318 id-RL-ReconfigurationRequestFDD-RL-Information-IEs ProtocolIE-ID ::= 319 +--WS extension +id-Unknown-320 ProtocolIE-ID ::= 320 id-RL-ReconfigurationRequestTDD-RL-Information ProtocolIE-ID ::= 321 +--WS extension +id-Unknown-322 ProtocolIE-ID ::= 322 id-CommonTransportChannelResourcesInitialisationNotRequired ProtocolIE-ID ::= 250 id-DelayedActivation ProtocolIE-ID ::= 312 id-DelayedActivationList-RL-ActivationCmdFDD ProtocolIE-ID ::= 313 @@ -540,6 +572,9 @@ id-UL-SIR-Target-CCTrCH-LCR-InformationItem-RL-SetupRspTDD ProtocolIE-ID ::= id-PrimCCPCH-RSCP-DL-PC-RqstTDD ProtocolIE-ID ::= 451 id-HSDSCH-FDD-Information ProtocolIE-ID ::= 452 id-HSDSCH-FDD-Information-Response ProtocolIE-ID ::= 453 +--WS extension +id-Unknown-454 ProtocolIE-ID ::= 454 +id-Unknown-455 ProtocolIE-ID ::= 455 id-HSDSCH-FDD-Update-Information ProtocolIE-ID ::= 466 id-HSDSCH-Information-to-Modify ProtocolIE-ID ::= 456 id-HSDSCHMacdFlowSpecificInformationList-RL-PreemptRequiredInd ProtocolIE-ID ::= 516 @@ -547,16 +582,148 @@ id-HSDSCHMacdFlowSpecificInformationItem-RL-PreemptRequiredInd ProtocolIE-ID id-HSDSCH-RNTI ProtocolIE-ID ::= 457 id-HSDSCH-TDD-Information ProtocolIE-ID ::= 458 id-HSDSCH-TDD-Information-Response ProtocolIE-ID ::= 459 +--WS extension +id-Unknown-460 ProtocolIE-ID ::= 460 +id-Unknown-461 ProtocolIE-ID ::= 461 +id-Unknown-462 ProtocolIE-ID ::= 462 id-HSDSCH-TDD-Update-Information ProtocolIE-ID ::= 467 id-HSPDSCH-RL-ID ProtocolIE-ID ::= 463 id-HSDSCH-MACdFlows-to-Add ProtocolIE-ID ::= 531 id-HSDSCH-MACdFlows-to-Delete ProtocolIE-ID ::= 532 id-Angle-Of-Arrival-Value-LCR ProtocolIE-ID ::= 148 +--WS extension +id-Unknown-149 ProtocolIE-ID ::= 149 id-TrafficClass ProtocolIE-ID ::= 158 id-Unused-ProtocolIE-ID-248 ProtocolIE-ID ::= 248 id-Unused-ProtocolIE-ID-253 ProtocolIE-ID ::= 253 id-PDSCH-RL-ID ProtocolIE-ID ::= 323 id-TimeSlot-RL-SetupRspTDD ProtocolIE-ID ::= 325 +--WS extension +id-Unknown-326 ProtocolIE-ID ::= 326 +id-Unknown-327 ProtocolIE-ID ::= 327 +id-Unknown-328 ProtocolIE-ID ::= 328 +id-Unknown-329 ProtocolIE-ID ::= 329 +id-Unknown-330 ProtocolIE-ID ::= 330 +id-Unknown-331 ProtocolIE-ID ::= 331 +id-Unknown-332 ProtocolIE-ID ::= 332 +id-Unknown-333 ProtocolIE-ID ::= 333 +id-Unknown-334 ProtocolIE-ID ::= 334 +id-Unknown-335 ProtocolIE-ID ::= 335 +id-Unknown-336 ProtocolIE-ID ::= 336 +id-Unknown-337 ProtocolIE-ID ::= 337 +id-Unknown-338 ProtocolIE-ID ::= 338 +id-Unknown-339 ProtocolIE-ID ::= 339 +id-Unknown-340 ProtocolIE-ID ::= 340 +id-Unknown-341 ProtocolIE-ID ::= 341 +id-Unknown-342 ProtocolIE-ID ::= 342 +id-Unknown-343 ProtocolIE-ID ::= 343 +id-Unknown-344 ProtocolIE-ID ::= 344 +id-Unknown-345 ProtocolIE-ID ::= 345 +id-Unknown-346 ProtocolIE-ID ::= 346 +id-Unknown-347 ProtocolIE-ID ::= 347 +id-Unknown-348 ProtocolIE-ID ::= 348 +id-Unknown-349 ProtocolIE-ID ::= 349 +id-Unknown-350 ProtocolIE-ID ::= 350 +id-Unknown-351 ProtocolIE-ID ::= 351 +id-Unknown-352 ProtocolIE-ID ::= 352 +id-Unknown-353 ProtocolIE-ID ::= 353 +id-Unknown-354 ProtocolIE-ID ::= 354 +id-Unknown-355 ProtocolIE-ID ::= 355 +id-Unknown-356 ProtocolIE-ID ::= 356 +id-Unknown-357 ProtocolIE-ID ::= 357 +id-Unknown-358 ProtocolIE-ID ::= 358 +id-Unknown-359 ProtocolIE-ID ::= 359 +id-Unknown-360 ProtocolIE-ID ::= 360 +id-Unknown-361 ProtocolIE-ID ::= 361 +id-Unknown-362 ProtocolIE-ID ::= 362 +id-Unknown-363 ProtocolIE-ID ::= 363 +id-Unknown-364 ProtocolIE-ID ::= 364 +id-Unknown-365 ProtocolIE-ID ::= 365 +id-Unknown-366 ProtocolIE-ID ::= 366 +id-Unknown-367 ProtocolIE-ID ::= 367 +id-Unknown-368 ProtocolIE-ID ::= 368 +id-Unknown-369 ProtocolIE-ID ::= 369 +id-Unknown-370 ProtocolIE-ID ::= 370 +id-Unknown-371 ProtocolIE-ID ::= 371 +id-Unknown-372 ProtocolIE-ID ::= 372 +id-Unknown-373 ProtocolIE-ID ::= 373 +id-Unknown-374 ProtocolIE-ID ::= 374 +id-Unknown-375 ProtocolIE-ID ::= 375 +id-Unknown-376 ProtocolIE-ID ::= 376 +id-Unknown-377 ProtocolIE-ID ::= 377 +id-Unknown-378 ProtocolIE-ID ::= 378 +id-Unknown-379 ProtocolIE-ID ::= 379 +id-Unknown-380 ProtocolIE-ID ::= 380 +id-Unknown-381 ProtocolIE-ID ::= 381 +id-Unknown-382 ProtocolIE-ID ::= 382 +id-Unknown-383 ProtocolIE-ID ::= 383 +id-Unknown-384 ProtocolIE-ID ::= 384 +id-Unknown-385 ProtocolIE-ID ::= 385 +id-Unknown-386 ProtocolIE-ID ::= 386 +id-Unknown-387 ProtocolIE-ID ::= 387 +id-Unknown-388 ProtocolIE-ID ::= 388 +id-Unknown-389 ProtocolIE-ID ::= 389 +id-Unknown-390 ProtocolIE-ID ::= 390 +id-Unknown-391 ProtocolIE-ID ::= 391 +id-Unknown-392 ProtocolIE-ID ::= 392 +id-Unknown-393 ProtocolIE-ID ::= 393 +id-Unknown-394 ProtocolIE-ID ::= 394 +id-Unknown-395 ProtocolIE-ID ::= 395 +id-Unknown-396 ProtocolIE-ID ::= 396 +id-Unknown-397 ProtocolIE-ID ::= 397 +id-Unknown-398 ProtocolIE-ID ::= 398 +id-Unknown-399 ProtocolIE-ID ::= 399 +id-Unknown-400 ProtocolIE-ID ::= 400 +id-Unknown-401 ProtocolIE-ID ::= 401 +id-Unknown-402 ProtocolIE-ID ::= 402 +id-Unknown-403 ProtocolIE-ID ::= 403 +id-Unknown-404 ProtocolIE-ID ::= 404 +id-Unknown-405 ProtocolIE-ID ::= 405 +id-Unknown-406 ProtocolIE-ID ::= 406 +id-Unknown-407 ProtocolIE-ID ::= 407 +id-Unknown-408 ProtocolIE-ID ::= 408 +id-Unknown-409 ProtocolIE-ID ::= 409 +id-Unknown-410 ProtocolIE-ID ::= 410 +id-Unknown-411 ProtocolIE-ID ::= 411 +id-Unknown-412 ProtocolIE-ID ::= 412 +id-Unknown-413 ProtocolIE-ID ::= 413 +id-Unknown-414 ProtocolIE-ID ::= 414 +id-Unknown-415 ProtocolIE-ID ::= 415 +id-Unknown-416 ProtocolIE-ID ::= 416 +id-Unknown-417 ProtocolIE-ID ::= 417 +id-Unknown-418 ProtocolIE-ID ::= 418 +id-Unknown-419 ProtocolIE-ID ::= 419 +id-Unknown-420 ProtocolIE-ID ::= 420 +id-Unknown-421 ProtocolIE-ID ::= 421 +id-Unknown-422 ProtocolIE-ID ::= 422 +id-Unknown-423 ProtocolIE-ID ::= 423 +id-Unknown-424 ProtocolIE-ID ::= 424 +id-Unknown-425 ProtocolIE-ID ::= 425 +id-Unknown-426 ProtocolIE-ID ::= 426 +id-Unknown-427 ProtocolIE-ID ::= 427 +id-Unknown-428 ProtocolIE-ID ::= 428 +id-Unknown-429 ProtocolIE-ID ::= 429 +id-Unknown-430 ProtocolIE-ID ::= 430 +id-Unknown-431 ProtocolIE-ID ::= 431 +id-Unknown-432 ProtocolIE-ID ::= 432 +id-Unknown-433 ProtocolIE-ID ::= 433 +id-Unknown-434 ProtocolIE-ID ::= 434 +id-Unknown-435 ProtocolIE-ID ::= 435 +id-Unknown-436 ProtocolIE-ID ::= 436 +id-Unknown-437 ProtocolIE-ID ::= 437 +id-Unknown-438 ProtocolIE-ID ::= 438 +id-Unknown-439 ProtocolIE-ID ::= 439 +id-Unknown-440 ProtocolIE-ID ::= 440 +id-Unknown-441 ProtocolIE-ID ::= 441 +id-Unknown-442 ProtocolIE-ID ::= 442 +id-Unknown-443 ProtocolIE-ID ::= 443 +id-Unknown-444 ProtocolIE-ID ::= 444 +id-Unknown-445 ProtocolIE-ID ::= 445 +id-Unknown-446 ProtocolIE-ID ::= 446 +id-Unknown-447 ProtocolIE-ID ::= 447 +id-Unknown-448 ProtocolIE-ID ::= 448 +id-Unknown-449 ProtocolIE-ID ::= 449 +id-Unknown-450 ProtocolIE-ID ::= 450 id-GERAN-Cell-Capability ProtocolIE-ID ::= 468 id-GERAN-Classmark ProtocolIE-ID ::= 469 id-DSCH-InitialWindowSize ProtocolIE-ID ::= 480 @@ -642,8 +809,14 @@ id-MBMS-Bearer-Service-List-InfEx-Rsp ProtocolIE-ID ::= 561 id-Active-MBMS-Bearer-ServiceFDD ProtocolIE-ID ::= 562 id-Active-MBMS-Bearer-ServiceTDD ProtocolIE-ID ::= 563 id-Old-URA-ID ProtocolIE-ID ::= 564 +--WS extension +id-Unknown-565 ProtocolIE-ID ::= 565 +id-Unknown-566 ProtocolIE-ID ::= 566 +id-Unknown-567 ProtocolIE-ID ::= 567 id-UE-State ProtocolIE-ID ::= 568 id-URA-ID ProtocolIE-ID ::= 569 +--WS extension +id-Unknown-570 ProtocolIE-ID ::= 570 id-HARQ-Preamble-Mode ProtocolIE-ID ::= 571 id-SynchronisationIndicator ProtocolIE-ID ::= 572 id-UL-DPDCHIndicatorEDCH ProtocolIE-ID ::= 573 @@ -747,7 +920,11 @@ id-Continuous-Packet-Connectivity-DTX-DRX-Information ProtocolIE-ID ::= 670 id-Continuous-Packet-Connectivity-HS-SCCH-Less-Information ProtocolIE-ID ::= 671 id-Continuous-Packet-Connectivity-HS-SCCH-Less-Information-Response ProtocolIE-ID ::= 672 id-CPC-Information ProtocolIE-ID ::= 673 +--WS extension +id-Unknown-674 ProtocolIE-ID ::= 674 id-MIMO-InformationResponse ProtocolIE-ID ::= 675 +--WS extension +id-Unknown-676 ProtocolIE-ID ::= 676 id-E-DCH-LCR-Information ProtocolIE-ID ::= 677 id-E-DCH-LCR-Information-Reconfig ProtocolIE-ID ::= 678 id-E-DCH-LCR-Information-Response ProtocolIE-ID ::= 679 @@ -758,17 +935,27 @@ id-Extended-RNC-ID ProtocolIE-ID ::= 683 id-SixtyfourQAM-DL-SupportIndicator ProtocolIE-ID ::= 684 id-Enhanced-FACH-Support-Indicator ProtocolIE-ID ::= 685 id-Enhanced-FACH-Information-ResponseFDD ProtocolIE-ID ::= 686 +--WS extension +id-Unknown-687 ProtocolIE-ID ::= 687 +id-Unknown-688 ProtocolIE-ID ::= 688 +id-Unknown-689 ProtocolIE-ID ::= 689 id-HSDSCH-MACdPDUSizeFormat ProtocolIE-ID ::= 690 id-MaximumMACdPDU-SizeExtended ProtocolIE-ID ::= 691 id-F-DPCH-SlotFormat ProtocolIE-ID ::= 692 id-F-DPCH-SlotFormatSupportRequest ProtocolIE-ID ::= 693 id-eDCH-MACdFlow-Retransmission-Timer-LCR ProtocolIE-ID ::= 694 id-Max-UE-DTX-Cycle ProtocolIE-ID ::= 695 +--WS extension +id-Unknown-696 ProtocolIE-ID ::= 696 +id-Unknown-697 ProtocolIE-ID ::= 697 +id-Unknown-698 ProtocolIE-ID ::= 698 id-GANSS-Common-Data ProtocolIE-ID ::= 699 id-GANSS-Information ProtocolIE-ID ::= 700 id-GANSS-Generic-Data ProtocolIE-ID ::= 701 id-TUTRANGANSSMeasurementThresholdInformation ProtocolIE-ID ::= 702 id-TUTRANGANSSMeasurementValueInformation ProtocolIE-ID ::= 703 +--WS extension +id-Unknown-704 ProtocolIE-ID ::= 704 id-Ext-Reference-E-TFCI-PO ProtocolIE-ID ::= 705 id-Ext-Max-Bits-MACe-PDU-non-scheduled ProtocolIE-ID ::= 706 id-HARQ-MemoryPartitioningInfoExtForMIMO ProtocolIE-ID ::= 707 @@ -832,6 +1019,8 @@ id-MBMS-Neighbouring-Cell-Information ProtocolIE-ID ::= 764 id-MBMS-RLC-Sequence-Number-Information ProtocolIE-ID ::= 765 id-RLC-Sequence-Number ProtocolIE-ID ::= 766 id-Neighbouring-E-UTRA-CellInformation ProtocolIE-ID ::= 767 +--WS extension +id-Unknown-768 ProtocolIE-ID ::= 768 id-MBSFN-Cluster-Identity ProtocolIE-ID ::= 769 id-MCCH-Configuration-Info ProtocolIE-ID ::= 770 id-MCCH-Message-List ProtocolIE-ID ::= 771 @@ -895,6 +1084,10 @@ id-UE-AggregateMaximumBitRate ProtocolIE-ID ::= 828 id-power-offset-for-S-CPICH-for-MIMO ProtocolIE-ID ::= 829 id-power-offset-for-S-CPICH-for-MIMO-Request-Indicator ProtocolIE-ID ::= 830 id-UE-SupportIndicatorExtension ProtocolIE-ID ::= 831 +--WS extension +id-Unknown-832 ProtocolIE-ID ::= 832 +id-Unknown-833 ProtocolIE-ID ::= 833 +id-Unknown-834 ProtocolIE-ID ::= 834 id-ActivationInformation ProtocolIE-ID ::= 835 id-CellPortionLCRID ProtocolIE-ID ::= 836 id-Additional-EDCH-Cell-Information-RL-Setup-Req ProtocolIE-ID ::= 837 @@ -906,6 +1099,15 @@ id-Additional-EDCH-Cell-Information-RL-Reconf-Req ProtocolIE-ID ::= 842 id-Additional-EDCH-Cell-Information-RL-Param-Upd ProtocolIE-ID ::= 843 id-Additional-EDCH-Preconfiguration-Information ProtocolIE-ID ::= 844 id-MulticellEDCH-Information ProtocolIE-ID ::= 845 +--WS extension +id-Unknown-846 ProtocolIE-ID ::= 846 +id-Unknown-847 ProtocolIE-ID ::= 847 +id-Unknown-848 ProtocolIE-ID ::= 848 +id-Unknown-849 ProtocolIE-ID ::= 849 +id-Unknown-850 ProtocolIE-ID ::= 850 +id-Unknown-851 ProtocolIE-ID ::= 851 +id-Unknown-852 ProtocolIE-ID ::= 852 +id-Unknown-853 ProtocolIE-ID ::= 853 id-Additional-EDCH-Cell-Information-ResponseRLReconf ProtocolIE-ID ::= 854 id-EDCH-Indicator ProtocolIE-ID ::= 855 id-DiversityMode ProtocolIE-ID ::= 856 @@ -922,7 +1124,13 @@ id-DCH-MeasurementType-Indicator ProtocolIE-ID ::= 866 id-Out-of-Sychronization-Window ProtocolIE-ID ::= 867 id-MulticellEDCH-RL-SpecificInformation ProtocolIE-ID ::= 868 id-DGNSS-ValidityPeriod ProtocolIE-ID ::= 869 -id-TS0-HS-PDSCH-Indication-LCR ProtocolIE-ID ::= 870 +id-TS0-HS-PDSCH-Indication-LCR ProtocolIE-ID ::= 870 id-UE-TS0-CapabilityLCR ProtocolIE-ID ::= 871 +id-Non-Serving-RL-Preconfig-Info ProtocolIE-ID ::= 872 +id-Non-Serving-RL-Preconfig-Setup ProtocolIE-ID ::= 873 +id-Non-Serving-RL-Preconfig-Removal ProtocolIE-ID ::= 874 +id-Additional-E-DCH-Non-Serving-RL-Preconfiguration-Setup ProtocolIE-ID ::= 875 +id-Additional-E-DCH-New-non-serving-RL-E-DCH-FDD-DL-Control-Channel-InfoList ProtocolIE-ID ::= 876 +id-CellListValidityIndicator ProtocolIE-ID ::= 877 END diff --git a/asn1/rnsap/RNSAP-Containers.asn b/asn1/rnsap/RNSAP-Containers.asn index 0bf06f164b..fb74171a34 100644 --- a/asn1/rnsap/RNSAP-Containers.asn +++ b/asn1/rnsap/RNSAP-Containers.asn @@ -202,3 +202,4 @@ PrivateIE-Field {RNSAP-PRIVATE-IES : IesSetParam} ::= SEQUENCE { } END + diff --git a/asn1/rnsap/RNSAP-IEs.asn b/asn1/rnsap/RNSAP-IEs.asn index d1eb2ff526..6eaca31fd4 100644 --- a/asn1/rnsap/RNSAP-IEs.asn +++ b/asn1/rnsap/RNSAP-IEs.asn @@ -1,6 +1,6 @@ -- RNSAP-IEs.asn -- --- Taken from 3GPP TS 25.423 V9.2.3 (2010-03) +-- Taken from 3GPP TS 25.423 V9.4.0 (2010-09) -- http://www.3gpp.org/ftp/Specs/archive/25_series/25.423/25423-790.zip/25423-790.DOC -- -- 9.3.4 Information Element Definitions @@ -317,8 +317,11 @@ IMPORTS id-DGNSS-ValidityPeriod, id-UE-AggregateMaximumBitRate-Enforcement-Indicator, id-Out-of-Sychronization-Window, - id-MulticellEDCH-RL-SpecificInformation - + id-MulticellEDCH-RL-SpecificInformation, + id-Continuous-Packet-Connectivity-DTX-DRX-Information, + id-Additional-E-DCH-Non-Serving-RL-Preconfiguration-Setup, + id-Additional-E-DCH-New-non-serving-RL-E-DCH-FDD-DL-Control-Channel-InfoList, + id-CellListValidityIndicator @@ -1065,6 +1068,12 @@ Cell-Capacity-Class-Value ::= SEQUENCE { CellIndividualOffset ::= INTEGER (-20..20) +CellListValidityIndicator ::= ENUMERATED { + ignoreSecondaryServingCellList, + ignoreDualBandSecondaryServingCellList, + ignoreBoth +} + CellParameterID ::= INTEGER (0..127,...) CellPortionID ::= INTEGER (0..63,...) @@ -2356,7 +2365,7 @@ EDCH-FDD-Information-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { { ID id-E-DCH-PowerOffset-for-SchedulingInfo CRITICALITY ignore EXTENSION E-DCH-PowerOffset-for-SchedulingInfo PRESENCE optional}| { ID id-SixteenQAM-UL-Operation-Indicator CRITICALITY reject EXTENSION SixteenQAM-UL-Operation-Indicator PRESENCE optional}| { ID id-E-AGCH-Table-Choice CRITICALITY ignore EXTENSION E-AGCH-Table-Choice PRESENCE conditional}, - -- The IE shall be present if the SixteenQAM UL Operation Indicator IE is set to “Activate”– + -- The IE shall be present if the SixteenQAM UL Operation Indicator IE is set to “Activate”-- ... } @@ -2405,7 +2414,7 @@ EDCH-FDD-Information-To-Modify-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { { ID id-E-DCH-MACdPDUSizeFormat CRITICALITY reject EXTENSION E-DCH-MACdPDUSizeFormat PRESENCE optional}| { ID id-E-DCH-DL-Control-Channel-Grant-Information CRITICALITY ignore EXTENSION E-DCH-DL-Control-Channel-Grant-Information PRESENCE optional}| { ID id-E-AGCH-Table-Choice CRITICALITY ignore EXTENSION E-AGCH-Table-Choice PRESENCE conditional}, --- The IE shall be present if the SixteenQAM UL Operation Indicator IE is set to “Activate”– +-- The IE shall be present if the SixteenQAM UL Operation Indicator IE is set to “Activate”-- ... } E-DCH-FDD-Update-Information ::= SEQUENCE { @@ -3647,7 +3656,7 @@ FDD-DCHs-to-ModifySpecificItem-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { } FDD-DL-ChannelisationCodeNumber ::= INTEGER (0..511) --- According to the mapping in [27]. The maximum value is equal to the DL spreading factor -1– +-- According to the mapping in [27]. The maximum value is equal to the DL spreading factor -1-- FDD-DL-CodeInformation ::= SEQUENCE (SIZE (1..maxNrOfDL-Codes)) OF FDD-DL-CodeInformationItem @@ -4737,12 +4746,12 @@ GeographicalCoordinate-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { } GERAN-Cell-Capability ::= BIT STRING (SIZE (16)) --- First bit: A/Gb mode – +-- First bit: A/Gb mode -- -- Second bit: Iu mode -- -- Note: undefined bits are considered as a spare bit and spare bits shall be set to 0 by the transmitter and shall be ignored by the receiver. – GERAN-Classmark ::= OCTET STRING - -- GERAN Classmark as defined in (38) – + -- GERAN Classmark as defined in (38) -- GERAN-SI-Type ::= CHOICE { sI GERAN-SystemInfo, @@ -5440,7 +5449,8 @@ HS-DSCH-serving-cell-change-information ::= SEQUENCE { } HS-DSCH-serving-cell-change-information-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { -{ ID id-Continuous-Packet-Connectivity-HS-SCCH-Less-Information CRITICALITY reject EXTENSION Continuous-Packet-Connectivity-HS-SCCH-Less-Information PRESENCE optional}, +{ ID id-Continuous-Packet-Connectivity-HS-SCCH-Less-Information CRITICALITY reject EXTENSION Continuous-Packet-Connectivity-HS-SCCH-Less-Information PRESENCE optional}| +{ ID id-Continuous-Packet-Connectivity-DTX-DRX-Information CRITICALITY reject EXTENSION Continuous-Packet-Connectivity-DTX-DRX-Information PRESENCE optional}, ... } @@ -6918,8 +6928,9 @@ Neighbouring-FDD-CellInformationItem-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { { ID id-Multiple-PLMN-List CRITICALITY ignore EXTENSION Multiple-PLMN-List PRESENCE optional }| { ID id-Secondary-Serving-Cell-List CRITICALITY ignore EXTENSION Secondary-Serving-Cell-List PRESENCE optional }| { ID id-Dual-Band-Secondary-Serving-Cell-List CRITICALITY ignore EXTENSION Secondary-Serving-Cell-List PRESENCE optional }| --- This IE shall be present if the the x-th bit Dual Band Support Indicator in the Cell Capability Container FDD IE is set to the value “1”. -{ ID id-CellCapabilityContainerExtension-FDD CRITICALITY ignore EXTENSION CellCapabilityContainerExtension-FDD PRESENCE optional }, +-- This IE shall be present if the twenty-eighth bit Dual Band Support Indicator in the Cell Capability Container FDD IE is set to the value “1”. + { ID id-CellCapabilityContainerExtension-FDD CRITICALITY ignore EXTENSION CellCapabilityContainerExtension-FDD PRESENCE optional }| + { ID id-CellListValidityIndicator CRITICALITY ignore EXTENSION CellListValidityIndicator PRESENCE optional }, ... } @@ -7116,6 +7127,52 @@ NumHS-SCCH-Codes ::= INTEGER (1..maxNrOfHSSCCHCodes) NoOfTargetCellHS-SCCH-Order::= INTEGER (1..30) +Non-Serving-RL-Preconfig-Setup ::= SEQUENCE { + new-non-serving-RL-selection New-non-serving-RL-setup-selection, + iE-Extensions ProtocolExtensionContainer { {Non-Serving-RL-Preconfig-Setup-ExtIEs} } OPTIONAL, + ... +} + +Non-Serving-RL-Preconfig-Setup-ExtIEs RNSAP-PROTOCOL-EXTENSION::= { + {ID id-Additional-E-DCH-Non-Serving-RL-Preconfiguration-Setup CRITICALITY ignore EXTENSION Additional-E-DCH-Non-Serving-RL-Preconfiguration-Setup PRESENCE optional }, +... +} + +Additional-E-DCH-Non-Serving-RL-Preconfiguration-Setup ::= NULL + +New-non-serving-RL-setup-selection ::= CHOICE { + new-Serving-RL-in-DRNS NULL, + new-Serving-RL-Not-in-DRNS NULL, + new-Serving-RL-in-or-Not-in-DRNS NULL, + ... +} + + +Non-Serving-RL-Preconfig-Info ::= SEQUENCE { + new-non-serving-RL-E-DCH-FDD-DL-ControlChannelInformation-A EDCH-FDD-DL-ControlChannelInformation OPTIONAL, + new-non-serving-RL-E-DCH-FDD-DL-ControlChannelInformation-B EDCH-FDD-DL-ControlChannelInformation OPTIONAL, + new-non-serving-RL-E-DCH-FDD-DL-ControlChannelInformation-C EDCH-FDD-DL-ControlChannelInformation OPTIONAL, + iE-Extensions ProtocolExtensionContainer { {Non-Serving-RL-Preconfig-Info-ExtIEs} } OPTIONAL, + ... +} + +Non-Serving-RL-Preconfig-Info-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { + {ID id-Additional-E-DCH-New-non-serving-RL-E-DCH-FDD-DL-Control-Channel-InfoList CRITICALITY ignore EXTENSION Additional-E-DCH-New-non-serving-RL-E-DCH-FDD-DL-Control-Channel-InfoList PRESENCE optional}, +... +} + +Additional-E-DCH-New-non-serving-RL-E-DCH-FDD-DL-Control-Channel-InfoList ::= SEQUENCE(SIZE(1.. maxNrOfEDCH-1)) OF SEQUENCE { + new-non-serving-RL-E-DCH-FDD-DL-Control-Channel-Information-A EDCH-FDD-DL-ControlChannelInformation OPTIONAL, + new-non-serving-RL-E-DCH-FDD-DL-Control-Channel-Information-B EDCH-FDD-DL-ControlChannelInformation OPTIONAL, + new-non-serving-RL-E-DCH-FDD-DL-Control-Channel-Information-C EDCH-FDD-DL-ControlChannelInformation OPTIONAL, + iE-Extensions ProtocolExtensionContainer { { Additional-E-DCH-New-non-serving-RL-E-DCH-FDD-DL-Control-Channel-InfoList-ExtIEs} } OPTIONAL, + ... +} + +Additional-E-DCH-New-non-serving-RL-E-DCH-FDD-DL-Control-Channel-InfoList-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { +... +} + NeedforIdleInterval ::= ENUMERATED { true, false @@ -9745,3 +9802,4 @@ Uu-ActivationState ::= ENUMERATED { -- Z END + diff --git a/asn1/rnsap/RNSAP-PDU-Contents.asn b/asn1/rnsap/RNSAP-PDU-Contents.asn index 76c3a05b8b..639c5daa47 100644 --- a/asn1/rnsap/RNSAP-PDU-Contents.asn +++ b/asn1/rnsap/RNSAP-PDU-Contents.asn @@ -1,6 +1,6 @@ -- RNSAP-PDU-Contents.asn -- --- Taken from 3GPP TS 25.423 V9.2.3 (2010-03) +-- Taken from 3GPP TS 25.423 V9.4.0 (2010-09) -- http://www.3gpp.org/ftp/Specs/archive/25_series/25.423/25423-790.zip/25423-790.DOC -- -- 9.3.3 PDU Definitions @@ -411,7 +411,9 @@ IMPORTS DCH-MeasurementOccasion-Information, DCH-MeasurementType-Indicator, Setup-Or-ConfigurationChange-Or-Removal-Of-EDCH-On-secondary-UL-Frequency, - Additional-EDCH-Cell-Information-Response-RLAddList + Additional-EDCH-Cell-Information-Response-RLAddList, + Non-Serving-RL-Preconfig-Setup, + Non-Serving-RL-Preconfig-Info @@ -817,6 +819,7 @@ FROM RNSAP-Containers id-UEMeasurementParameterModAllow, id-UEMeasurementValueInformation, id-UE-State, + id-UE-with-enhanced-HS-SCCH-support-indicator, id-UL-CCTrCH-AddInformation-RL-ReconfPrepTDD, id-UL-CCTrCH-DeleteInformation-RL-ReconfPrepTDD, id-UL-CCTrCH-ModifyInformation-RL-ReconfPrepTDD, @@ -1002,7 +1005,10 @@ FROM RNSAP-Containers id-Additional-EDCH-Cell-Information-RL-Param-Upd, id-Additional-EDCH-Cell-Information-ResponseRLReconf, id-DCH-MeasurementOccasion-Information, - id-DCH-MeasurementType-Indicator + id-DCH-MeasurementType-Indicator, + id-Non-Serving-RL-Preconfig-Info, + id-Non-Serving-RL-Preconfig-Setup, + id-Non-Serving-RL-Preconfig-Removal @@ -1121,8 +1127,9 @@ RL-InformationItem-RL-SetupRqstFDD-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { { ID id-RL-Specific-EDCH-Information CRITICALITY reject EXTENSION RL-Specific-EDCH-Information PRESENCE optional }| { ID id-EDCH-RL-Indication CRITICALITY reject EXTENSION EDCH-RL-Indication PRESENCE optional }| { ID id-ExtendedPropagationDelay CRITICALITY ignore EXTENSION ExtendedPropagationDelay PRESENCE optional }| - { ID id-SynchronisationIndicator CRITICALITY reject EXTENSION SynchronisationIndicator PRESENCE optional}| - { ID id-HSDSCH-PreconfigurationSetup CRITICALITY ignore EXTENSION HSDSCH-PreconfigurationSetup PRESENCE optional}, + { ID id-SynchronisationIndicator CRITICALITY reject EXTENSION SynchronisationIndicator PRESENCE optional }| + { ID id-HSDSCH-PreconfigurationSetup CRITICALITY ignore EXTENSION HSDSCH-PreconfigurationSetup PRESENCE optional }| + { ID id-Non-Serving-RL-Preconfig-Setup CRITICALITY ignore EXTENSION Non-Serving-RL-Preconfig-Setup PRESENCE optional }, ... } @@ -1361,7 +1368,7 @@ RadioLinkSetupRequestTDD-Extensions RNSAP-PROTOCOL-EXTENSION ::= { -- ************************************************************** RadioLinkSetupResponseFDD ::= SEQUENCE { - protocolIEs ProtocolIE-Container {{RadioLinkSetupResponseFDD-Ies}}, + protocolIEs ProtocolIE-Container {{RadioLinkSetupResponseFDD-IEs}}, protocolExtensions ProtocolExtensionContainer {{RadioLinkSetupResponseFDD-Extensions}} OPTIONAL, ... } @@ -1427,7 +1434,8 @@ RL-InformationResponseItem-RL-SetupRspFDD-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { { ID id-FrameOffset CRITICALITY ignore EXTENSION FrameOffset PRESENCE optional }| { ID id-ChipOffset CRITICALITY ignore EXTENSION ChipOffset PRESENCE optional }| { ID id-Neighbouring-E-UTRA-CellInformation CRITICALITY ignore EXTENSION Neighbouring-E-UTRA-CellInformation PRESENCE optional }| - { ID id-HSDSCH-PreconfigurationInfo CRITICALITY ignore EXTENSION HSDSCH-PreconfigurationInfo PRESENCE optional }, + { ID id-HSDSCH-PreconfigurationInfo CRITICALITY ignore EXTENSION HSDSCH-PreconfigurationInfo PRESENCE optional }| + { ID id-Non-Serving-RL-Preconfig-Info CRITICALITY ignore EXTENSION Non-Serving-RL-Preconfig-Info PRESENCE optional }, ... } @@ -1493,7 +1501,7 @@ Additional-HS-Cell-Information-Response-ItemIEs-ExtIEs RNSAP-PROTOCOL-EXTENSION -- ************************************************************** RadioLinkSetupResponseTDD ::= SEQUENCE { - protocolIEs ProtocolIE-Container {{RadioLinkSetupResponseTDD-Ies}}, + protocolIEs ProtocolIE-Container {{RadioLinkSetupResponseTDD-IEs}}, protocolExtensions ProtocolExtensionContainer {{RadioLinkSetupResponseTDD-Extensions}} OPTIONAL, ... } @@ -1525,7 +1533,7 @@ RL-InformationResponse-RL-SetupRspTDD ::= SEQUENCE { cellParameterID CellParameterID OPTIONAL, syncCase SyncCase OPTIONAL, sCH-TimeSlot SCH-TimeSlot OPTIONAL, - -- This IE shall be present if Sync Case IE is equal to “Case2”. – + -- This IE shall be present if Sync Case IE is equal to “Case2”. -- sCTD-Indicator SCTD-Indicator OPTIONAL, pCCPCH-Power PCCPCH-Power, timingAdvanceApplied TimingAdvanceApplied, @@ -1548,7 +1556,7 @@ RL-InformationResponse-RL-SetupRspTDD-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { { ID id-GA-CellAdditionalShapes CRITICALITY ignore EXTENSION GA-CellAdditionalShapes PRESENCE optional }| { ID id-HCS-Prio CRITICALITY ignore EXTENSION HCS-Prio PRESENCE optional }| { ID id-TimeSlot-RL-SetupRspTDD CRITICALITY ignore EXTENSION TimeSlot PRESENCE conditional }| - -- This IE shall be present if Sync Case IE is Case1. – + -- This IE shall be present if Sync Case IE is Case1. -- { ID id-Neighbouring-E-UTRA-CellInformation CRITICALITY ignore EXTENSION Neighbouring-E-UTRA-CellInformation PRESENCE optional }, ... } @@ -1883,7 +1891,7 @@ RL-InformationResponse-RL-SetupRspTDD768 ::= SEQUENCE { cellParameterID CellParameterID OPTIONAL, syncCase SyncCase OPTIONAL, sCH-TimeSlot SCH-TimeSlot OPTIONAL, - -- This IE shall be present if Sync Case IE is equal to “Case2”. – + -- This IE shall be present if Sync Case IE is equal to “Case2”. -- sCTD-Indicator SCTD-Indicator OPTIONAL, pCCPCH-Power PCCPCH-Power, timingAdvanceApplied TimingAdvanceApplied, @@ -1901,7 +1909,7 @@ RL-InformationResponse-RL-SetupRspTDD768 ::= SEQUENCE { gA-CellAdditionalShapes GA-CellAdditionalShapes OPTIONAL, hCS-Prio HCS-Prio OPTIONAL, timeSlot-RL-SetupRspTDD TimeSlot OPTIONAL, - -- This IE shall be present if Sync Case IE is Case1. – + -- This IE shall be present if Sync Case IE is Case1. -- iE-Extensions ProtocolExtensionContainer { {RL-InformationResponse-RL-SetupRspTDD768-ExtIEs} } OPTIONAL, ... @@ -2113,8 +2121,9 @@ SuccessfulRL-InformationResponse-RL-SetupFailureFDD-ExtIEs RNSAP-PROTOCOL-EXTENS { ID id-EDCH-FDD-DL-ControlChannelInformation CRITICALITY ignore EXTENSION EDCH-FDD-DL-ControlChannelInformation PRESENCE optional }| { ID id-Initial-DL-DPCH-TimingAdjustment CRITICALITY ignore EXTENSION DL-DPCH-TimingAdjustment PRESENCE optional }| { ID id-Neighbouring-E-UTRA-CellInformation CRITICALITY ignore EXTENSION Neighbouring-E-UTRA-CellInformation PRESENCE optional }| - { ID id-HSDSCH-PreconfigurationInfo CRITICALITY ignore EXTENSION HSDSCH-PreconfigurationInfo PRESENCE optional}| - { ID id-F-DPCH-SlotFormat CRITICALITY ignore EXTENSION F-DPCH-SlotFormat PRESENCE optional }, + { ID id-HSDSCH-PreconfigurationInfo CRITICALITY ignore EXTENSION HSDSCH-PreconfigurationInfo PRESENCE optional }| + { ID id-F-DPCH-SlotFormat CRITICALITY ignore EXTENSION F-DPCH-SlotFormat PRESENCE optional }| + { ID id-Non-Serving-RL-Preconfig-Info CRITICALITY ignore EXTENSION Non-Serving-RL-Preconfig-Info PRESENCE optional }, ... } @@ -2256,13 +2265,14 @@ RL-Information-RL-AdditionRqstFDD ::= SEQUENCE { RL-Information-RL-AdditionRqstFDD-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { { ID id-DLReferencePower CRITICALITY ignore EXTENSION DL-Power PRESENCE optional}| - { ID id-Enhanced-PrimaryCPICH-EcNo CRITICALITY ignore EXTENSION Enhanced-PrimaryCPICH-EcNo PRESENCE optional }| - { ID id-RL-Specific-DCH-Info CRITICALITY ignore EXTENSION RL-Specific-DCH-Info PRESENCE optional }| - { ID id-DelayedActivation CRITICALITY reject EXTENSION DelayedActivation PRESENCE optional }| - { ID id-RL-Specific-EDCH-Information CRITICALITY reject EXTENSION RL-Specific-EDCH-Information PRESENCE optional }| - { ID id-EDCH-RL-Indication CRITICALITY reject EXTENSION EDCH-RL-Indication PRESENCE optional }| - { ID id-SynchronisationIndicator CRITICALITY ignore EXTENSION SynchronisationIndicator PRESENCE optional}| - { ID id-HSDSCH-PreconfigurationSetup CRITICALITY ignore EXTENSION HSDSCH-PreconfigurationSetup PRESENCE optional}, + { ID id-Enhanced-PrimaryCPICH-EcNo CRITICALITY ignore EXTENSION Enhanced-PrimaryCPICH-EcNo PRESENCE optional }| + { ID id-RL-Specific-DCH-Info CRITICALITY ignore EXTENSION RL-Specific-DCH-Info PRESENCE optional }| + { ID id-DelayedActivation CRITICALITY reject EXTENSION DelayedActivation PRESENCE optional }| + { ID id-RL-Specific-EDCH-Information CRITICALITY reject EXTENSION RL-Specific-EDCH-Information PRESENCE optional }| + { ID id-EDCH-RL-Indication CRITICALITY reject EXTENSION EDCH-RL-Indication PRESENCE optional }| + { ID id-SynchronisationIndicator CRITICALITY ignore EXTENSION SynchronisationIndicator PRESENCE optional }| + { ID id-HSDSCH-PreconfigurationSetup CRITICALITY ignore EXTENSION HSDSCH-PreconfigurationSetup PRESENCE optional }| + { ID id-Non-Serving-RL-Preconfig-Setup CRITICALITY ignore EXTENSION Non-Serving-RL-Preconfig-Setup PRESENCE optional }, ... } @@ -2483,15 +2493,16 @@ RL-InformationResponseItem-RL-AdditionRspFDD ::= SEQUENCE { RL-InformationResponseItem-RL-AdditionRspFDD-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { { ID id-GA-CellAdditionalShapes CRITICALITY ignore EXTENSION GA-CellAdditionalShapes PRESENCE optional }| - { ID id-DL-PowerBalancing-ActivationIndicator CRITICALITY ignore EXTENSION DL-PowerBalancing-ActivationIndicator PRESENCE optional}| + { ID id-DL-PowerBalancing-ActivationIndicator CRITICALITY ignore EXTENSION DL-PowerBalancing-ActivationIndicator PRESENCE optional }| { ID id-HCS-Prio CRITICALITY ignore EXTENSION HCS-Prio PRESENCE optional }| - { ID id-Active-MBMS-Bearer-ServiceFDD-PFL CRITICALITY ignore EXTENSION Active-MBMS-Bearer-Service-ListFDD-PFL PRESENCE optional }| - { ID id-EDCH-RLSet-Id CRITICALITY ignore EXTENSION RL-Set-ID PRESENCE optional }| - { ID id-EDCH-FDD-DL-ControlChannelInformation CRITICALITY ignore EXTENSION EDCH-FDD-DL-ControlChannelInformation PRESENCE optional }| - { ID id-Initial-DL-DPCH-TimingAdjustment CRITICALITY ignore EXTENSION DL-DPCH-TimingAdjustment PRESENCE optional }| - { ID id-F-DPCH-SlotFormat CRITICALITY ignore EXTENSION F-DPCH-SlotFormat PRESENCE optional }| + { ID id-Active-MBMS-Bearer-ServiceFDD-PFL CRITICALITY ignore EXTENSION Active-MBMS-Bearer-Service-ListFDD-PFL PRESENCE optional }| + { ID id-EDCH-RLSet-Id CRITICALITY ignore EXTENSION RL-Set-ID PRESENCE optional }| + { ID id-EDCH-FDD-DL-ControlChannelInformation CRITICALITY ignore EXTENSION EDCH-FDD-DL-ControlChannelInformation PRESENCE optional }| + { ID id-Initial-DL-DPCH-TimingAdjustment CRITICALITY ignore EXTENSION DL-DPCH-TimingAdjustment PRESENCE optional }| + { ID id-F-DPCH-SlotFormat CRITICALITY ignore EXTENSION F-DPCH-SlotFormat PRESENCE optional }| { ID id-Neighbouring-E-UTRA-CellInformation CRITICALITY ignore EXTENSION Neighbouring-E-UTRA-CellInformation PRESENCE optional }| - { ID id-HSDSCH-PreconfigurationInfo CRITICALITY ignore EXTENSION HSDSCH-PreconfigurationInfo PRESENCE optional}, + { ID id-HSDSCH-PreconfigurationInfo CRITICALITY ignore EXTENSION HSDSCH-PreconfigurationInfo PRESENCE optional }| + { ID id-Non-Serving-RL-Preconfig-Info CRITICALITY ignore EXTENSION Non-Serving-RL-Preconfig-Info PRESENCE optional }, ... } @@ -3182,8 +3193,9 @@ SuccessfulRL-InformationResponse-RL-AdditionFailureFDD-ExtIEs RNSAP-PROTOCOL-EXT { ID id-EDCH-FDD-DL-ControlChannelInformation CRITICALITY ignore EXTENSION EDCH-FDD-DL-ControlChannelInformation PRESENCE optional }| { ID id-Initial-DL-DPCH-TimingAdjustment CRITICALITY ignore EXTENSION DL-DPCH-TimingAdjustment PRESENCE optional }| { ID id-Neighbouring-E-UTRA-CellInformation CRITICALITY ignore EXTENSION Neighbouring-E-UTRA-CellInformation PRESENCE optional }| - { ID id-HSDSCH-PreconfigurationInfo CRITICALITY ignore EXTENSION HSDSCH-PreconfigurationInfo PRESENCE optional}| - { ID id-F-DPCH-SlotFormat CRITICALITY ignore EXTENSION F-DPCH-SlotFormat PRESENCE optional }, + { ID id-HSDSCH-PreconfigurationInfo CRITICALITY ignore EXTENSION HSDSCH-PreconfigurationInfo PRESENCE optional }| + { ID id-F-DPCH-SlotFormat CRITICALITY ignore EXTENSION F-DPCH-SlotFormat PRESENCE optional }| + { ID id-Non-Serving-RL-Preconfig-Info CRITICALITY ignore EXTENSION Non-Serving-RL-Preconfig-Info PRESENCE optional }, ... } @@ -3302,19 +3314,19 @@ RadioLinkAdditionFailureTDD-Extensions RNSAP-PROTOCOL-EXTENSION ::= { -- ************************************************************** RadioLinkDeletionRequest ::= SEQUENCE { - protocolIEs ProtocolIE-Container {{RadioLinkDeletionRequest-Ies}}, + protocolIEs ProtocolIE-Container {{RadioLinkDeletionRequest-IEs}}, protocolExtensions ProtocolExtensionContainer {{RadioLinkDeletionRequest-Extensions}} OPTIONAL, ... } -RadioLinkDeletionRequest-Ies RNSAP-PROTOCOL-IES ::= { +RadioLinkDeletionRequest-IEs RNSAP-PROTOCOL-IES ::= { { ID id-RL-InformationList-RL-DeletionRqst CRITICALITY notify TYPE RL-InformationList-RL-DeletionRqst PRESENCE mandatory }, ... } -RL-InformationList-RL-DeletionRqst ::= SEQUENCE (SIZE (1..maxNrOfRLs)) OF ProtocolIE-Single-Container { {RL-Information-RL-DeletionRqst-Ies} } +RL-InformationList-RL-DeletionRqst ::= SEQUENCE (SIZE (1..maxNrOfRLs)) OF ProtocolIE-Single-Container { {RL-Information-RL-DeletionRqst-IEs} } -RL-Information-RL-DeletionRqst-Ies RNSAP-PROTOCOL-IES ::= { +RL-Information-RL-DeletionRqst-IEs RNSAP-PROTOCOL-IES ::= { { ID id-RL-Information-RL-DeletionRqst CRITICALITY notify TYPE RL-Information-RL-DeletionRqst PRESENCE mandatory } } @@ -3339,7 +3351,7 @@ RadioLinkDeletionRequest-Extensions RNSAP-PROTOCOL-EXTENSION ::= { -- ************************************************************** RadioLinkDeletionResponse ::= SEQUENCE { - protocolIEs ProtocolIE-Container {{RadioLinkDeletionResponse-Ies}}, + protocolIEs ProtocolIE-Container {{RadioLinkDeletionResponse-IEs}}, protocolExtensions ProtocolExtensionContainer {{RadioLinkDeletionResponse-Extensions}} OPTIONAL, ... } @@ -3469,12 +3481,15 @@ RL-Information-RL-ReconfPrepFDD ::= SEQUENCE { } RL-Information-RL-ReconfPrepFDD-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { - { ID id-DLReferencePower CRITICALITY ignore EXTENSION DL-Power PRESENCE optional }| - { ID id-RL-Specific-DCH-Info CRITICALITY ignore EXTENSION RL-Specific-DCH-Info PRESENCE optional }| - { ID id-DL-DPCH-TimingAdjustment CRITICALITY reject EXTENSION DL-DPCH-TimingAdjustment PRESENCE optional }| + { ID id-DLReferencePower CRITICALITY ignore EXTENSION DL-Power PRESENCE optional }| + { ID id-RL-Specific-DCH-Info CRITICALITY ignore EXTENSION RL-Specific-DCH-Info PRESENCE optional }| + { ID id-DL-DPCH-TimingAdjustment CRITICALITY reject EXTENSION DL-DPCH-TimingAdjustment PRESENCE optional }| { ID id-Phase-Reference-Update-Indicator CRITICALITY ignore EXTENSION Phase-Reference-Update-Indicator PRESENCE optional }| - { ID id-RL-Specific-EDCH-Information CRITICALITY reject EXTENSION RL-Specific-EDCH-Information PRESENCE optional }| - { ID id-EDCH-RL-Indication CRITICALITY reject EXTENSION EDCH-RL-Indication PRESENCE optional }, + { ID id-RL-Specific-EDCH-Information CRITICALITY reject EXTENSION RL-Specific-EDCH-Information PRESENCE optional }| + { ID id-EDCH-RL-Indication CRITICALITY reject EXTENSION EDCH-RL-Indication PRESENCE optional }| + { ID id-HSDSCH-PreconfigurationSetup CRITICALITY ignore EXTENSION HSDSCH-PreconfigurationSetup PRESENCE optional }| + { ID id-Non-Serving-RL-Preconfig-Setup CRITICALITY ignore EXTENSION Non-Serving-RL-Preconfig-Setup PRESENCE optional }| + { ID id-Non-Serving-RL-Preconfig-Removal CRITICALITY ignore EXTENSION Non-Serving-RL-Preconfig-Setup PRESENCE optional }, ... } @@ -3894,13 +3909,15 @@ RL-InformationResponseItem-RL-ReconfReadyFDD ::= SEQUENCE { } RL-InformationResponseItem-RL-ReconfReadyFDD-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { - { ID id-DL-PowerBalancing-UpdatedIndicator CRITICALITY ignore EXTENSION DL-PowerBalancing-UpdatedIndicator PRESENCE optional}| + { ID id-DL-PowerBalancing-UpdatedIndicator CRITICALITY ignore EXTENSION DL-PowerBalancing-UpdatedIndicator PRESENCE optional }| { ID id-Primary-CPICH-Usage-For-Channel-Estimation CRITICALITY ignore EXTENSION Primary-CPICH-Usage-For-Channel-Estimation PRESENCE optional }| { ID id-Secondary-CPICH-Information-Change CRITICALITY ignore EXTENSION Secondary-CPICH-Information-Change PRESENCE optional }| { ID id-EDCH-FDD-InformationResponse CRITICALITY ignore EXTENSION EDCH-FDD-InformationResponse PRESENCE optional }| { ID id-EDCH-RLSet-Id CRITICALITY ignore EXTENSION RL-Set-ID PRESENCE optional }| { ID id-EDCH-FDD-DL-ControlChannelInformation CRITICALITY ignore EXTENSION EDCH-FDD-DL-ControlChannelInformation PRESENCE optional }| - { ID id-F-DPCH-SlotFormat CRITICALITY ignore EXTENSION F-DPCH-SlotFormat PRESENCE optional }, + { ID id-F-DPCH-SlotFormat CRITICALITY ignore EXTENSION F-DPCH-SlotFormat PRESENCE optional }| + { ID id-HSDSCH-PreconfigurationInfo CRITICALITY ignore EXTENSION HSDSCH-PreconfigurationInfo PRESENCE optional }| + { ID id-Non-Serving-RL-Preconfig-Info CRITICALITY ignore EXTENSION Non-Serving-RL-Preconfig-Info PRESENCE optional }, ... } @@ -4714,8 +4731,11 @@ RL-ReconfigurationRequestFDD-RL-Information-IEs ::= SEQUENCE { } RL-ReconfigurationRequestFDD-RL-Information-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { - { ID id-RL-Specific-EDCH-Information CRITICALITY reject EXTENSION RL-Specific-EDCH-Information PRESENCE optional }| - { ID id-EDCH-RL-Indication CRITICALITY reject EXTENSION EDCH-RL-Indication PRESENCE optional }, + { ID id-RL-Specific-EDCH-Information CRITICALITY reject EXTENSION RL-Specific-EDCH-Information PRESENCE optional }| + { ID id-EDCH-RL-Indication CRITICALITY reject EXTENSION EDCH-RL-Indication PRESENCE optional }| + { ID id-HSDSCH-PreconfigurationSetup CRITICALITY ignore EXTENSION HSDSCH-PreconfigurationSetup PRESENCE optional }| + { ID id-Non-Serving-RL-Preconfig-Setup CRITICALITY ignore EXTENSION Non-Serving-RL-Preconfig-Setup PRESENCE optional }| + { ID id-Non-Serving-RL-Preconfig-Removal CRITICALITY ignore EXTENSION Non-Serving-RL-Preconfig-Setup PRESENCE optional }, ... } @@ -4893,11 +4913,13 @@ RL-InformationResponseItem-RL-ReconfRspFDD ::= SEQUENCE { } RL-InformationResponseItem-RL-ReconfRspFDD-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { - { ID id-DL-PowerBalancing-UpdatedIndicator CRITICALITY ignore EXTENSION DL-PowerBalancing-UpdatedIndicator PRESENCE optional}| + { ID id-DL-PowerBalancing-UpdatedIndicator CRITICALITY ignore EXTENSION DL-PowerBalancing-UpdatedIndicator PRESENCE optional }| { ID id-EDCH-FDD-InformationResponse CRITICALITY ignore EXTENSION EDCH-FDD-InformationResponse PRESENCE optional }| { ID id-EDCH-RLSet-Id CRITICALITY ignore EXTENSION RL-Set-ID PRESENCE optional }| { ID id-EDCH-FDD-DL-ControlChannelInformation CRITICALITY ignore EXTENSION EDCH-FDD-DL-ControlChannelInformation PRESENCE optional }| - { ID id-F-DPCH-SlotFormat CRITICALITY ignore EXTENSION F-DPCH-SlotFormat PRESENCE optional }, + { ID id-F-DPCH-SlotFormat CRITICALITY ignore EXTENSION F-DPCH-SlotFormat PRESENCE optional }| + { ID id-HSDSCH-PreconfigurationInfo CRITICALITY ignore EXTENSION HSDSCH-PreconfigurationInfo PRESENCE optional }| + { ID id-Non-Serving-RL-Preconfig-Info CRITICALITY ignore EXTENSION Non-Serving-RL-Preconfig-Info PRESENCE optional }, ... } @@ -5228,12 +5250,12 @@ EDCH-MacdFlowSpecificInformation-RL-PreemptRequiredInd-ExtIEs RNSAP-PROTOCOL-EXT -- ************************************************************** RadioLinkRestoreIndication ::= SEQUENCE { - protocolIEs ProtocolIE-Container {{RadioLinkRestoreIndication-Ies}}, + protocolIEs ProtocolIE-Container {{RadioLinkRestoreIndication-IEs}}, protocolExtensions ProtocolExtensionContainer {{RadioLinkRestoreIndication-Extensions}} OPTIONAL, ... } -RadioLinkRestoreIndication-Ies RNSAP-PROTOCOL-IES ::= { +RadioLinkRestoreIndication-IEs RNSAP-PROTOCOL-IES ::= { { ID id-Reporing-Object-RL-RestoreInd CRITICALITY ignore TYPE Reporting-Object-RL-RestoreInd PRESENCE mandatory }, ... } @@ -6079,9 +6101,9 @@ RLItem-DM-Rqst-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { ... } -RL-InformationList-DM-Rqst ::= SEQUENCE (SIZE (1..maxNrOfRLs)) OF ProtocolIE-Single-Container { {RL-Information-DM-Rqst-Ies} } +RL-InformationList-DM-Rqst ::= SEQUENCE (SIZE (1..maxNrOfRLs)) OF ProtocolIE-Single-Container { {RL-Information-DM-Rqst-IEs} } -RL-Information-DM-Rqst-Ies RNSAP-PROTOCOL-IES ::= { +RL-Information-DM-Rqst-IEs RNSAP-PROTOCOL-IES ::= { { ID id-RL-InformationItem-DM-Rqst CRITICALITY reject TYPE RL-InformationItem-DM-Rqst PRESENCE mandatory } } @@ -6189,9 +6211,9 @@ RL-SetItem-DM-Rsp-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { ... } -RL-InformationList-DM-Rsp ::= SEQUENCE (SIZE (1..maxNrOfRLs)) OF ProtocolIE-Single-Container { {RL-Information-DM-Rsp-Ies} } +RL-InformationList-DM-Rsp ::= SEQUENCE (SIZE (1..maxNrOfRLs)) OF ProtocolIE-Single-Container { {RL-Information-DM-Rsp-IEs} } -RL-Information-DM-Rsp-Ies RNSAP-PROTOCOL-IES ::= { +RL-Information-DM-Rsp-IEs RNSAP-PROTOCOL-IES ::= { { ID id-RL-InformationItem-DM-Rsp CRITICALITY ignore TYPE RL-InformationItem-DM-Rsp PRESENCE mandatory } } @@ -6477,9 +6499,9 @@ RL-SetItem-DM-Rprt-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { ... } -RL-InformationList-DM-Rprt ::= SEQUENCE (SIZE (1..maxNrOfRLs)) OF ProtocolIE-Single-Container { {RL-Information-DM-Rprt-Ies} } +RL-InformationList-DM-Rprt ::= SEQUENCE (SIZE (1..maxNrOfRLs)) OF ProtocolIE-Single-Container { {RL-Information-DM-Rprt-IEs} } -RL-Information-DM-Rprt-Ies RNSAP-PROTOCOL-IES ::= { +RL-Information-DM-Rprt-IEs RNSAP-PROTOCOL-IES ::= { { ID id-RL-InformationItem-DM-Rprt CRITICALITY ignore TYPE RL-InformationItem-DM-Rprt PRESENCE mandatory } } @@ -6681,7 +6703,8 @@ CommonTransportChannelResourcesRequest-Extensions RNSAP-PROTOCOL-EXTENSION ::= { -- FDD and 1.28Mcps TDD only { ID id-Common-EDCH-Support-Indicator CRITICALITY ignore EXTENSION Common-EDCH-Support-Indicator PRESENCE optional }| -- FDD only - { ID id-HSDSCH-Physical-Layer-Category CRITICALITY ignore EXTENSION HSDSCH-Physical-Layer-Category PRESENCE optional }, + { ID id-HSDSCH-Physical-Layer-Category CRITICALITY ignore EXTENSION HSDSCH-Physical-Layer-Category PRESENCE optional }| + { ID id-UE-with-enhanced-HS-SCCH-support-indicator CRITICALITY ignore EXTENSION NULL PRESENCE optional }, ... } @@ -6809,7 +6832,7 @@ CommonTransportChannelResourcesFailure-Extensions RNSAP-PROTOCOL-EXTENSION ::= { -- ************************************************************** CompressedModeCommand ::= SEQUENCE { - protocolIEs ProtocolIE-Container {{CompressedModeCommand-Ies}}, + protocolIEs ProtocolIE-Container {{CompressedModeCommand-IEs}}, protocolExtensions ProtocolExtensionContainer {{CompressedModeCommand-Extensions}} OPTIONAL, ... } @@ -7417,7 +7440,7 @@ InformationExchangeFailureIndication-Extensions RNSAP-PROTOCOL-EXTENSION ::= { -- ************************************************************** ResetRequest ::= SEQUENCE { - protocolIEs ProtocolIE-Container {{ResetRequest-Ies}}, + protocolIEs ProtocolIE-Container {{ResetRequest-IEs}}, protocolExtensions ProtocolExtensionContainer {{ResetRequest-Extensions}} OPTIONAL, ... } @@ -7505,7 +7528,7 @@ ContextGroupInfoItem-Reset-ExtIEs RNSAP-PROTOCOL-EXTENSION ::= { -- ************************************************************** ResetResponse ::= SEQUENCE { - protocolIEs ProtocolIE-Container {{ResetResponse-Ies}}, + protocolIEs ProtocolIE-Container {{ResetResponse-IEs}}, protocolExtensions ProtocolExtensionContainer {{ResetResponse-Extensions}} OPTIONAL, ... } @@ -7755,12 +7778,12 @@ UEMeasurementInitiationRequest-Extensions RNSAP-PROTOCOL-EXTENSION ::= { -- ************************************************************** UEMeasurementInitiationResponse ::= SEQUENCE { - protocolIEs ProtocolIE-Container {{UEMeasurementInitiationResponse-Ies}}, + protocolIEs ProtocolIE-Container {{UEMeasurementInitiationResponse-IEs}}, protocolExtensions ProtocolExtensionContainer {{UEMeasurementInitiationResponse-Extensions}} OPTIONAL, ... } -UEMeasurementInitiationResponse-Ies RNSAP-PROTOCOL-IES ::= { +UEMeasurementInitiationResponse-IEs RNSAP-PROTOCOL-IES ::= { { ID id-MeasurementID CRITICALITY ignore TYPE MeasurementID PRESENCE mandatory } | { ID id-MeasurementFilterCoefficient CRITICALITY reject TYPE MeasurementFilterCoefficient PRESENCE optional } | { ID id-UEMeasurementReportCharacteristics CRITICALITY reject TYPE UEMeasurementReportCharacteristics PRESENCE optional } | @@ -7802,12 +7825,12 @@ UEMeasurementInitiationFailure-Extensions RNSAP-PROTOCOL-EXTENSION ::= { -- ************************************************************** UEMeasurementReport ::= SEQUENCE { - protocolIEs ProtocolIE-Container {{UEMeasurementReport-Ies}}, + protocolIEs ProtocolIE-Container {{UEMeasurementReport-IEs}}, protocolExtensions ProtocolExtensionContainer {{UEMeasurementReport-Extensions}} OPTIONAL, ... } -UEMeasurementReport-Ies RNSAP-PROTOCOL-IES ::= { +UEMeasurementReport-IEs RNSAP-PROTOCOL-IES ::= { { ID id-MeasurementID CRITICALITY ignore TYPE MeasurementID PRESENCE mandatory } | { ID id-UEMeasurementValueInformation CRITICALITY ignore TYPE UEMeasurementValueInformation PRESENCE mandatory }, ... @@ -7867,7 +7890,7 @@ UEMeasurementFailureIndication-Extensions RNSAP-PROTOCOL-EXTENSION ::= { -- ************************************************************** IurInvokeTrace ::= SEQUENCE { - protocolIEs ProtocolIE-Container {{IurInvokeTrace-Ies}}, + protocolIEs ProtocolIE-Container {{IurInvokeTrace-IEs}}, protocolExtensions ProtocolExtensionContainer {{IurInvokeTrace-Extensions}} OPTIONAL, ... } @@ -7910,7 +7933,7 @@ IurInvokeTrace-Extensions RNSAP-PROTOCOL-EXTENSION ::= { -- ************************************************************** IurDeactivateTrace ::= SEQUENCE { - protocolIEs ProtocolIE-Container {{IurDeactivateTrace-Ies}}, + protocolIEs ProtocolIE-Container {{IurDeactivateTrace-IEs}}, protocolExtensions ProtocolExtensionContainer {{IurDeactivateTrace-Extensions}} OPTIONAL, ... } @@ -7954,12 +7977,12 @@ MBMSAttachCommand-Extensions RNSAP-PROTOCOL-EXTENSION ::= { -- ************************************************************** MBMSDetachCommand ::= SEQUENCE { - protocolIEs ProtocolIE-Container {{MBMSDetachCommand-Ies}}, + protocolIEs ProtocolIE-Container {{MBMSDetachCommand-IEs}}, protocolExtensions ProtocolExtensionContainer {{MBMSDetachCommand-Extensions}} OPTIONAL, ... } -MBMSDetachCommand-Ies RNSAP-PROTOCOL-IES ::= { +MBMSDetachCommand-IEs RNSAP-PROTOCOL-IES ::= { { ID id-MBMS-Bearer-Service-List CRITICALITY ignore TYPE MBMS-Bearer-Service-List PRESENCE mandatory} | { ID id-UE-State CRITICALITY ignore TYPE UE-State PRESENCE optional}, ... @@ -7976,7 +7999,7 @@ MBMSDetachCommand-Extensions RNSAP-PROTOCOL-EXTENSION ::= { -- ************************************************************** DirectInformationTransfer ::= SEQUENCE { - protocolIEs ProtocolIE-Container {{DirectInformationTransfer-Ies}}, + protocolIEs ProtocolIE-Container {{DirectInformationTransfer-IEs}}, protocolExtensions ProtocolExtensionContainer {{DirectInformationTransfer-Extensions}} OPTIONAL, ... } @@ -7999,16 +8022,16 @@ DirectInformationTransfer-Extensions RNSAP-PROTOCOL-EXTENSION ::= { -- ************************************************************** EnhancedRelocationRequest ::= SEQUENCE { - protocolIEs ProtocolIE-Container {{EnhancedRelocationRequest-Ies}}, + protocolIEs ProtocolIE-Container {{EnhancedRelocationRequest-IEs}}, protocolExtensions ProtocolExtensionContainer {{EnhancedRelocationRequest-Extensions}} OPTIONAL, ... } -EnhancedRelocationRequest-Ies RNSAP-PROTOCOL-IES ::= { +EnhancedRelocationRequest-IEs RNSAP-PROTOCOL-IES ::= { { ID id-Cause CRITICALITY reject TYPE Cause PRESENCE mandatory } | { ID id-Permanent-NAS-UE-Identity CRITICALITY reject TYPE Permanent-NAS-UE-Identity PRESENCE mandatory } | { ID id-SRNC-ID CRITICALITY reject TYPE RNC-ID PRESENCE optional }| - -- This IE shall be present if the Relocation type IE is set to “UE involved in relocation of SRNS” – + -- This IE shall be present if the Relocation type IE is set to “UE involved in relocation of SRNS” -- { ID id-Extended-SRNC-ID CRITICALITY reject TYPE Extended-RNC-ID PRESENCE optional }| { ID id-S-RNTI CRITICALITY reject TYPE S-RNTI PRESENCE mandatory }| { ID id-RANAP-EnhancedRelocationInformationRequest CRITICALITY reject TYPE RANAP-EnhancedRelocationInformationRequest PRESENCE mandatory }, @@ -8026,7 +8049,7 @@ EnhancedRelocationRequest-Extensions RNSAP-PROTOCOL-EXTENSION ::= { -- ************************************************************** EnhancedRelocationResponse ::= SEQUENCE { - protocolIEs ProtocolIE-Container {{EnhancedRelocationResponse-Ies}}, + protocolIEs ProtocolIE-Container {{EnhancedRelocationResponse-IEs}}, protocolExtensions ProtocolExtensionContainer {{EnhancedRelocationResponse-Extensions}} OPTIONAL, ... } @@ -8069,7 +8092,7 @@ EnhancedRelocationFailure-Extensions RNSAP-PROTOCOL-EXTENSION ::= { -- ************************************************************** EnhancedRelocationCancel ::= SEQUENCE { - protocolIEs ProtocolIE-Container {{EnhancedRelocationCancel-Ies}}, + protocolIEs ProtocolIE-Container {{EnhancedRelocationCancel-IEs}}, protocolExtensions ProtocolExtensionContainer {{EnhancedRelocationCancel-Extensions}} OPTIONAL, ... } diff --git a/asn1/rnsap/RNSAP-PDU-Descriptions.asn b/asn1/rnsap/RNSAP-PDU-Descriptions.asn index 2b0debda1d..bfdc6040ba 100644 --- a/asn1/rnsap/RNSAP-PDU-Descriptions.asn +++ b/asn1/rnsap/RNSAP-PDU-Descriptions.asn @@ -1,6 +1,6 @@ -- RNSAP-PDU-Descriptions.asn -- --- Taken from 3GPP TS 25.423 V9.2.3 (2010-03) +-- Taken from 3GPP TS 25.423 V9.4.0 (2010-09) -- http://www.3gpp.org/ftp/Specs/archive/25_series/25.423/25423-790.zip/25423-790.DOC -- -- 9.3.2 Elementary Procedure Definitions diff --git a/asn1/rnsap/rnsap.cnf b/asn1/rnsap/rnsap.cnf index 286549a19a..16f842ac1f 100644 --- a/asn1/rnsap/rnsap.cnf +++ b/asn1/rnsap/rnsap.cnf @@ -28,6 +28,7 @@ TDD-ChannelisationCode E-DCH-MACdFlow-Retransmission-Timer-LCR DiscardTimer FrequencyBandIndicator +MeasurementFilterCoefficient #.TYPE_RENAME ProcedureID/ddMode DdMode diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c index 44a8fbe5d0..e68893542b 100644 --- a/epan/dissectors/packet-rnsap.c +++ b/epan/dissectors/packet-rnsap.c @@ -236,6 +236,7 @@ #define RNSAP_ID_IURINVOKETRACE 44 #define RNSAP_ID_MBMSATTACH 45 #define RNSAP_ID_MBMSDETACH 46 +#define RNSAP_ID_NOT_USED_47 47 #define RNSAP_ID_DIRECTINFORMATIONTRANSFER 48 #define RNSAP_ID_ENHANCEDRELOCATION 49 #define RNSAP_ID_ENHANCEDRELOCATIONCANCEL 50 @@ -323,6 +324,7 @@ typedef enum _ProtocolIE_ID_enum { id_MeasurementID = 93, id_Neighbouring_GSM_CellInformation = 13, id_Neighbouring_UMTS_CellInformationItem = 95, + id_Unknown_305 = 304, id_NRT_Load_Information_Value = 305, id_NRT_Load_Information_Value_IncrDecrThres = 306, id_PagingArea_PagingRqst = 102, @@ -330,6 +332,7 @@ typedef enum _ProtocolIE_ID_enum { id_PartialReportingIndicator = 472, id_Permanent_NAS_UE_Identity = 17, id_PowerAdjustmentType = 107, + id_Unknown_108 = 108, id_RANAP_RelocationInformation = 109, id_RL_Information_PhyChReconfRqstFDD = 110, id_RL_Information_PhyChReconfRqstTDD = 111, @@ -388,13 +391,17 @@ typedef enum _ProtocolIE_ID_enum { id_SRNC_ID = 157, id_SuccessfulRL_InformationResponse_RL_AdditionFailureFDD = 159, id_SuccessfulRL_InformationResponse_RL_SetupFailureFDD = 160, + id_Unknown_161 = 161, + id_Unknown_162 = 162, id_TransportBearerID = 163, id_TransportBearerRequestIndicator = 164, id_TransportLayerAddress = 165, id_TypeOfError = 140, id_UC_ID = 166, id_UL_CCTrCH_AddInformation_RL_ReconfPrepTDD = 167, + id_Unknown_168 = 168, id_UL_CCTrCH_InformationAddList_RL_ReconfPrepTDD = 169, + id_Unknown_170 = 170, id_UL_CCTrCH_InformationItem_RL_SetupRqstTDD = 171, id_UL_CCTrCH_InformationList_RL_SetupRqstTDD = 172, id_UL_CCTrCH_InformationListIE_PhyChReconfRqstTDD = 173, @@ -410,11 +417,17 @@ typedef enum _ProtocolIE_ID_enum { id_UL_DPCH_InformationAddListIE_RL_ReconfReadyTDD = 183, id_UL_SIRTarget = 184, id_URA_Information = 185, + id_Unknown_186 = 186, + id_Unknown_187 = 187, id_UnsuccessfulRL_InformationResponse_RL_AdditionFailureFDD = 188, id_UnsuccessfulRL_InformationResponse_RL_SetupFailureFDD = 189, id_UnsuccessfulRL_InformationResponse_RL_SetupFailureTDD = 190, + id_Unknown_191 = 191, + id_Unknown_192 = 192, id_Active_Pattern_Sequence_Information = 193, id_AdjustmentRatio = 194, + id_Unknown_195 = 195, + id_Unknown_196 = 196, id_CauseLevel_RL_AdditionFailureFDD = 197, id_CauseLevel_RL_AdditionFailureTDD = 198, id_CauseLevel_RL_ReconfFailure = 199, @@ -444,11 +457,13 @@ typedef enum _ProtocolIE_ID_enum { id_Unused_ProtocolIE_ID_324 = 324, id_Unused_ProtocolIE_ID_229 = 229, id_DSCHToBeAddedOrModifiedList_RL_ReconfReadyTDD = 230, + id_Unknown_231 = 231, id_Unused_ProtocolIE_ID_29 = 29, id_Unused_ProtocolIE_ID_225 = 225, id_GA_Cell = 232, id_GA_CellAdditionalShapes = 3, id_Unused_ProtocolIE_ID_246 = 246, + id_Unknown_254 = 254, id_Transmission_Gap_Pattern_Sequence_Information = 255, id_UL_CCTrCH_DeleteInformation_RL_ReconfPrepTDD = 256, id_UL_CCTrCH_ModifyInformation_RL_ReconfPrepTDD = 257, @@ -513,6 +528,7 @@ typedef enum _ProtocolIE_ID_enum { id_DSCH_LCR_InformationListIEs_RL_AdditionRspTDD = 96, id_USCH_LCR_InformationListIEs_RL_AdditionRspTDD = 97, id_UL_DPCH_LCR_InformationAddListIE_RL_ReconfReadyTDD = 98, + id_Unknown_99 = 99, id_UL_Timeslot_LCR_InformationModifyList_RL_ReconfReadyTDD = 100, id_DL_DPCH_LCR_InformationAddListIE_RL_ReconfReadyTDD = 101, id_DL_Timeslot_LCR_InformationModifyList_RL_ReconfReadyTDD = 104, @@ -533,6 +549,7 @@ typedef enum _ProtocolIE_ID_enum { id_UL_Timeslot_ISCP_Value = 242, id_UL_Timeslot_ISCP_Value_IncrDecrThres = 243, id_Rx_Timing_Deviation_Value_LCR = 293, + id_Unknown_294 = 294, id_DPC_Mode_Change_SupportIndicator = 19, id_Unused_ProtocolIE_ID_247 = 247, id_Unused_ProtocolIE_ID_295 = 295, @@ -552,7 +569,9 @@ typedef enum _ProtocolIE_ID_enum { id_RL_Specific_DCH_Info = 317, id_RL_ReconfigurationRequestFDD_RL_InformationList = 318, id_RL_ReconfigurationRequestFDD_RL_Information_IEs = 319, + id_Unknown_320 = 320, id_RL_ReconfigurationRequestTDD_RL_Information = 321, + id_Unknown_322 = 322, id_CommonTransportChannelResourcesInitialisationNotRequired = 250, id_DelayedActivation = 312, id_DelayedActivationList_RL_ActivationCmdFDD = 313, @@ -565,6 +584,8 @@ typedef enum _ProtocolIE_ID_enum { id_PrimCCPCH_RSCP_DL_PC_RqstTDD = 451, id_HSDSCH_FDD_Information = 452, id_HSDSCH_FDD_Information_Response = 453, + id_Unknown_454 = 454, + id_Unknown_455 = 455, id_HSDSCH_FDD_Update_Information = 466, id_HSDSCH_Information_to_Modify = 456, id_HSDSCHMacdFlowSpecificInformationList_RL_PreemptRequiredInd = 516, @@ -572,16 +593,145 @@ typedef enum _ProtocolIE_ID_enum { id_HSDSCH_RNTI = 457, id_HSDSCH_TDD_Information = 458, id_HSDSCH_TDD_Information_Response = 459, + id_Unknown_460 = 460, + id_Unknown_461 = 461, + id_Unknown_462 = 462, id_HSDSCH_TDD_Update_Information = 467, id_HSPDSCH_RL_ID = 463, id_HSDSCH_MACdFlows_to_Add = 531, id_HSDSCH_MACdFlows_to_Delete = 532, id_Angle_Of_Arrival_Value_LCR = 148, + id_Unknown_149 = 149, id_TrafficClass = 158, id_Unused_ProtocolIE_ID_248 = 248, id_Unused_ProtocolIE_ID_253 = 253, id_PDSCH_RL_ID = 323, id_TimeSlot_RL_SetupRspTDD = 325, + id_Unknown_326 = 326, + id_Unknown_327 = 327, + id_Unknown_328 = 328, + id_Unknown_329 = 329, + id_Unknown_330 = 330, + id_Unknown_331 = 331, + id_Unknown_332 = 332, + id_Unknown_333 = 333, + id_Unknown_334 = 334, + id_Unknown_335 = 335, + id_Unknown_336 = 336, + id_Unknown_337 = 337, + id_Unknown_338 = 338, + id_Unknown_339 = 339, + id_Unknown_340 = 340, + id_Unknown_341 = 341, + id_Unknown_342 = 342, + id_Unknown_343 = 343, + id_Unknown_344 = 344, + id_Unknown_345 = 345, + id_Unknown_346 = 346, + id_Unknown_347 = 347, + id_Unknown_348 = 348, + id_Unknown_349 = 349, + id_Unknown_350 = 350, + id_Unknown_351 = 351, + id_Unknown_352 = 352, + id_Unknown_353 = 353, + id_Unknown_354 = 354, + id_Unknown_355 = 355, + id_Unknown_356 = 356, + id_Unknown_357 = 357, + id_Unknown_358 = 358, + id_Unknown_359 = 359, + id_Unknown_360 = 360, + id_Unknown_361 = 361, + id_Unknown_362 = 362, + id_Unknown_363 = 363, + id_Unknown_364 = 364, + id_Unknown_365 = 365, + id_Unknown_366 = 366, + id_Unknown_367 = 367, + id_Unknown_368 = 368, + id_Unknown_369 = 369, + id_Unknown_370 = 370, + id_Unknown_371 = 371, + id_Unknown_372 = 372, + id_Unknown_373 = 373, + id_Unknown_374 = 374, + id_Unknown_375 = 375, + id_Unknown_376 = 376, + id_Unknown_377 = 377, + id_Unknown_378 = 378, + id_Unknown_379 = 379, + id_Unknown_380 = 380, + id_Unknown_381 = 381, + id_Unknown_382 = 382, + id_Unknown_383 = 383, + id_Unknown_384 = 384, + id_Unknown_385 = 385, + id_Unknown_386 = 386, + id_Unknown_387 = 387, + id_Unknown_388 = 388, + id_Unknown_389 = 389, + id_Unknown_390 = 390, + id_Unknown_391 = 391, + id_Unknown_392 = 392, + id_Unknown_393 = 393, + id_Unknown_394 = 394, + id_Unknown_395 = 395, + id_Unknown_396 = 396, + id_Unknown_397 = 397, + id_Unknown_398 = 398, + id_Unknown_399 = 399, + id_Unknown_400 = 400, + id_Unknown_401 = 401, + id_Unknown_402 = 402, + id_Unknown_403 = 403, + id_Unknown_404 = 404, + id_Unknown_405 = 405, + id_Unknown_406 = 406, + id_Unknown_407 = 407, + id_Unknown_408 = 408, + id_Unknown_409 = 409, + id_Unknown_410 = 410, + id_Unknown_411 = 411, + id_Unknown_412 = 412, + id_Unknown_413 = 413, + id_Unknown_414 = 414, + id_Unknown_415 = 415, + id_Unknown_416 = 416, + id_Unknown_417 = 417, + id_Unknown_418 = 418, + id_Unknown_419 = 419, + id_Unknown_420 = 420, + id_Unknown_421 = 421, + id_Unknown_422 = 422, + id_Unknown_423 = 423, + id_Unknown_424 = 424, + id_Unknown_425 = 425, + id_Unknown_426 = 426, + id_Unknown_427 = 427, + id_Unknown_428 = 428, + id_Unknown_429 = 429, + id_Unknown_430 = 430, + id_Unknown_431 = 431, + id_Unknown_432 = 432, + id_Unknown_433 = 433, + id_Unknown_434 = 434, + id_Unknown_435 = 435, + id_Unknown_436 = 436, + id_Unknown_437 = 437, + id_Unknown_438 = 438, + id_Unknown_439 = 439, + id_Unknown_440 = 440, + id_Unknown_441 = 441, + id_Unknown_442 = 442, + id_Unknown_443 = 443, + id_Unknown_444 = 444, + id_Unknown_445 = 445, + id_Unknown_446 = 446, + id_Unknown_447 = 447, + id_Unknown_448 = 448, + id_Unknown_449 = 449, + id_Unknown_450 = 450, id_GERAN_Cell_Capability = 468, id_GERAN_Classmark = 469, id_DSCH_InitialWindowSize = 480, @@ -667,8 +817,12 @@ typedef enum _ProtocolIE_ID_enum { id_Active_MBMS_Bearer_ServiceFDD = 562, id_Active_MBMS_Bearer_ServiceTDD = 563, id_Old_URA_ID = 564, + id_Unknown_565 = 565, + id_Unknown_566 = 566, + id_Unknown_567 = 567, id_UE_State = 568, id_URA_ID = 569, + id_Unknown_570 = 570, id_HARQ_Preamble_Mode = 571, id_SynchronisationIndicator = 572, id_UL_DPDCHIndicatorEDCH = 573, @@ -772,7 +926,9 @@ typedef enum _ProtocolIE_ID_enum { id_Continuous_Packet_Connectivity_HS_SCCH_Less_Information = 671, id_Continuous_Packet_Connectivity_HS_SCCH_Less_Information_Response = 672, id_CPC_Information = 673, + id_Unknown_674 = 674, id_MIMO_InformationResponse = 675, + id_Unknown_676 = 676, id_E_DCH_LCR_Information = 677, id_E_DCH_LCR_Information_Reconfig = 678, id_E_DCH_LCR_Information_Response = 679, @@ -783,17 +939,24 @@ typedef enum _ProtocolIE_ID_enum { id_SixtyfourQAM_DL_SupportIndicator = 684, id_Enhanced_FACH_Support_Indicator = 685, id_Enhanced_FACH_Information_ResponseFDD = 686, + id_Unknown_687 = 687, + id_Unknown_688 = 688, + id_Unknown_689 = 689, id_HSDSCH_MACdPDUSizeFormat = 690, id_MaximumMACdPDU_SizeExtended = 691, id_F_DPCH_SlotFormat = 692, id_F_DPCH_SlotFormatSupportRequest = 693, id_eDCH_MACdFlow_Retransmission_Timer_LCR = 694, id_Max_UE_DTX_Cycle = 695, + id_Unknown_696 = 696, + id_Unknown_697 = 697, + id_Unknown_698 = 698, id_GANSS_Common_Data = 699, id_GANSS_Information = 700, id_GANSS_Generic_Data = 701, id_TUTRANGANSSMeasurementThresholdInformation = 702, id_TUTRANGANSSMeasurementValueInformation = 703, + id_Unknown_704 = 704, id_Ext_Reference_E_TFCI_PO = 705, id_Ext_Max_Bits_MACe_PDU_non_scheduled = 706, id_HARQ_MemoryPartitioningInfoExtForMIMO = 707, @@ -857,6 +1020,7 @@ typedef enum _ProtocolIE_ID_enum { id_MBMS_RLC_Sequence_Number_Information = 765, id_RLC_Sequence_Number = 766, id_Neighbouring_E_UTRA_CellInformation = 767, + id_Unknown_768 = 768, id_MBSFN_Cluster_Identity = 769, id_MCCH_Configuration_Info = 770, id_MCCH_Message_List = 771, @@ -920,6 +1084,9 @@ typedef enum _ProtocolIE_ID_enum { id_power_offset_for_S_CPICH_for_MIMO = 829, id_power_offset_for_S_CPICH_for_MIMO_Request_Indicator = 830, id_UE_SupportIndicatorExtension = 831, + id_Unknown_832 = 832, + id_Unknown_833 = 833, + id_Unknown_834 = 834, id_ActivationInformation = 835, id_CellPortionLCRID = 836, id_Additional_EDCH_Cell_Information_RL_Setup_Req = 837, @@ -931,6 +1098,14 @@ typedef enum _ProtocolIE_ID_enum { id_Additional_EDCH_Cell_Information_RL_Param_Upd = 843, id_Additional_EDCH_Preconfiguration_Information = 844, id_MulticellEDCH_Information = 845, + id_Unknown_846 = 846, + id_Unknown_847 = 847, + id_Unknown_848 = 848, + id_Unknown_849 = 849, + id_Unknown_850 = 850, + id_Unknown_851 = 851, + id_Unknown_852 = 852, + id_Unknown_853 = 853, id_Additional_EDCH_Cell_Information_ResponseRLReconf = 854, id_EDCH_Indicator = 855, id_DiversityMode = 856, @@ -948,7 +1123,13 @@ typedef enum _ProtocolIE_ID_enum { id_MulticellEDCH_RL_SpecificInformation = 868, id_DGNSS_ValidityPeriod = 869, id_TS0_HS_PDSCH_Indication_LCR = 870, - id_UE_TS0_CapabilityLCR = 871 + id_UE_TS0_CapabilityLCR = 871, + id_Non_Serving_RL_Preconfig_Info = 872, + id_Non_Serving_RL_Preconfig_Setup = 873, + id_Non_Serving_RL_Preconfig_Removal = 874, + id_Additional_E_DCH_Non_Serving_RL_Preconfiguration_Setup = 875, + id_Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList = 876, + id_CellListValidityIndicator = 877 } ProtocolIE_ID_enum; /*--- End of included file: packet-rnsap-val.h ---*/ @@ -2907,6 +3088,17 @@ static int hf_rnsap_eARFCN_Information = -1; /* EARFCN_Information */ static int hf_rnsap_NotProvidedCellList_item = -1; /* MBMSChannelTypeCellList */ static int hf_rnsap_uplinkNRTLoadInformationValue = -1; /* INTEGER_0_3 */ static int hf_rnsap_downlinkNRTLoadInformationValue = -1; /* INTEGER_0_3 */ +static int hf_rnsap_new_non_serving_RL_selection = -1; /* New_non_serving_RL_setup_selection */ +static int hf_rnsap_new_Serving_RL_in_DRNS = -1; /* NULL */ +static int hf_rnsap_new_Serving_RL_Not_in_DRNS = -1; /* NULL */ +static int hf_rnsap_new_Serving_RL_in_or_Not_in_DRNS = -1; /* NULL */ +static int hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_A = -1; /* EDCH_FDD_DL_ControlChannelInformation */ +static int hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_B = -1; /* EDCH_FDD_DL_ControlChannelInformation */ +static int hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_C = -1; /* EDCH_FDD_DL_ControlChannelInformation */ +static int hf_rnsap_Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList_item = -1; /* Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList_item */ +static int hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_A = -1; /* EDCH_FDD_DL_ControlChannelInformation */ +static int hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_B = -1; /* EDCH_FDD_DL_ControlChannelInformation */ +static int hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_C = -1; /* EDCH_FDD_DL_ControlChannelInformation */ static int hf_rnsap_measurementThreshold = -1; /* MeasurementThreshold */ static int hf_rnsap_informationThreshold = -1; /* InformationThreshold */ static int hf_rnsap_PCH_InformationList_item = -1; /* PCH_InformationItem */ @@ -4239,6 +4431,11 @@ static gint ett_rnsap_Neighbouring_E_UTRA_CellInformation = -1; static gint ett_rnsap_Neighbouring_E_UTRA_CellInformationItem = -1; static gint ett_rnsap_NotProvidedCellList = -1; static gint ett_rnsap_NRTLoadInformationValue = -1; +static gint ett_rnsap_Non_Serving_RL_Preconfig_Setup = -1; +static gint ett_rnsap_New_non_serving_RL_setup_selection = -1; +static gint ett_rnsap_Non_Serving_RL_Preconfig_Info = -1; +static gint ett_rnsap_Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList = -1; +static gint ett_rnsap_Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList_item = -1; static gint ett_rnsap_OnModification = -1; static gint ett_rnsap_OnModificationInformation = -1; static gint ett_rnsap_PCH_InformationList = -1; @@ -5087,6 +5284,7 @@ static const value_string rnsap_ProcedureCode_vals[] = { { RNSAP_ID_IURINVOKETRACE, "id-iurInvokeTrace" }, { RNSAP_ID_MBMSATTACH, "id-mBMSAttach" }, { RNSAP_ID_MBMSDETACH, "id-mBMSDetach" }, + { RNSAP_ID_NOT_USED_47, "id-Not-used-47" }, { RNSAP_ID_DIRECTINFORMATIONTRANSFER, "id-directInformationTransfer" }, { RNSAP_ID_ENHANCEDRELOCATION, "id-enhancedRelocation" }, { RNSAP_ID_ENHANCEDRELOCATIONCANCEL, "id-enhancedRelocationCancel" }, @@ -5106,7 +5304,7 @@ dissect_rnsap_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 255U, &ProcedureCode, FALSE); -#line 76 "rnsap.cnf" +#line 77 "rnsap.cnf" if (check_col(actx->pinfo->cinfo, COL_INFO)) col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", val_to_str_ext_const(ProcedureCode, &rnsap_ProcedureCode_vals_ext, @@ -5141,7 +5339,7 @@ static const per_sequence_t ProcedureID_sequence[] = { static int dissect_rnsap_ProcedureID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 84 "rnsap.cnf" +#line 85 "rnsap.cnf" ProcedureCode = 0xFFFF; ddMode = 0xFFFF; ProcedureID = NULL; @@ -5149,7 +5347,7 @@ dissect_rnsap_ProcedureID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_rnsap_ProcedureID, ProcedureID_sequence); -#line 90 "rnsap.cnf" +#line 91 "rnsap.cnf" ProcedureID = ep_strdup_printf("%s/%s", val_to_str_ext(ProcedureCode, &rnsap_ProcedureCode_vals_ext, "unknown(%u)"), val_to_str(ddMode, rnsap_DdMode_vals, "unknown(%u)")); @@ -5257,6 +5455,7 @@ static const value_string rnsap_ProtocolIE_ID_vals[] = { { id_DSCH_LCR_InformationListIEs_RL_AdditionRspTDD, "id-DSCH-LCR-InformationListIEs-RL-AdditionRspTDD" }, { id_USCH_LCR_InformationListIEs_RL_AdditionRspTDD, "id-USCH-LCR-InformationListIEs-RL-AdditionRspTDD" }, { id_UL_DPCH_LCR_InformationAddListIE_RL_ReconfReadyTDD, "id-UL-DPCH-LCR-InformationAddListIE-RL-ReconfReadyTDD" }, + { id_Unknown_99, "id-Unknown-99" }, { id_UL_Timeslot_LCR_InformationModifyList_RL_ReconfReadyTDD, "id-UL-Timeslot-LCR-InformationModifyList-RL-ReconfReadyTDD" }, { id_DL_DPCH_LCR_InformationAddListIE_RL_ReconfReadyTDD, "id-DL-DPCH-LCR-InformationAddListIE-RL-ReconfReadyTDD" }, { id_PagingArea_PagingRqst, "id-PagingArea-PagingRqst" }, @@ -5265,6 +5464,7 @@ static const value_string rnsap_ProtocolIE_ID_vals[] = { { id_UL_Timeslot_LCR_InformationList_PhyChReconfRqstTDD, "id-UL-Timeslot-LCR-InformationList-PhyChReconfRqstTDD" }, { id_DL_Timeslot_LCR_InformationList_PhyChReconfRqstTDD, "id-DL-Timeslot-LCR-InformationList-PhyChReconfRqstTDD" }, { id_PowerAdjustmentType, "id-PowerAdjustmentType" }, + { id_Unknown_108, "id-Unknown-108" }, { id_RANAP_RelocationInformation, "id-RANAP-RelocationInformation" }, { id_RL_Information_PhyChReconfRqstFDD, "id-RL-Information-PhyChReconfRqstFDD" }, { id_RL_Information_PhyChReconfRqstTDD, "id-RL-Information-PhyChReconfRqstTDD" }, @@ -5305,6 +5505,7 @@ static const value_string rnsap_ProtocolIE_ID_vals[] = { { id_RL_Set_Information_RL_FailureInd, "id-RL-Set-Information-RL-FailureInd" }, { id_RL_Set_Information_RL_RestoreInd, "id-RL-Set-Information-RL-RestoreInd" }, { id_Angle_Of_Arrival_Value_LCR, "id-Angle-Of-Arrival-Value-LCR" }, + { id_Unknown_149, "id-Unknown-149" }, { id_UL_SIR_Target_CCTrCH_InformationItem_RL_SetupRspTDD, "id-UL-SIR-Target-CCTrCH-InformationItem-RL-SetupRspTDD" }, { id_UL_SIR_Target_CCTrCH_LCR_InformationItem_RL_SetupRspTDD, "id-UL-SIR-Target-CCTrCH-LCR-InformationItem-RL-SetupRspTDD" }, { id_ReportCharacteristics, "id-ReportCharacteristics" }, @@ -5316,12 +5517,16 @@ static const value_string rnsap_ProtocolIE_ID_vals[] = { { id_TrafficClass, "id-TrafficClass" }, { id_SuccessfulRL_InformationResponse_RL_AdditionFailureFDD, "id-SuccessfulRL-InformationResponse-RL-AdditionFailureFDD" }, { id_SuccessfulRL_InformationResponse_RL_SetupFailureFDD, "id-SuccessfulRL-InformationResponse-RL-SetupFailureFDD" }, + { id_Unknown_161, "id-Unknown-161" }, + { id_Unknown_162, "id-Unknown-162" }, { id_TransportBearerID, "id-TransportBearerID" }, { id_TransportBearerRequestIndicator, "id-TransportBearerRequestIndicator" }, { id_TransportLayerAddress, "id-TransportLayerAddress" }, { id_UC_ID, "id-UC-ID" }, { id_UL_CCTrCH_AddInformation_RL_ReconfPrepTDD, "id-UL-CCTrCH-AddInformation-RL-ReconfPrepTDD" }, + { id_Unknown_168, "id-Unknown-168" }, { id_UL_CCTrCH_InformationAddList_RL_ReconfPrepTDD, "id-UL-CCTrCH-InformationAddList-RL-ReconfPrepTDD" }, + { id_Unknown_170, "id-Unknown-170" }, { id_UL_CCTrCH_InformationItem_RL_SetupRqstTDD, "id-UL-CCTrCH-InformationItem-RL-SetupRqstTDD" }, { id_UL_CCTrCH_InformationList_RL_SetupRqstTDD, "id-UL-CCTrCH-InformationList-RL-SetupRqstTDD" }, { id_UL_CCTrCH_InformationListIE_PhyChReconfRqstTDD, "id-UL-CCTrCH-InformationListIE-PhyChReconfRqstTDD" }, @@ -5337,11 +5542,17 @@ static const value_string rnsap_ProtocolIE_ID_vals[] = { { id_UL_DPCH_InformationAddListIE_RL_ReconfReadyTDD, "id-UL-DPCH-InformationAddListIE-RL-ReconfReadyTDD" }, { id_UL_SIRTarget, "id-UL-SIRTarget" }, { id_URA_Information, "id-URA-Information" }, + { id_Unknown_186, "id-Unknown-186" }, + { id_Unknown_187, "id-Unknown-187" }, { id_UnsuccessfulRL_InformationResponse_RL_AdditionFailureFDD, "id-UnsuccessfulRL-InformationResponse-RL-AdditionFailureFDD" }, { id_UnsuccessfulRL_InformationResponse_RL_SetupFailureFDD, "id-UnsuccessfulRL-InformationResponse-RL-SetupFailureFDD" }, { id_UnsuccessfulRL_InformationResponse_RL_SetupFailureTDD, "id-UnsuccessfulRL-InformationResponse-RL-SetupFailureTDD" }, + { id_Unknown_191, "id-Unknown-191" }, + { id_Unknown_192, "id-Unknown-192" }, { id_Active_Pattern_Sequence_Information, "id-Active-Pattern-Sequence-Information" }, { id_AdjustmentRatio, "id-AdjustmentRatio" }, + { id_Unknown_195, "id-Unknown-195" }, + { id_Unknown_196, "id-Unknown-196" }, { id_CauseLevel_RL_AdditionFailureFDD, "id-CauseLevel-RL-AdditionFailureFDD" }, { id_CauseLevel_RL_AdditionFailureTDD, "id-CauseLevel-RL-AdditionFailureTDD" }, { id_CauseLevel_RL_ReconfFailure, "id-CauseLevel-RL-ReconfFailure" }, @@ -5376,6 +5587,7 @@ static const value_string rnsap_ProtocolIE_ID_vals[] = { { id_Unused_ProtocolIE_ID_228, "id-Unused-ProtocolIE-ID-228" }, { id_Unused_ProtocolIE_ID_229, "id-Unused-ProtocolIE-ID-229" }, { id_DSCHToBeAddedOrModifiedList_RL_ReconfReadyTDD, "id-DSCHToBeAddedOrModifiedList-RL-ReconfReadyTDD" }, + { id_Unknown_231, "id-Unknown-231" }, { id_GA_Cell, "id-GA-Cell" }, { id_Load_Value, "id-Load-Value" }, { id_Load_Value_IncrDecrThres, "id-Load-Value-IncrDecrThres" }, @@ -5398,6 +5610,7 @@ static const value_string rnsap_ProtocolIE_ID_vals[] = { { id_neighbouringTDDCellMeasurementInformationLCR, "id-neighbouringTDDCellMeasurementInformationLCR" }, { id_IPDL_TDD_ParametersLCR, "id-IPDL-TDD-ParametersLCR" }, { id_Unused_ProtocolIE_ID_253, "id-Unused-ProtocolIE-ID-253" }, + { id_Unknown_254, "id-Unknown-254" }, { id_Transmission_Gap_Pattern_Sequence_Information, "id-Transmission-Gap-Pattern-Sequence-Information" }, { id_UL_CCTrCH_DeleteInformation_RL_ReconfPrepTDD, "id-UL-CCTrCH-DeleteInformation-RL-ReconfPrepTDD" }, { id_UL_CCTrCH_ModifyInformation_RL_ReconfPrepTDD, "id-UL-CCTrCH-ModifyInformation-RL-ReconfPrepTDD" }, @@ -5437,6 +5650,7 @@ static const value_string rnsap_ProtocolIE_ID_vals[] = { { id_InformationReportCharacteristics, "id-InformationReportCharacteristics" }, { id_InformationType, "id-InformationType" }, { id_Rx_Timing_Deviation_Value_LCR, "id-Rx-Timing-Deviation-Value-LCR" }, + { id_Unknown_294, "id-Unknown-294" }, { id_Unused_ProtocolIE_ID_295, "id-Unused-ProtocolIE-ID-295" }, { id_DL_PowerBalancing_Information, "id-DL-PowerBalancing-Information" }, { id_DL_PowerBalancing_ActivationIndicator, "id-DL-PowerBalancing-ActivationIndicator" }, @@ -5446,6 +5660,7 @@ static const value_string rnsap_ProtocolIE_ID_vals[] = { { id_CellCapabilityContainer_TDD, "id-CellCapabilityContainer-TDD" }, { id_CellCapabilityContainer_TDD_LCR, "id-CellCapabilityContainer-TDD-LCR" }, { id_Cell_Capacity_Class_Value, "id-Cell-Capacity-Class-Value" }, + { id_Unknown_305, "id-Unknown-305" }, { id_NRT_Load_Information_Value, "id-NRT-Load-Information-Value" }, { id_NRT_Load_Information_Value_IncrDecrThres, "id-NRT-Load-Information-Value-IncrDecrThres" }, { id_RT_Load_Value, "id-RT-Load-Value" }, @@ -5461,17 +5676,149 @@ static const value_string rnsap_ProtocolIE_ID_vals[] = { { id_RL_Specific_DCH_Info, "id-RL-Specific-DCH-Info" }, { id_RL_ReconfigurationRequestFDD_RL_InformationList, "id-RL-ReconfigurationRequestFDD-RL-InformationList" }, { id_RL_ReconfigurationRequestFDD_RL_Information_IEs, "id-RL-ReconfigurationRequestFDD-RL-Information-IEs" }, + { id_Unknown_320, "id-Unknown-320" }, { id_RL_ReconfigurationRequestTDD_RL_Information, "id-RL-ReconfigurationRequestTDD-RL-Information" }, + { id_Unknown_322, "id-Unknown-322" }, { id_PDSCH_RL_ID, "id-PDSCH-RL-ID" }, { id_Unused_ProtocolIE_ID_324, "id-Unused-ProtocolIE-ID-324" }, { id_TimeSlot_RL_SetupRspTDD, "id-TimeSlot-RL-SetupRspTDD" }, + { id_Unknown_326, "id-Unknown-326" }, + { id_Unknown_327, "id-Unknown-327" }, + { id_Unknown_328, "id-Unknown-328" }, + { id_Unknown_329, "id-Unknown-329" }, + { id_Unknown_330, "id-Unknown-330" }, + { id_Unknown_331, "id-Unknown-331" }, + { id_Unknown_332, "id-Unknown-332" }, + { id_Unknown_333, "id-Unknown-333" }, + { id_Unknown_334, "id-Unknown-334" }, + { id_Unknown_335, "id-Unknown-335" }, + { id_Unknown_336, "id-Unknown-336" }, + { id_Unknown_337, "id-Unknown-337" }, + { id_Unknown_338, "id-Unknown-338" }, + { id_Unknown_339, "id-Unknown-339" }, + { id_Unknown_340, "id-Unknown-340" }, + { id_Unknown_341, "id-Unknown-341" }, + { id_Unknown_342, "id-Unknown-342" }, + { id_Unknown_343, "id-Unknown-343" }, + { id_Unknown_344, "id-Unknown-344" }, + { id_Unknown_345, "id-Unknown-345" }, + { id_Unknown_346, "id-Unknown-346" }, + { id_Unknown_347, "id-Unknown-347" }, + { id_Unknown_348, "id-Unknown-348" }, + { id_Unknown_349, "id-Unknown-349" }, + { id_Unknown_350, "id-Unknown-350" }, + { id_Unknown_351, "id-Unknown-351" }, + { id_Unknown_352, "id-Unknown-352" }, + { id_Unknown_353, "id-Unknown-353" }, + { id_Unknown_354, "id-Unknown-354" }, + { id_Unknown_355, "id-Unknown-355" }, + { id_Unknown_356, "id-Unknown-356" }, + { id_Unknown_357, "id-Unknown-357" }, + { id_Unknown_358, "id-Unknown-358" }, + { id_Unknown_359, "id-Unknown-359" }, + { id_Unknown_360, "id-Unknown-360" }, + { id_Unknown_361, "id-Unknown-361" }, + { id_Unknown_362, "id-Unknown-362" }, + { id_Unknown_363, "id-Unknown-363" }, + { id_Unknown_364, "id-Unknown-364" }, + { id_Unknown_365, "id-Unknown-365" }, + { id_Unknown_366, "id-Unknown-366" }, + { id_Unknown_367, "id-Unknown-367" }, + { id_Unknown_368, "id-Unknown-368" }, + { id_Unknown_369, "id-Unknown-369" }, + { id_Unknown_370, "id-Unknown-370" }, + { id_Unknown_371, "id-Unknown-371" }, + { id_Unknown_372, "id-Unknown-372" }, + { id_Unknown_373, "id-Unknown-373" }, + { id_Unknown_374, "id-Unknown-374" }, + { id_Unknown_375, "id-Unknown-375" }, + { id_Unknown_376, "id-Unknown-376" }, + { id_Unknown_377, "id-Unknown-377" }, + { id_Unknown_378, "id-Unknown-378" }, + { id_Unknown_379, "id-Unknown-379" }, + { id_Unknown_380, "id-Unknown-380" }, + { id_Unknown_381, "id-Unknown-381" }, + { id_Unknown_382, "id-Unknown-382" }, + { id_Unknown_383, "id-Unknown-383" }, + { id_Unknown_384, "id-Unknown-384" }, + { id_Unknown_385, "id-Unknown-385" }, + { id_Unknown_386, "id-Unknown-386" }, + { id_Unknown_387, "id-Unknown-387" }, + { id_Unknown_388, "id-Unknown-388" }, + { id_Unknown_389, "id-Unknown-389" }, + { id_Unknown_390, "id-Unknown-390" }, + { id_Unknown_391, "id-Unknown-391" }, + { id_Unknown_392, "id-Unknown-392" }, + { id_Unknown_393, "id-Unknown-393" }, + { id_Unknown_394, "id-Unknown-394" }, + { id_Unknown_395, "id-Unknown-395" }, + { id_Unknown_396, "id-Unknown-396" }, + { id_Unknown_397, "id-Unknown-397" }, + { id_Unknown_398, "id-Unknown-398" }, + { id_Unknown_399, "id-Unknown-399" }, + { id_Unknown_400, "id-Unknown-400" }, + { id_Unknown_401, "id-Unknown-401" }, + { id_Unknown_402, "id-Unknown-402" }, + { id_Unknown_403, "id-Unknown-403" }, + { id_Unknown_404, "id-Unknown-404" }, + { id_Unknown_405, "id-Unknown-405" }, + { id_Unknown_406, "id-Unknown-406" }, + { id_Unknown_407, "id-Unknown-407" }, + { id_Unknown_408, "id-Unknown-408" }, + { id_Unknown_409, "id-Unknown-409" }, + { id_Unknown_410, "id-Unknown-410" }, + { id_Unknown_411, "id-Unknown-411" }, + { id_Unknown_412, "id-Unknown-412" }, + { id_Unknown_413, "id-Unknown-413" }, + { id_Unknown_414, "id-Unknown-414" }, + { id_Unknown_415, "id-Unknown-415" }, + { id_Unknown_416, "id-Unknown-416" }, + { id_Unknown_417, "id-Unknown-417" }, + { id_Unknown_418, "id-Unknown-418" }, + { id_Unknown_419, "id-Unknown-419" }, + { id_Unknown_420, "id-Unknown-420" }, + { id_Unknown_421, "id-Unknown-421" }, + { id_Unknown_422, "id-Unknown-422" }, + { id_Unknown_423, "id-Unknown-423" }, + { id_Unknown_424, "id-Unknown-424" }, + { id_Unknown_425, "id-Unknown-425" }, + { id_Unknown_426, "id-Unknown-426" }, + { id_Unknown_427, "id-Unknown-427" }, + { id_Unknown_428, "id-Unknown-428" }, + { id_Unknown_429, "id-Unknown-429" }, + { id_Unknown_430, "id-Unknown-430" }, + { id_Unknown_431, "id-Unknown-431" }, + { id_Unknown_432, "id-Unknown-432" }, + { id_Unknown_433, "id-Unknown-433" }, + { id_Unknown_434, "id-Unknown-434" }, + { id_Unknown_435, "id-Unknown-435" }, + { id_Unknown_436, "id-Unknown-436" }, + { id_Unknown_437, "id-Unknown-437" }, + { id_Unknown_438, "id-Unknown-438" }, + { id_Unknown_439, "id-Unknown-439" }, + { id_Unknown_440, "id-Unknown-440" }, + { id_Unknown_441, "id-Unknown-441" }, + { id_Unknown_442, "id-Unknown-442" }, + { id_Unknown_443, "id-Unknown-443" }, + { id_Unknown_444, "id-Unknown-444" }, + { id_Unknown_445, "id-Unknown-445" }, + { id_Unknown_446, "id-Unknown-446" }, + { id_Unknown_447, "id-Unknown-447" }, + { id_Unknown_448, "id-Unknown-448" }, + { id_Unknown_449, "id-Unknown-449" }, + { id_Unknown_450, "id-Unknown-450" }, { id_PrimCCPCH_RSCP_DL_PC_RqstTDD, "id-PrimCCPCH-RSCP-DL-PC-RqstTDD" }, { id_HSDSCH_FDD_Information, "id-HSDSCH-FDD-Information" }, { id_HSDSCH_FDD_Information_Response, "id-HSDSCH-FDD-Information-Response" }, + { id_Unknown_454, "id-Unknown-454" }, + { id_Unknown_455, "id-Unknown-455" }, { id_HSDSCH_Information_to_Modify, "id-HSDSCH-Information-to-Modify" }, { id_HSDSCH_RNTI, "id-HSDSCH-RNTI" }, { id_HSDSCH_TDD_Information, "id-HSDSCH-TDD-Information" }, { id_HSDSCH_TDD_Information_Response, "id-HSDSCH-TDD-Information-Response" }, + { id_Unknown_460, "id-Unknown-460" }, + { id_Unknown_461, "id-Unknown-461" }, + { id_Unknown_462, "id-Unknown-462" }, { id_HSPDSCH_RL_ID, "id-HSPDSCH-RL-ID" }, { id_UL_Synchronisation_Parameters_LCR, "id-UL-Synchronisation-Parameters-LCR" }, { id_MAChs_ResetIndicator, "id-MAChs-ResetIndicator" }, @@ -5574,8 +5921,12 @@ static const value_string rnsap_ProtocolIE_ID_vals[] = { { id_Active_MBMS_Bearer_ServiceFDD, "id-Active-MBMS-Bearer-ServiceFDD" }, { id_Active_MBMS_Bearer_ServiceTDD, "id-Active-MBMS-Bearer-ServiceTDD" }, { id_Old_URA_ID, "id-Old-URA-ID" }, + { id_Unknown_565, "id-Unknown-565" }, + { id_Unknown_566, "id-Unknown-566" }, + { id_Unknown_567, "id-Unknown-567" }, { id_UE_State, "id-UE-State" }, { id_URA_ID, "id-URA-ID" }, + { id_Unknown_570, "id-Unknown-570" }, { id_HARQ_Preamble_Mode, "id-HARQ-Preamble-Mode" }, { id_SynchronisationIndicator, "id-SynchronisationIndicator" }, { id_UL_DPDCHIndicatorEDCH, "id-UL-DPDCHIndicatorEDCH" }, @@ -5679,7 +6030,9 @@ static const value_string rnsap_ProtocolIE_ID_vals[] = { { id_Continuous_Packet_Connectivity_HS_SCCH_Less_Information, "id-Continuous-Packet-Connectivity-HS-SCCH-Less-Information" }, { id_Continuous_Packet_Connectivity_HS_SCCH_Less_Information_Response, "id-Continuous-Packet-Connectivity-HS-SCCH-Less-Information-Response" }, { id_CPC_Information, "id-CPC-Information" }, + { id_Unknown_674, "id-Unknown-674" }, { id_MIMO_InformationResponse, "id-MIMO-InformationResponse" }, + { id_Unknown_676, "id-Unknown-676" }, { id_E_DCH_LCR_Information, "id-E-DCH-LCR-Information" }, { id_E_DCH_LCR_Information_Reconfig, "id-E-DCH-LCR-Information-Reconfig" }, { id_E_DCH_LCR_Information_Response, "id-E-DCH-LCR-Information-Response" }, @@ -5690,17 +6043,24 @@ static const value_string rnsap_ProtocolIE_ID_vals[] = { { id_SixtyfourQAM_DL_SupportIndicator, "id-SixtyfourQAM-DL-SupportIndicator" }, { id_Enhanced_FACH_Support_Indicator, "id-Enhanced-FACH-Support-Indicator" }, { id_Enhanced_FACH_Information_ResponseFDD, "id-Enhanced-FACH-Information-ResponseFDD" }, + { id_Unknown_687, "id-Unknown-687" }, + { id_Unknown_688, "id-Unknown-688" }, + { id_Unknown_689, "id-Unknown-689" }, { id_HSDSCH_MACdPDUSizeFormat, "id-HSDSCH-MACdPDUSizeFormat" }, { id_MaximumMACdPDU_SizeExtended, "id-MaximumMACdPDU-SizeExtended" }, { id_F_DPCH_SlotFormat, "id-F-DPCH-SlotFormat" }, { id_F_DPCH_SlotFormatSupportRequest, "id-F-DPCH-SlotFormatSupportRequest" }, { id_eDCH_MACdFlow_Retransmission_Timer_LCR, "id-eDCH-MACdFlow-Retransmission-Timer-LCR" }, { id_Max_UE_DTX_Cycle, "id-Max-UE-DTX-Cycle" }, + { id_Unknown_696, "id-Unknown-696" }, + { id_Unknown_697, "id-Unknown-697" }, + { id_Unknown_698, "id-Unknown-698" }, { id_GANSS_Common_Data, "id-GANSS-Common-Data" }, { id_GANSS_Information, "id-GANSS-Information" }, { id_GANSS_Generic_Data, "id-GANSS-Generic-Data" }, { id_TUTRANGANSSMeasurementThresholdInformation, "id-TUTRANGANSSMeasurementThresholdInformation" }, { id_TUTRANGANSSMeasurementValueInformation, "id-TUTRANGANSSMeasurementValueInformation" }, + { id_Unknown_704, "id-Unknown-704" }, { id_Ext_Reference_E_TFCI_PO, "id-Ext-Reference-E-TFCI-PO" }, { id_Ext_Max_Bits_MACe_PDU_non_scheduled, "id-Ext-Max-Bits-MACe-PDU-non-scheduled" }, { id_HARQ_MemoryPartitioningInfoExtForMIMO, "id-HARQ-MemoryPartitioningInfoExtForMIMO" }, @@ -5764,6 +6124,7 @@ static const value_string rnsap_ProtocolIE_ID_vals[] = { { id_MBMS_RLC_Sequence_Number_Information, "id-MBMS-RLC-Sequence-Number-Information" }, { id_RLC_Sequence_Number, "id-RLC-Sequence-Number" }, { id_Neighbouring_E_UTRA_CellInformation, "id-Neighbouring-E-UTRA-CellInformation" }, + { id_Unknown_768, "id-Unknown-768" }, { id_MBSFN_Cluster_Identity, "id-MBSFN-Cluster-Identity" }, { id_MCCH_Configuration_Info, "id-MCCH-Configuration-Info" }, { id_MCCH_Message_List, "id-MCCH-Message-List" }, @@ -5827,6 +6188,9 @@ static const value_string rnsap_ProtocolIE_ID_vals[] = { { id_power_offset_for_S_CPICH_for_MIMO, "id-power-offset-for-S-CPICH-for-MIMO" }, { id_power_offset_for_S_CPICH_for_MIMO_Request_Indicator, "id-power-offset-for-S-CPICH-for-MIMO-Request-Indicator" }, { id_UE_SupportIndicatorExtension, "id-UE-SupportIndicatorExtension" }, + { id_Unknown_832, "id-Unknown-832" }, + { id_Unknown_833, "id-Unknown-833" }, + { id_Unknown_834, "id-Unknown-834" }, { id_ActivationInformation, "id-ActivationInformation" }, { id_CellPortionLCRID, "id-CellPortionLCRID" }, { id_Additional_EDCH_Cell_Information_RL_Setup_Req, "id-Additional-EDCH-Cell-Information-RL-Setup-Req" }, @@ -5838,6 +6202,14 @@ static const value_string rnsap_ProtocolIE_ID_vals[] = { { id_Additional_EDCH_Cell_Information_RL_Param_Upd, "id-Additional-EDCH-Cell-Information-RL-Param-Upd" }, { id_Additional_EDCH_Preconfiguration_Information, "id-Additional-EDCH-Preconfiguration-Information" }, { id_MulticellEDCH_Information, "id-MulticellEDCH-Information" }, + { id_Unknown_846, "id-Unknown-846" }, + { id_Unknown_847, "id-Unknown-847" }, + { id_Unknown_848, "id-Unknown-848" }, + { id_Unknown_849, "id-Unknown-849" }, + { id_Unknown_850, "id-Unknown-850" }, + { id_Unknown_851, "id-Unknown-851" }, + { id_Unknown_852, "id-Unknown-852" }, + { id_Unknown_853, "id-Unknown-853" }, { id_Additional_EDCH_Cell_Information_ResponseRLReconf, "id-Additional-EDCH-Cell-Information-ResponseRLReconf" }, { id_EDCH_Indicator, "id-EDCH-Indicator" }, { id_DiversityMode, "id-DiversityMode" }, @@ -5856,6 +6228,12 @@ static const value_string rnsap_ProtocolIE_ID_vals[] = { { id_DGNSS_ValidityPeriod, "id-DGNSS-ValidityPeriod" }, { id_TS0_HS_PDSCH_Indication_LCR, "id-TS0-HS-PDSCH-Indication-LCR" }, { id_UE_TS0_CapabilityLCR, "id-UE-TS0-CapabilityLCR" }, + { id_Non_Serving_RL_Preconfig_Info, "id-Non-Serving-RL-Preconfig-Info" }, + { id_Non_Serving_RL_Preconfig_Setup, "id-Non-Serving-RL-Preconfig-Setup" }, + { id_Non_Serving_RL_Preconfig_Removal, "id-Non-Serving-RL-Preconfig-Removal" }, + { id_Additional_E_DCH_Non_Serving_RL_Preconfiguration_Setup, "id-Additional-E-DCH-Non-Serving-RL-Preconfiguration-Setup" }, + { id_Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList, "id-Additional-E-DCH-New-non-serving-RL-E-DCH-FDD-DL-Control-Channel-InfoList" }, + { id_CellListValidityIndicator, "id-CellListValidityIndicator" }, { 0, NULL } }; @@ -8516,6 +8894,23 @@ dissect_rnsap_CellIndividualOffset(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t } +static const value_string rnsap_CellListValidityIndicator_vals[] = { + { 0, "ignoreSecondaryServingCellList" }, + { 1, "ignoreDualBandSecondaryServingCellList" }, + { 2, "ignoreBoth" }, + { 0, NULL } +}; + + +static int +dissect_rnsap_CellListValidityIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, + 3, NULL, FALSE, 0, NULL); + + return offset; +} + + static int dissect_rnsap_CellParameterID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -22531,7 +22926,7 @@ dissect_rnsap_List_Of_PLMNs(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx static int dissect_rnsap_L3_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 103 "rnsap.cnf" +#line 104 "rnsap.cnf" tvbuff_t *parameter_tvb; dissector_handle_t parameter_handle = NULL; @@ -23085,6 +23480,8 @@ static const value_string rnsap_MeasurementFilterCoefficient_vals[] = { { 0, NULL } }; +static value_string_ext rnsap_MeasurementFilterCoefficient_vals_ext = VALUE_STRING_EXT_INIT(rnsap_MeasurementFilterCoefficient_vals); + static int dissect_rnsap_MeasurementFilterCoefficient(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -23867,6 +24264,102 @@ dissect_rnsap_NoOfTargetCellHS_SCCH_Order(tvbuff_t *tvb _U_, int offset _U_, asn } +static const value_string rnsap_New_non_serving_RL_setup_selection_vals[] = { + { 0, "new-Serving-RL-in-DRNS" }, + { 1, "new-Serving-RL-Not-in-DRNS" }, + { 2, "new-Serving-RL-in-or-Not-in-DRNS" }, + { 0, NULL } +}; + +static const per_choice_t New_non_serving_RL_setup_selection_choice[] = { + { 0, &hf_rnsap_new_Serving_RL_in_DRNS, ASN1_EXTENSION_ROOT , dissect_rnsap_NULL }, + { 1, &hf_rnsap_new_Serving_RL_Not_in_DRNS, ASN1_EXTENSION_ROOT , dissect_rnsap_NULL }, + { 2, &hf_rnsap_new_Serving_RL_in_or_Not_in_DRNS, ASN1_EXTENSION_ROOT , dissect_rnsap_NULL }, + { 0, NULL, 0, NULL } +}; + +static int +dissect_rnsap_New_non_serving_RL_setup_selection(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, + ett_rnsap_New_non_serving_RL_setup_selection, New_non_serving_RL_setup_selection_choice, + NULL); + + return offset; +} + + +static const per_sequence_t Non_Serving_RL_Preconfig_Setup_sequence[] = { + { &hf_rnsap_new_non_serving_RL_selection, ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_rnsap_New_non_serving_RL_setup_selection }, + { &hf_rnsap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_rnsap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_rnsap_Non_Serving_RL_Preconfig_Setup(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_rnsap_Non_Serving_RL_Preconfig_Setup, Non_Serving_RL_Preconfig_Setup_sequence); + + return offset; +} + + + +static int +dissect_rnsap_Additional_E_DCH_Non_Serving_RL_Preconfiguration_Setup(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_null(tvb, offset, actx, tree, hf_index); + + return offset; +} + + +static const per_sequence_t Non_Serving_RL_Preconfig_Info_sequence[] = { + { &hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_A, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_rnsap_EDCH_FDD_DL_ControlChannelInformation }, + { &hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_B, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_rnsap_EDCH_FDD_DL_ControlChannelInformation }, + { &hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_C, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_rnsap_EDCH_FDD_DL_ControlChannelInformation }, + { &hf_rnsap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_rnsap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_rnsap_Non_Serving_RL_Preconfig_Info(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_rnsap_Non_Serving_RL_Preconfig_Info, Non_Serving_RL_Preconfig_Info_sequence); + + return offset; +} + + +static const per_sequence_t Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList_item_sequence[] = { + { &hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_A, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_rnsap_EDCH_FDD_DL_ControlChannelInformation }, + { &hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_B, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_rnsap_EDCH_FDD_DL_ControlChannelInformation }, + { &hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_C, ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_rnsap_EDCH_FDD_DL_ControlChannelInformation }, + { &hf_rnsap_iE_Extensions , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_rnsap_ProtocolExtensionContainer }, + { NULL, 0, 0, NULL } +}; + +static int +dissect_rnsap_Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, + ett_rnsap_Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList_item, Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList_item_sequence); + + return offset; +} + + +static const per_sequence_t Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList_sequence_of[1] = { + { &hf_rnsap_Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList_item, ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_rnsap_Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList_item }, +}; + +static int +dissect_rnsap_Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { + offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index, + ett_rnsap_Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList, Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList_sequence_of, + 1, maxNrOfEDCH_1, FALSE); + + return offset; +} + + static const value_string rnsap_NeedforIdleInterval_vals[] = { { 0, "true" }, { 1, "false" }, @@ -43608,7 +44101,7 @@ void proto_register_rnsap(void) { NULL, HFILL }}, { &hf_rnsap_MeasurementFilterCoefficient_PDU, { "MeasurementFilterCoefficient", "rnsap.MeasurementFilterCoefficient", - FT_UINT32, BASE_DEC, VALS(rnsap_MeasurementFilterCoefficient_vals), 0, + FT_UINT32, BASE_DEC|BASE_EXT_STRING, &rnsap_MeasurementFilterCoefficient_vals_ext, 0, NULL, HFILL }}, { &hf_rnsap_MeasurementID_PDU, { "MeasurementID", "rnsap.MeasurementID", @@ -50450,6 +50943,50 @@ void proto_register_rnsap(void) { { "downlinkNRTLoadInformationValue", "rnsap.downlinkNRTLoadInformationValue", FT_UINT32, BASE_DEC, NULL, 0, "INTEGER_0_3", HFILL }}, + { &hf_rnsap_new_non_serving_RL_selection, + { "new-non-serving-RL-selection", "rnsap.new_non_serving_RL_selection", + FT_UINT32, BASE_DEC, VALS(rnsap_New_non_serving_RL_setup_selection_vals), 0, + "New_non_serving_RL_setup_selection", HFILL }}, + { &hf_rnsap_new_Serving_RL_in_DRNS, + { "new-Serving-RL-in-DRNS", "rnsap.new_Serving_RL_in_DRNS", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_rnsap_new_Serving_RL_Not_in_DRNS, + { "new-Serving-RL-Not-in-DRNS", "rnsap.new_Serving_RL_Not_in_DRNS", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_rnsap_new_Serving_RL_in_or_Not_in_DRNS, + { "new-Serving-RL-in-or-Not-in-DRNS", "rnsap.new_Serving_RL_in_or_Not_in_DRNS", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_A, + { "new-non-serving-RL-E-DCH-FDD-DL-ControlChannelInformation-A", "rnsap.new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_A", + FT_NONE, BASE_NONE, NULL, 0, + "EDCH_FDD_DL_ControlChannelInformation", HFILL }}, + { &hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_B, + { "new-non-serving-RL-E-DCH-FDD-DL-ControlChannelInformation-B", "rnsap.new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_B", + FT_NONE, BASE_NONE, NULL, 0, + "EDCH_FDD_DL_ControlChannelInformation", HFILL }}, + { &hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_C, + { "new-non-serving-RL-E-DCH-FDD-DL-ControlChannelInformation-C", "rnsap.new_non_serving_RL_E_DCH_FDD_DL_ControlChannelInformation_C", + FT_NONE, BASE_NONE, NULL, 0, + "EDCH_FDD_DL_ControlChannelInformation", HFILL }}, + { &hf_rnsap_Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList_item, + { "Additional-E-DCH-New-non-serving-RL-E-DCH-FDD-DL-Control-Channel-InfoList item", "rnsap.Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList_item", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, + { &hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_A, + { "new-non-serving-RL-E-DCH-FDD-DL-Control-Channel-Information-A", "rnsap.new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_A", + FT_NONE, BASE_NONE, NULL, 0, + "EDCH_FDD_DL_ControlChannelInformation", HFILL }}, + { &hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_B, + { "new-non-serving-RL-E-DCH-FDD-DL-Control-Channel-Information-B", "rnsap.new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_B", + FT_NONE, BASE_NONE, NULL, 0, + "EDCH_FDD_DL_ControlChannelInformation", HFILL }}, + { &hf_rnsap_new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_C, + { "new-non-serving-RL-E-DCH-FDD-DL-Control-Channel-Information-C", "rnsap.new_non_serving_RL_E_DCH_FDD_DL_Control_Channel_Information_C", + FT_NONE, BASE_NONE, NULL, 0, + "EDCH_FDD_DL_ControlChannelInformation", HFILL }}, { &hf_rnsap_measurementThreshold, { "measurementThreshold", "rnsap.measurementThreshold", FT_UINT32, BASE_DEC, VALS(rnsap_MeasurementThreshold_vals), 0, @@ -54078,6 +54615,11 @@ void proto_register_rnsap(void) { &ett_rnsap_Neighbouring_E_UTRA_CellInformationItem, &ett_rnsap_NotProvidedCellList, &ett_rnsap_NRTLoadInformationValue, + &ett_rnsap_Non_Serving_RL_Preconfig_Setup, + &ett_rnsap_New_non_serving_RL_setup_selection, + &ett_rnsap_Non_Serving_RL_Preconfig_Info, + &ett_rnsap_Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList, + &ett_rnsap_Additional_E_DCH_New_non_serving_RL_E_DCH_FDD_DL_Control_Channel_InfoList_item, &ett_rnsap_OnModification, &ett_rnsap_OnModificationInformation, &ett_rnsap_PCH_InformationList, |