UMTS RRC updated to 3GPP TS 25.331 V7.4.0 (2007-03) and moved to one directory
authorkukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 25 May 2007 06:54:39 +0000 (06:54 +0000)
committerkukosa <kukosa@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 25 May 2007 06:54:39 +0000 (06:54 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21931 f5534014-38df-0310-8fa8-9805f1628bb7

43 files changed:
asn1/Makefile.am
asn1/Makefile.nmake
asn1/rrc/Class-definitions.asn [new file with mode: 0644]
asn1/rrc/Constant-definitions.asn [new file with mode: 0644]
asn1/rrc/InformationElements.asn [moved from asn1/umts_rrc_ies/umts_rrc_InformationElements.asn with 77% similarity]
asn1/rrc/Internode-definitions.asn [moved from asn1/umts_rrc_Internode-defs/umts_rrc_Internode-definitions.asn with 75% similarity]
asn1/rrc/Makefile [new file with mode: 0644]
asn1/rrc/Makefile.nmake [moved from asn1/umts_rrc/Makefile.nmake with 57% similarity]
asn1/rrc/PDU-definitions.asn [moved from asn1/umts_rrc_pdu_def/umts_rrc_PDU-definitions.asn with 74% similarity]
asn1/rrc/packet-rrc-template.c [moved from asn1/umts_rrc/packet-umts_rrc-template.c with 58% similarity]
asn1/rrc/rrc.cnf [new file with mode: 0644]
asn1/umts_rrc/Makefile [deleted file]
asn1/umts_rrc/packet-umts_rrc-template.h [deleted file]
asn1/umts_rrc/umts_rrc-exp.cnf [deleted file]
asn1/umts_rrc/umts_rrc.cnf [deleted file]
asn1/umts_rrc/umts_rrc_Class-definitions.asn [deleted file]
asn1/umts_rrc_Internode-defs/Makefile [deleted file]
asn1/umts_rrc_Internode-defs/Makefile.nmake [deleted file]
asn1/umts_rrc_Internode-defs/packet-umts_rrc_internode-defs-template.c [deleted file]
asn1/umts_rrc_Internode-defs/packet-umts_rrc_internode-defs-template.h [deleted file]
asn1/umts_rrc_Internode-defs/umts_rrc_internode-defs-exp.cnf [deleted file]
asn1/umts_rrc_Internode-defs/umts_rrc_internode-defs.cnf [deleted file]
asn1/umts_rrc_ies/Makefile [deleted file]
asn1/umts_rrc_ies/Makefile.nmake [deleted file]
asn1/umts_rrc_ies/packet-umts_rrc_ies-template.c [deleted file]
asn1/umts_rrc_ies/packet-umts_rrc_ies-template.h [deleted file]
asn1/umts_rrc_ies/umts_rrc_ies-exp.cnf [deleted file]
asn1/umts_rrc_ies/umts_rrc_ies.cnf [deleted file]
asn1/umts_rrc_pdu_def/Makefile [deleted file]
asn1/umts_rrc_pdu_def/Makefile.nmake [deleted file]
asn1/umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.c [deleted file]
asn1/umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.h [deleted file]
asn1/umts_rrc_pdu_def/umts_rrc_pdu_def-exp.cnf [deleted file]
asn1/umts_rrc_pdu_def/umts_rrc_pdu_def.cnf [deleted file]
epan/dissectors/Makefile.common
epan/dissectors/Makefile.nmake
epan/dissectors/packet-rrc.c [new file with mode: 0644]
epan/dissectors/packet-umts_rrc.c [deleted file]
epan/dissectors/packet-umts_rrc.h [deleted file]
epan/dissectors/packet-umts_rrc_ies.c [deleted file]
epan/dissectors/packet-umts_rrc_ies.h [deleted file]
epan/dissectors/packet-umts_rrc_pdu_def.c [deleted file]
epan/dissectors/packet-umts_rrc_pdu_def.h [deleted file]

index 1b3e9d9783a855f48276fb514f191fd1955a2cbc..2928f5c711a2f75c3c8e8e3f335686be950f6cae 100644 (file)
@@ -345,6 +345,15 @@ EXTRA_DIST = \
        ros/ros.asn     \
        ros/ros.cnf     \
        ros/ros-exp.cnf \
+       rrc/Makefile    \
+       rrc/Makefile.nmake      \
+       rrc/packet-rrc-template.c       \
+       rrc/Class-definitions.asn       \
+       rrc/PDU-definitions.asn \
+       rrc/InformationElements.asn \
+       rrc/Constant-definitions.asn \
+       rrc/Internode-definitions.asn   \
+       rrc/rrc.cnf     \
        rrlp/Makefile   \
        rrlp/Makefile.nmake     \
        rrlp/packet-rrlp-template.c     \
@@ -403,27 +412,6 @@ EXTRA_DIST = \
        ulp/SUPL.asn    \
        ulp/ULP-Components.asn  \
        ulp/ulp.cnf     \
-       umts_rrc/Makefile       \
-       umts_rrc/Makefile.nmake \
-       umts_rrc/packet-umts_rrc-template.c     \
-       umts_rrc/packet-umts_rrc-template.h     \
-       umts_rrc/umts_rrc_Class-definitions.asn \
-       umts_rrc/umts_rrc.cnf   \
-       umts_rrc/umts_rrc-exp.cnf       \
-       umts_rrc_ies/Makefile   \
-       umts_rrc_ies/Makefile.nmake     \
-       umts_rrc_ies/packet-umts_rrc_ies-template.c     \
-       umts_rrc_ies/packet-umts_rrc_ies-template.h     \
-       umts_rrc_ies/umts_rrc_InformationElements.asn   \
-       umts_rrc_ies/umts_rrc_ies.cnf   \
-       umts_rrc_ies/umts_rrc_ies-exp.cnf       \
-       umts_rrc_pdu_def/Makefile       \
-       umts_rrc_pdu_def/Makefile.nmake \
-       umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.c     \
-       umts_rrc_pdu_def/packet-umts_rrc_pdu_def-template.h     \
-       umts_rrc_pdu_def/umts_rrc_PDU-definitions.asn   \
-       umts_rrc_pdu_def/umts_rrc_pdu_def.cnf   \
-       umts_rrc_pdu_def/umts_rrc_pdu_def-exp.cnf       \
        wlancertextn/Makefile   \
        wlancertextn/Makefile.nmake     \
        wlancertextn/packet-wlancertextn-template.c     \
index 66d656d7bd935a13c74afb056b7881715a21448e..89d1d2351fc2f0331d30fc765d9767d8c4d393f6 100644 (file)
@@ -68,12 +68,10 @@ per: \
        mpeg    \
        ranap   \
        rnsap   \
+       rrc             \
        rrlp    \
-       t38     \
-       ulp             \
-       umts_rrc        \
-       umts_rrc_ies    \
-       umts_rrc_pdu_def        
+       t38             \
+       ulp
        
 clean:
        cd acse
@@ -220,6 +218,9 @@ clean:
        cd rtse
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ..
+       cd rrc
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+       cd ..
        cd rrlp
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ..
@@ -247,15 +248,6 @@ clean:
        cd ulp
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ..
-       cd umts_rrc
-       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
-       cd ..
-       cd umts_rrc_ies
-       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
-       cd ..
-       cd umts_rrc_pdu_def
-       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
-       cd ..
        cd wlancertextn
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ..
@@ -516,6 +508,11 @@ ros::
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
        cd ..
 
+rrc::
+       cd rrc
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
+       cd ..
+
 rrlp::
        cd rrlp
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
@@ -566,21 +563,6 @@ ulp::
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
        cd ..
 
-umts_rrc::
-       cd umts_rrc
-       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
-       cd ..
-
-umts_rrc_ies::
-       cd umts_rrc_ies
-       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
-       cd ..
-
-umts_rrc_pdu_def::
-       cd umts_rrc_pdu_def
-       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
-       cd ..
-
 wlancertextn::
        cd wlancertextn
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake copy_files
diff --git a/asn1/rrc/Class-definitions.asn b/asn1/rrc/Class-definitions.asn
new file mode 100644 (file)
index 0000000..9426913
--- /dev/null
@@ -0,0 +1,357 @@
+-- Class-definitions.asn
+--
+-- Taken from 3GPP TS 25.331 V7.4.0 (2007-03)
+-- http://www.3gpp.org/ftp/Specs/archive/25_series/25.331/25331-740.zip/25331-740.doc
+--
+-- 11.1 General message structure
+--
+
+Class-definitions DEFINITIONS AUTOMATIC TAGS ::=
+
+BEGIN
+
+IMPORTS
+
+    ActiveSetUpdate,
+    ActiveSetUpdateComplete,
+    ActiveSetUpdateFailure, 
+    AssistanceDataDelivery,
+    CellChangeOrderFromUTRAN,
+    CellChangeOrderFromUTRANFailure,
+    CellUpdate,
+    CellUpdateConfirm-CCCH,
+    CellUpdateConfirm,
+    CounterCheck,
+    CounterCheckResponse,
+    DownlinkDirectTransfer,
+    HandoverToUTRANComplete,
+    InitialDirectTransfer,
+    HandoverFromUTRANCommand-GERANIu,
+    HandoverFromUTRANCommand-GSM,
+    HandoverFromUTRANCommand-CDMA2000,
+    HandoverFromUTRANFailure,
+    MBMSAccessInformation,
+    MBMSCommonPTMRBInformation,
+    MBMSCurrentCellPTMRBInformation,
+    MBMSGeneralInformation,
+    MBMSModificationRequest,
+    MBMSModifiedServicesInformation,
+    MBMSNeighbouringCellPTMRBInformation,
+    MBMSSchedulingInformation,
+    MBMSUnmodifiedServicesInformation,
+    MeasurementControl,
+    MeasurementControlFailure,
+    MeasurementReport,
+    PagingType1,
+    PagingType2,
+    PhysicalChannelReconfiguration,
+    PhysicalChannelReconfigurationComplete,
+    PhysicalChannelReconfigurationFailure,
+    PhysicalSharedChannelAllocation,
+    PUSCHCapacityRequest,
+    RadioBearerReconfiguration,
+    RadioBearerReconfigurationComplete,
+    RadioBearerReconfigurationFailure,
+    RadioBearerRelease,
+    RadioBearerReleaseComplete,
+    RadioBearerReleaseFailure,
+    RadioBearerSetup,
+    RadioBearerSetupComplete,
+    RadioBearerSetupFailure,
+    RRCConnectionReject,
+    RRCConnectionRelease,
+    RRCConnectionRelease-CCCH,
+    RRCConnectionReleaseComplete,
+    RRCConnectionRequest,
+    RRCConnectionSetup,
+    RRCConnectionSetupComplete,
+    RRCStatus,
+    SecurityModeCommand,
+    SecurityModeComplete,
+    SecurityModeFailure,
+    SignallingConnectionRelease,
+    SignallingConnectionReleaseIndication,
+    SystemInformation-BCH,
+    SystemInformation-FACH,
+    SystemInformationChangeIndication,
+    TransportChannelReconfiguration,
+    TransportChannelReconfigurationComplete,
+    TransportChannelReconfigurationFailure,
+    TransportFormatCombinationControl,
+    TransportFormatCombinationControlFailure,
+    UECapabilityEnquiry,
+    UECapabilityInformation,
+    UECapabilityInformationConfirm,
+    UplinkDirectTransfer,
+    UplinkPhysicalChannelControl,
+    URAUpdate,
+    URAUpdateConfirm,
+    URAUpdateConfirm-CCCH,
+    UTRANMobilityInformation,
+    UTRANMobilityInformationConfirm,
+    UTRANMobilityInformationFailure
+FROM PDU-definitions
+
+-- User Equipment IEs :
+    IntegrityCheckInfo
+FROM InformationElements;
+
+--**************************************************************
+--
+-- Downlink DCCH messages
+--
+--**************************************************************
+
+DL-DCCH-Message ::= SEQUENCE {
+    integrityCheckInfo      IntegrityCheckInfo      OPTIONAL,
+    message                 DL-DCCH-MessageType
+}
+
+DL-DCCH-MessageType ::= CHOICE {
+    activeSetUpdate                     ActiveSetUpdate,
+    assistanceDataDelivery              AssistanceDataDelivery,
+    cellChangeOrderFromUTRAN            CellChangeOrderFromUTRAN,
+    cellUpdateConfirm                   CellUpdateConfirm,
+    counterCheck                        CounterCheck,
+    downlinkDirectTransfer              DownlinkDirectTransfer,
+    handoverFromUTRANCommand-GSM        HandoverFromUTRANCommand-GSM,
+    handoverFromUTRANCommand-CDMA2000   HandoverFromUTRANCommand-CDMA2000,
+    measurementControl                  MeasurementControl,
+    pagingType2                         PagingType2,
+    physicalChannelReconfiguration      PhysicalChannelReconfiguration,
+    physicalSharedChannelAllocation     PhysicalSharedChannelAllocation,
+    radioBearerReconfiguration          RadioBearerReconfiguration,
+    radioBearerRelease                  RadioBearerRelease,
+    radioBearerSetup                    RadioBearerSetup,
+    rrcConnectionRelease                RRCConnectionRelease,
+    securityModeCommand                 SecurityModeCommand,
+    signallingConnectionRelease         SignallingConnectionRelease,
+    transportChannelReconfiguration     TransportChannelReconfiguration,
+    transportFormatCombinationControl   TransportFormatCombinationControl,
+    ueCapabilityEnquiry                 UECapabilityEnquiry,
+    ueCapabilityInformationConfirm      UECapabilityInformationConfirm,
+    uplinkPhysicalChannelControl        UplinkPhysicalChannelControl,
+    uraUpdateConfirm                    URAUpdateConfirm,
+    utranMobilityInformation            UTRANMobilityInformation,
+    handoverFromUTRANCommand-GERANIu    HandoverFromUTRANCommand-GERANIu,
+    mbmsModifiedServicesInformation     MBMSModifiedServicesInformation,
+    spare5                              NULL,
+    spare4                              NULL,
+    spare3                              NULL,
+    spare2                              NULL,
+    spare1                              NULL
+}
+
+--**************************************************************
+--
+-- Uplink DCCH messages
+--
+--**************************************************************
+
+UL-DCCH-Message ::= SEQUENCE {
+    integrityCheckInfo      IntegrityCheckInfo      OPTIONAL,
+    message                 UL-DCCH-MessageType
+}
+
+UL-DCCH-MessageType ::= CHOICE {
+    activeSetUpdateComplete             ActiveSetUpdateComplete,
+    activeSetUpdateFailure              ActiveSetUpdateFailure,
+    cellChangeOrderFromUTRANFailure     CellChangeOrderFromUTRANFailure,
+    counterCheckResponse                CounterCheckResponse,
+    handoverToUTRANComplete             HandoverToUTRANComplete,
+    initialDirectTransfer               InitialDirectTransfer,
+    handoverFromUTRANFailure            HandoverFromUTRANFailure,
+    measurementControlFailure           MeasurementControlFailure,
+    measurementReport                   MeasurementReport,
+    physicalChannelReconfigurationComplete
+                                        PhysicalChannelReconfigurationComplete,
+    physicalChannelReconfigurationFailure
+                                        PhysicalChannelReconfigurationFailure,
+    radioBearerReconfigurationComplete  RadioBearerReconfigurationComplete,
+    radioBearerReconfigurationFailure   RadioBearerReconfigurationFailure,
+    radioBearerReleaseComplete          RadioBearerReleaseComplete,
+    radioBearerReleaseFailure           RadioBearerReleaseFailure,
+    radioBearerSetupComplete            RadioBearerSetupComplete,
+    radioBearerSetupFailure             RadioBearerSetupFailure,
+    rrcConnectionReleaseComplete        RRCConnectionReleaseComplete,
+    rrcConnectionSetupComplete          RRCConnectionSetupComplete,
+    rrcStatus                           RRCStatus,
+    securityModeComplete                SecurityModeComplete,
+    securityModeFailure                 SecurityModeFailure,
+    signallingConnectionReleaseIndication
+                                        SignallingConnectionReleaseIndication,
+    transportChannelReconfigurationComplete
+                                        TransportChannelReconfigurationComplete,
+    transportChannelReconfigurationFailure
+                                        TransportChannelReconfigurationFailure,
+    transportFormatCombinationControlFailure
+                                        TransportFormatCombinationControlFailure,
+    ueCapabilityInformation             UECapabilityInformation,
+    uplinkDirectTransfer                UplinkDirectTransfer,
+    utranMobilityInformationConfirm     UTRANMobilityInformationConfirm,
+    utranMobilityInformationFailure     UTRANMobilityInformationFailure,
+    mbmsModificationRequest             MBMSModificationRequest,
+    spare1                              NULL
+}
+
+--**************************************************************
+--
+-- Downlink CCCH messages
+--
+--**************************************************************
+
+DL-CCCH-Message ::= SEQUENCE {
+    integrityCheckInfo      IntegrityCheckInfo      OPTIONAL,
+    message                 DL-CCCH-MessageType
+}
+
+DL-CCCH-MessageType ::= CHOICE {    
+    cellUpdateConfirm                   CellUpdateConfirm-CCCH,
+    rrcConnectionReject                 RRCConnectionReject,
+    rrcConnectionRelease                RRCConnectionRelease-CCCH,
+    rrcConnectionSetup                  RRCConnectionSetup,
+    uraUpdateConfirm                    URAUpdateConfirm-CCCH,
+    spare3                              NULL,
+    spare2                              NULL,
+    spare1                              NULL
+}
+
+--**************************************************************
+--
+-- Uplink CCCH messages
+--
+--**************************************************************
+
+UL-CCCH-Message ::= SEQUENCE {
+    integrityCheckInfo      IntegrityCheckInfo      OPTIONAL,
+    message                 UL-CCCH-MessageType
+}
+
+UL-CCCH-MessageType ::= CHOICE {
+    cellUpdate                          CellUpdate,
+    rrcConnectionRequest                RRCConnectionRequest,
+    uraUpdate                           URAUpdate,
+    spare                               NULL
+}
+
+--**************************************************************
+--
+-- PCCH messages
+--
+--**************************************************************
+
+PCCH-Message ::= SEQUENCE {
+    message             PCCH-MessageType
+}
+
+PCCH-MessageType ::= CHOICE {
+    pagingType1                         PagingType1,
+    spare                               NULL
+}
+
+--**************************************************************
+--
+-- Downlink SHCCH messages
+--
+--**************************************************************
+
+DL-SHCCH-Message ::= SEQUENCE {
+    message                 DL-SHCCH-MessageType
+}
+
+DL-SHCCH-MessageType ::= CHOICE {
+    physicalSharedChannelAllocation     PhysicalSharedChannelAllocation,
+    spare                               NULL
+}
+
+--**************************************************************
+--
+-- Uplink SHCCH messages
+--
+--**************************************************************
+
+UL-SHCCH-Message ::= SEQUENCE {
+    message                 UL-SHCCH-MessageType
+}
+
+UL-SHCCH-MessageType ::= CHOICE {
+    puschCapacityRequest                PUSCHCapacityRequest,
+    spare                               NULL
+}
+
+
+--**************************************************************
+--
+-- BCCH messages sent on FACH
+--
+--**************************************************************
+
+BCCH-FACH-Message ::= SEQUENCE {
+    message             BCCH-FACH-MessageType
+}
+
+BCCH-FACH-MessageType ::= CHOICE {
+    systemInformation                   SystemInformation-FACH,
+    systemInformationChangeIndication   SystemInformationChangeIndication,
+    spare2                              NULL,
+    spare1                              NULL
+}
+
+--**************************************************************
+--
+-- BCCH messages sent on BCH
+--
+--**************************************************************
+
+BCCH-BCH-Message ::= SEQUENCE {
+    message             SystemInformation-BCH
+}
+
+--**************************************************************
+--
+-- MCCH messages
+--
+--**************************************************************
+
+MCCH-Message ::= SEQUENCE {
+    message             MCCH-MessageType
+}
+
+MCCH-MessageType ::= CHOICE {
+    mbmsAccessInformation               MBMSAccessInformation,
+    mbmsCommonPTMRBInformation          MBMSCommonPTMRBInformation,
+    mbmsCurrentCellPTMRBInformation     MBMSCurrentCellPTMRBInformation,
+    mbmsGeneralInformation              MBMSGeneralInformation,
+    mbmsModifiedServicesInformation     MBMSModifiedServicesInformation,
+    mbmsNeighbouringCellPTMRBInformation
+                                        MBMSNeighbouringCellPTMRBInformation,
+    mbmsUnmodifiedServicesInformation   MBMSUnmodifiedServicesInformation,
+    spare9                              NULL,
+    spare8                              NULL,
+    spare7                              NULL,
+    spare6                              NULL,
+    spare5                              NULL,
+    spare4                              NULL,
+    spare3                              NULL,
+    spare2                              NULL,
+    spare1                              NULL
+}
+
+--**************************************************************
+--
+-- MSCH messages
+--
+--**************************************************************
+
+MSCH-Message ::= SEQUENCE {
+    message             MSCH-MessageType
+}
+
+MSCH-MessageType ::= CHOICE {
+    mbmsSchedulingInformation           MBMSSchedulingInformation,
+    spare3                              NULL,
+    spare2                              NULL,
+    spare1                              NULL
+}
+
+END
diff --git a/asn1/rrc/Constant-definitions.asn b/asn1/rrc/Constant-definitions.asn
new file mode 100644 (file)
index 0000000..b9e3b06
--- /dev/null
@@ -0,0 +1,125 @@
+-- Constant-definitions.asn
+--
+-- Taken from 3GPP TS 25.331 V7.4.0 (2007-03)
+-- http://www.3gpp.org/ftp/Specs/archive/25_series/25.331/25331-740.zip/25331-740.doc
+--
+-- 11.4        Constant definitions
+--
+
+Constant-definitions DEFINITIONS AUTOMATIC TAGS ::=
+
+BEGIN
+
+hiPDSCHidentities                      INTEGER ::= 64
+hiPUSCHidentities                      INTEGER ::= 64
+hiRM                                           INTEGER ::= 256
+maxAC                                          INTEGER ::= 16
+maxAdditionalMeas                      INTEGER ::= 4
+maxASC                                         INTEGER ::= 8
+maxASCmap                                      INTEGER ::= 7
+maxASCpersist                          INTEGER ::= 6
+maxCCTrCH                                      INTEGER ::= 8
+maxCellMeas                            INTEGER ::= 32
+maxCellMeas-1                          INTEGER ::= 31
+maxCNdomains                           INTEGER ::= 4
+maxCPCHsets                                    INTEGER ::= 16
+maxDPCH-DLchan                         INTEGER ::= 8
+maxDPDCH-UL                                    INTEGER ::= 6
+maxDRACclasses                         INTEGER ::= 8
+maxE-DCHMACdFlow                       INTEGER ::= 8
+maxE-DCHMACdFlow-1                     INTEGER ::= 7
+maxEDCHRL                                      INTEGER ::= 4
+maxFACHPCH                                     INTEGER ::= 8
+maxFreq                                                INTEGER ::= 8
+maxFreqBandsFDD                                INTEGER ::= 8
+maxFreqBandsFDD-ext                    INTEGER ::= 15  -- maxFreqBandsFDD-ext ::= 22 - (maxFreqBandsFDD - 1)
+maxFreqBandsTDD                                INTEGER ::= 4
+maxFreqBandsGSM                                INTEGER ::= 16
+maxGERAN-SI                                    INTEGER ::= 8
+maxGSMTargetCells                      INTEGER ::= 32
+maxHProcesses                          INTEGER ::= 8
+maxHS-SCCHLessTrBlk                    INTEGER ::= 4
+maxHSDSCHTBIndex                       INTEGER ::= 64
+maxHSDSCHTBIndex-tdd384                INTEGER ::= 512
+maxHSSCCHs                                     INTEGER ::= 4
+maxInterSysMessages            INTEGER ::= 4
+maxLoCHperRLC                          INTEGER ::= 2
+maxMAC-d-PDUsizes                      INTEGER ::= 8
+maxMBMS-CommonCCTrCh           INTEGER ::= 32
+maxMBMS-CommonPhyCh                    INTEGER ::= 32
+maxMBMS-CommonRB                       INTEGER ::= 32
+maxMBMS-CommonTrCh                     INTEGER ::= 32
+maxMBMS-Freq                           INTEGER ::= 4
+maxMBMS-L1CP                           INTEGER ::= 4
+maxMBMSservCount                       INTEGER ::= 8
+maxMBMSservModif                       INTEGER ::= 32
+maxMBMSservSched                       INTEGER ::= 16
+maxMBMSservSelect                      INTEGER ::= 8
+maxMBMSservUnmodif                     INTEGER ::= 64
+maxMBMSTransmis                                INTEGER ::= 4
+maxMeasEvent                           INTEGER ::= 8
+maxMeasIntervals                       INTEGER ::= 3
+maxMeasParEvent                                INTEGER ::= 2
+maxNumCDMA2000Freqs                    INTEGER ::=  8
+maxNumE-AGCH                           INTEGER ::= 8
+maxNumE-HICH                           INTEGER ::= 4
+maxNumGSMFreqRanges                    INTEGER ::= 32
+maxNumFDDFreqs                         INTEGER ::=  8
+maxNumTDDFreqs                         INTEGER ::=  8
+maxNoOfMeas                                    INTEGER ::= 16
+maxOtherRAT                                    INTEGER ::= 15
+maxOtherRAT-16                         INTEGER ::= 16
+maxPage1                                       INTEGER ::= 8
+maxPCPCH-APsig                         INTEGER ::= 16
+maxPCPCH-APsubCh                       INTEGER ::= 12
+maxPCPCH-CDsig                         INTEGER ::= 16
+maxPCPCH-CDsubCh                       INTEGER ::= 12
+maxPCPCH-SF                                    INTEGER ::= 7
+maxPCPCHs                                      INTEGER ::= 64
+maxPDCPAlgoType                                INTEGER ::= 8
+maxPDSCH                                       INTEGER ::= 8
+maxPDSCH-TFCIgroups                    INTEGER ::= 256
+maxPRACH                                       INTEGER ::= 16
+maxPRACH-FPACH                         INTEGER ::= 8
+maxPredefConfig                                INTEGER ::= 16
+maxPUSCH                                       INTEGER ::= 8
+maxQueueIDs                                    INTEGER ::= 8
+maxRABsetup                                    INTEGER ::= 16
+maxRAT                                         INTEGER ::= 16
+maxRB                                          INTEGER ::= 32
+maxRBallRABs                           INTEGER ::= 27
+maxRBMuxOptions                                INTEGER ::= 8
+maxRBperRAB                                    INTEGER ::= 8
+maxRBperTrCh                           INTEGER ::= 16
+maxReportedGSMCells                    INTEGER ::= 8
+maxRL                                          INTEGER ::= 8
+maxRL-1                                                INTEGER ::= 7
+maxRLCPDUsizePerLogChan                INTEGER ::= 32
+maxRFC3095-CID                         INTEGER ::= 16384
+maxROHC-PacketSizes-r4         INTEGER ::= 16
+maxROHC-Profile-r4                     INTEGER ::= 8
+maxSat                                         INTEGER ::= 16
+maxSCCPCH                                      INTEGER ::= 16
+maxSIB                                         INTEGER ::= 32
+maxSIB-FACH                                    INTEGER ::= 8
+maxSIBperMsg                           INTEGER ::= 16
+maxSRBsetup                                    INTEGER ::= 8
+maxSystemCapability                    INTEGER ::= 16
+maxTF                                          INTEGER ::= 32
+maxTF-CPCH                                     INTEGER ::= 16
+maxTFC                                         INTEGER ::= 1024
+maxTFCsub                                      INTEGER ::= 1024
+maxTFCI-2-Combs                                INTEGER ::= 512
+maxTGPS                                                INTEGER ::= 6
+maxTrCH                                                INTEGER ::= 32
+-- maxTrCHpreconf should be 16 but has been set to 32 for compatibility
+maxTrCHpreconf                         INTEGER ::= 32
+maxTS                                          INTEGER ::= 14
+maxTS-1                                                INTEGER ::= 13 
+maxTS-2                                                INTEGER ::= 12
+maxTS-LCR                                      INTEGER ::= 6
+maxTS-LCR-1                                    INTEGER ::= 5 
+maxURA                                         INTEGER ::= 8
+maxURNTI-Group                         INTEGER ::= 8
+
+END
similarity index 77%
rename from asn1/umts_rrc_ies/umts_rrc_InformationElements.asn
rename to asn1/rrc/InformationElements.asn
index 1b13fb4a65166910331f57681dd971fad884ea96..d7debd00fc7232c55fb01e1223c75e3167a663cd 100644 (file)
@@ -1,4 +1,11 @@
---11.3 Information element definitions
+-- InformationElements.asn
+--
+-- Taken from 3GPP TS 25.331 V7.4.0 (2007-03)
+-- http://www.3gpp.org/ftp/Specs/archive/25_series/25.331/25331-740.zip/25331-740.doc
+--
+-- 11.3        Information element definitions
+--
+
 InformationElements DEFINITIONS AUTOMATIC TAGS ::=
 
 -- ***************************************************
@@ -9,112 +16,116 @@ InformationElements DEFINITIONS AUTOMATIC TAGS ::=
 
 BEGIN
 
--- IMPORTS
-
---     hiPDSCHidentities,
---     hiPUSCHidentities,
---     hiRM,
---     maxAC,
---     maxAdditionalMeas,
---     maxASC,
---     maxASCmap,
---     maxASCpersist,
---     maxCCTrCH,
---     maxCellMeas,
---     maxCellMeas-1,
---     maxCNdomains,
---     maxCPCHsets,
---     maxDPCH-DLchan,
---     maxDPDCH-UL,
---     maxDRACclasses,
---     maxE-DCHMACdFlow,
---     maxE-DCHMACdFlow-1,
---     maxFACHPCH,
---     maxFreq,
---     maxFreqBandsFDD,
---     maxFreqBandsTDD,
---     maxFreqBandsGSM,
---     maxGERAN-SI,
---     maxHProcesses,
---     maxHSDSCHTBIndex,
---     maxHSDSCHTBIndex-tdd384,
---     maxHSSCCHs,
---     maxInterSysMessages,
---     maxLoCHperRLC,
---     maxMAC-d-PDUsizes,
---     maxMBMS-CommonCCTrCh,
---     maxMBMS-CommonPhyCh,
---     maxMBMS-CommonRB,
---     maxMBMS-CommonTrCh,
---     maxMBMS-Freq,
---     maxMBMS-L1CP,
---     maxMBMSservCount,
---     maxMBMSservDedic,
---     maxMBMSservModif,
---     maxMBMSservSched,
---     maxMBMSservUnmodif,
---     maxMBMSTransmis,
---     maxMeasEvent,
---     maxMeasIntervals,
---     maxMeasParEvent,
---     maxNumCDMA2000Freqs,
---     maxNumFDDFreqs,
---     maxNumGSMFreqRanges,
---     maxGSMTargetCells,
---     maxNumTDDFreqs,
---     maxOtherRAT,
---     maxOtherRAT-16,
---     maxPage1,
---     maxPCPCH-APsig,
---     maxPCPCH-APsubCh,
---     maxPCPCH-CDsig,
---     maxPCPCH-CDsubCh,
---     maxPCPCH-SF,
---     maxPCPCHs,
---     maxPDCPAlgoType,
---     maxPDSCH,
---     maxPDSCH-TFCIgroups,
---     maxPRACH,
---     maxPRACH-FPACH,
---     maxPredefConfig,
---     maxPUSCH,
---     maxQueueIDs,
---     maxRABsetup,
---     maxRAT,
---     maxRB,
---     maxRBallRABs,
---     maxRBperTrCh,
---     maxRBMuxOptions,
---     maxRBperRAB,
---     maxReportedGSMCells,
---     maxRLCPDUsizePerLogChan,
---     maxSRBsetup,
---     maxRL,
---     maxRL-1,
---     maxROHC-PacketSizes-r4,
---     maxROHC-Profile-r4,
---     maxSCCPCH,
---     maxSat,
---     maxSIB,
---     maxSIB-FACH,
---     maxSystemCapability,
---     maxTF,
---     maxTF-CPCH,
---     maxTFC,
---     maxTFCsub,
---     maxTFCI-2-Combs,
---     maxTGPS,
---     maxTrCH,
---     maxTrChperSCCPCH,
---     maxTrCHpreconf,
---     maxTS,
---     maxTS-1,
---     maxTS-2,
---     maxTS-LCR,
---     maxTS-LCR-1,
---     maxURA,
---     maxURNTI-Group
--- FROM Constant-definitions;
+IMPORTS
+
+       hiPDSCHidentities,
+       hiPUSCHidentities,
+       hiRM,
+       maxAC,
+       maxAdditionalMeas,
+       maxASC,
+       maxASCmap,
+       maxASCpersist,
+       maxCCTrCH,
+       maxCellMeas,
+       maxCellMeas-1,
+       maxCNdomains,
+       maxCPCHsets,
+       maxDPCH-DLchan,
+       maxDPDCH-UL,
+       maxDRACclasses,
+       maxE-DCHMACdFlow,
+       maxE-DCHMACdFlow-1,
+       maxFACHPCH,
+       maxFreq,
+       maxFreqBandsFDD,
+       maxFreqBandsFDD-ext,
+       maxFreqBandsTDD,
+       maxFreqBandsGSM,
+       maxGERAN-SI,
+       maxHProcesses,
+       maxHSDSCHTBIndex,
+       maxHSDSCHTBIndex-tdd384,
+       maxHSSCCHs,
+       maxHS-SCCHLessTrBlk,
+       maxInterSysMessages,
+       maxLoCHperRLC,
+       maxMAC-d-PDUsizes,
+       maxMBMS-CommonCCTrCh,
+       maxMBMS-CommonPhyCh,
+       maxMBMS-CommonRB,
+       maxMBMS-CommonTrCh,
+       maxMBMS-Freq,
+       maxMBMS-L1CP,
+       maxMBMSservCount,
+       maxMBMSservModif,
+       maxMBMSservSched,
+       maxMBMSservSelect,
+       maxMBMSservUnmodif,
+       maxMBMSTransmis,
+       maxMeasEvent,
+       maxMeasIntervals,
+       maxMeasParEvent,
+       maxNumCDMA2000Freqs,
+       maxNumE-AGCH,
+       maxNumE-HICH,
+       maxNumFDDFreqs,
+       maxNumGSMFreqRanges,
+       maxGSMTargetCells,
+       maxNumTDDFreqs,
+       maxOtherRAT,
+       maxOtherRAT-16,
+       maxPage1,
+       maxPCPCH-APsig,
+       maxPCPCH-APsubCh,
+       maxPCPCH-CDsig,
+       maxPCPCH-CDsubCh,
+       maxPCPCH-SF,
+       maxPCPCHs,
+       maxPDCPAlgoType,
+       maxPDSCH,
+       maxPDSCH-TFCIgroups,
+       maxPRACH,
+       maxPRACH-FPACH,
+       maxPredefConfig,
+       maxPUSCH,
+       maxQueueIDs,
+       maxRABsetup,
+       maxRAT,
+       maxRB,
+       maxRBallRABs,
+       maxRBperTrCh,
+       maxRBMuxOptions,
+       maxRBperRAB,
+       maxReportedGSMCells,
+       maxRLCPDUsizePerLogChan,
+       maxSRBsetup,
+       maxRL,
+       maxRL-1,
+       maxEDCHRL,
+       maxROHC-PacketSizes-r4,
+       maxROHC-Profile-r4,
+       maxSCCPCH,
+       maxSat,
+       maxSIB,
+       maxSIB-FACH,
+       maxSystemCapability,
+       maxTF,
+       maxTF-CPCH,
+       maxTFC,
+       maxTFCsub,
+       maxTFCI-2-Combs,
+       maxTGPS,
+       maxTrCH,
+       maxTrCHpreconf,
+       maxTS,
+       maxTS-1,
+       maxTS-2,
+       maxTS-LCR,
+       maxTS-LCR-1,
+       maxURA,
+       maxURNTI-Group
+FROM Constant-definitions;
 
 Ansi-41-IDNNS ::=                                                      BIT STRING (SIZE (14))
 
@@ -201,7 +212,7 @@ Gsm-map-IDNNS ::=                                                   SEQUENCE {
        },
        -- dummy is not used in this version of the specification and
        -- it should be ignored by the receiver.
-       dummy-BOOLEAN                                                                   BOOLEAN
+       dummy                                                                   BOOLEAN
 }
 
 IMEI ::=                                                       SEQUENCE (SIZE (15)) OF
@@ -509,7 +520,7 @@ URA-IdentityList ::=                                SEQUENCE (SIZE (1..maxURA)) OF
 -- ***************************************************
 
 AccessStratumReleaseIndicator ::=      ENUMERATED {
-                                                                               rel-4, rel-5, rel-6, spare13,
+                                                                               rel-4, rel-5, rel-6, rel-7,
                                                                                spare12, spare11, spare10, spare9, spare8,
                                                                                spare7, spare6, spare5, spare4, spare3,
                                                                                spare2, spare1 }
@@ -548,6 +559,10 @@ CapabilityUpdateRequirement-r4 ::= SEQUENCE {
        systemSpecificCapUpdateReqList          SystemSpecificCapUpdateReqList          OPTIONAL
 }
 
+CapabilityUpdateRequirement-r7-ext ::= SEQUENCE {
+       ue-RadioCapabilityUpdateRequirement-TDD768      BOOLEAN
+}
+
 -- If the IE CellUpdateCause has the value 'cellUpdateCause-ext', the actual value is
 -- defined in the IE CellUpdateCause-ext.
 CellUpdateCause ::=                                    ENUMERATED { 
@@ -562,19 +577,34 @@ CellUpdateCause ::=                                       ENUMERATED {
 
 -- The IE CellUpdateCause-ext shall be present, if the IE CellUpdateCause has the
 -- value 'cellUpdateCause-ext'.
+-- dummy is not used in this version of the specification, it should not be sent
+-- and if received it should be ignored by the receiver.
 CellUpdateCause-ext ::=                                ENUMERATED {
                                                                                mbms-Reception,
-                                                                               mbms-PTP-RB-Request, spare2, spare1 }
+                                                                               mbms-PTP-RB-Request,
+                                                                               dummy,
+                                                                               spare1 }
+
 
 ChipRateCapability ::=                         ENUMERATED {
                                                                                mcps3-84, mcps1-28 }
 
+ChipRateCapability-r7 ::=                              ENUMERATED {
+                                                                               mcps3-84, mcps7-68, mcps1-28 }
+
 CipheringAlgorithm ::=                         ENUMERATED {
                                                                                uea0, uea1 }
 
+CipheringAlgorithm-r7 ::=                      ENUMERATED {
+                                                                               uea0, uea1, uea2 }
+
 CipheringModeCommand ::=                       CHOICE {
        startRestart                                            CipheringAlgorithm,
-       dummy-NULL                                              NULL
+       dummy                                           NULL
+}
+
+CipheringModeCommand-r7 ::=                    CHOICE {
+       startRestart                                            CipheringAlgorithm-r7
 }
 
 CipheringModeInfo ::=                          SEQUENCE {
@@ -584,6 +614,13 @@ CipheringModeInfo ::=                              SEQUENCE {
        rb-DL-CiphActivationTimeInfo            RB-ActivationTimeInfoList                       OPTIONAL
 }
 
+CipheringModeInfo-r7 ::=                       SEQUENCE {
+       -- TABULAR: The ciphering algorithm is included in the CipheringModeCommand.
+       cipheringModeCommand                            CipheringModeCommand-r7,
+       activationTimeForDPCH                           ActivationTime                                          OPTIONAL,
+       rb-DL-CiphActivationTimeInfo            RB-ActivationTimeInfoList                       OPTIONAL
+}
+
 CN-DRX-CycleLengthCoefficient ::=      INTEGER (6..9)
 
 CN-PagedUE-Identity ::=                                CHOICE {
@@ -677,20 +714,20 @@ DL-CapabilityWithSimultaneousHS-DSCHConfig ::=    ENUMERATED{kbps32, kbps64, kbps12
 DL-DPCCH-BER ::=                                       INTEGER (0..63)
 
 DL-PhysChCapabilityFDD ::=                     SEQUENCE {
-       -- The IE \93maxNoDPCH-PDSCH-Codes\94 only gives information on the maximum number of DPCH Codes.
+       -- The IE "maxNoDPCH-PDSCH-Codes" only gives information on the maximum number of DPCH Codes.
        maxNoDPCH-PDSCH-Codes                           INTEGER (1..8),
        maxNoPhysChBitsReceived                         MaxNoPhysChBitsReceived,
        supportForSF-512                                        BOOLEAN,
-       -- dummy and dummy2 are not used in this version of the specification, they should not be sent
+       -- dummy and dummy2 are not used in this version of the specification
        -- and if received they should be ignored.
-       dummy-BOOLEAN                                                           BOOLEAN,
-       dummy2-SimultaneousSCCPCH-DPCH-Reception                                                                SimultaneousSCCPCH-DPCH-Reception
+       dummy                                                           BOOLEAN,
+       dummy2                                                          SimultaneousSCCPCH-DPCH-Reception
 }
 
 DL-PhysChCapabilityFDD-v380ext ::=                     SEQUENCE {
        -- dummy is not used in this version of the specification, it should
        -- not be sent and if received it should be ignored.
-       dummy-SupportOfDedicatedPilotsForChEstimation   SupportOfDedicatedPilotsForChEstimation         OPTIONAL
+       dummy                                                                           SupportOfDedicatedPilotsForChEstimation         OPTIONAL
 }
 
 SupportOfDedicatedPilotsForChEstimation ::=                    ENUMERATED { true }
@@ -712,6 +749,14 @@ DL-PhysChCapabilityTDD-LCR-r4 ::=  SEQUENCE {
        supportOf8PSK                                           BOOLEAN
 }
 
+DL-PhysChCapabilityTDD-768 ::=         SEQUENCE {
+       maxTS-PerFrame                                          MaxTS-PerFrame,
+       maxPhysChPerFrame                                       MaxPhysChPerFrame-768,
+       minimumSF                                                       MinimumSF-DL-768,
+       supportOfPDSCH                                          BOOLEAN,
+       maxPhysChPerTS                                          MaxPhysChPerTS-768
+}
+
 DL-TransChCapability ::=                       SEQUENCE {
        maxNoBitsReceived                                       MaxNoBits,
        maxConvCodeBitsReceived                         MaxNoBits,
@@ -815,6 +860,8 @@ GSM-Measurements ::=                                SEQUENCE {
 
 H-RNTI ::=                                                     BIT STRING (SIZE (16))
 
+High-MobilityDetected ::=                      ENUMERATED { high-MobilityDetected }
+
 HSDSCH-physical-layer-category ::=             INTEGER (1..64)
 
 UESpecificBehaviourInformation1idle ::= BIT STRING (SIZE (4))
@@ -855,6 +902,8 @@ IntegrityProtActivationInfo ::=             SEQUENCE {
 IntegrityProtectionAlgorithm ::=       ENUMERATED {
                                                                                uia1 }
 
+IntegrityProtectionAlgorithm-r7 ::=    ENUMERATED {
+                                                                               uia1, uia2 }
 
 IntegrityProtectionModeCommand ::=     CHOICE {
        startIntegrityProtection                        SEQUENCE {
@@ -870,7 +919,15 @@ IntegrityProtectionModeInfo ::=            SEQUENCE {
        -- protection intialisation number have been nested inside 
        -- IntegrityProtectionModeCommand.
        integrityProtectionModeCommand          IntegrityProtectionModeCommand,
-       integrityProtectionAlgorithm            IntegrityProtectionAlgorithm            OPTIONAL        
+       integrityProtectionAlgorithm            IntegrityProtectionAlgorithm            OPTIONAL
+}
+
+IntegrityProtectionModeInfo-r7 ::=     SEQUENCE {
+       -- TABULAR: DL integrity protection activation info and Integrity
+       -- protection intialisation number have been nested inside 
+       -- IntegrityProtectionModeCommand.
+       integrityProtectionModeCommand          IntegrityProtectionModeCommand,
+       integrityProtectionAlgorithm            IntegrityProtectionAlgorithm-r7         OPTIONAL
 }
 
 IntegrityProtInitNumber ::=                    BIT STRING (SIZE (32))
@@ -932,6 +989,8 @@ MaxNumberOfTFC-UL ::=                               ENUMERATED {
 -- the values 1 \854 for MaxPhysChPerFrame are not used in this version of the protocol 
 MaxPhysChPerFrame ::=                          INTEGER (1..224)
 
+MaxPhysChPerFrame-768 ::=                      INTEGER (1..448)
+
 MaxPhysChPerSubFrame-r4 ::=                    INTEGER (1..96)
 
 MaxPhysChPerTimeslot ::=                       ENUMERATED {
@@ -940,6 +999,8 @@ MaxPhysChPerTimeslot ::=                    ENUMERATED {
 -- the values 1 \854 for MaxPhysChPerTS are not used in this version of the protocol 
 MaxPhysChPerTS ::=                                     INTEGER (1..16)
 
+MaxPhysChPerTS-768 ::=                         INTEGER (1..32)
+
 MaxSimultaneousCCTrCH-Count ::=                INTEGER (1..8)
 
 MaxSimultaneousTransChsDL ::=          ENUMERATED {
@@ -992,6 +1053,9 @@ MessageAuthenticationCode ::=              BIT STRING (SIZE (32))
 MinimumSF-DL ::=                                       ENUMERATED {
                                                                                sf1, sf16 }
 
+MinimumSF-DL-768 ::=                           ENUMERATED {
+                                                                               sf1, sf32 }
+
 MinimumSF-UL ::=                                       ENUMERATED {
                                                                                sf1, sf2, sf4, sf8, dummy }
 
@@ -1007,6 +1071,10 @@ MultiModeRAT-Capability-v590ext ::=      SEQUENCE {
        supportOfUTRAN-ToGERAN-NACC                     BOOLEAN
 }
 
+MultiModeRAT-Capability-v680ext ::=    SEQUENCE {
+       supportOfHandoverToGAN                          ENUMERATED { doesSupportHandoverToGAN }         OPTIONAL
+}
+
 N-300 ::=                                                      INTEGER (0..7)
 
 N-301 ::=                                                      INTEGER (0..7)
@@ -1110,7 +1178,7 @@ PagingRecord2-r5 ::=                              CHOICE {
                }                                                                                                                                       OPTIONAL,
                rrc-ConnectionReleaseInformation                RRC-ConnectionReleaseInformation
        },
-       utran-GroupIdentity                                             SEQUENCE ( SIZE (1 .. maxURNTIGroup) ) OF
+       utran-GroupIdentity                                             SEQUENCE ( SIZE (1 .. maxURNTI-Group) ) OF
                                                                                                GroupIdentityWithReleaseInformation
 }
 
@@ -1161,6 +1229,23 @@ PhysicalChannelCapability ::=            SEQUENCE {
                }                                                                                       OPTIONAL
 }
 
+PhysicalChannelCapability-r7 ::=               SEQUENCE {
+               fddPhysChCapability                                     SEQUENCE {
+                       downlinkPhysChCapability                        DL-PhysChCapabilityFDD,
+                       uplinkPhysChCapability                          UL-PhysChCapabilityFDD-r7
+               }                                                                                       OPTIONAL,
+               -- tddPhysChCapability describes the 3.84Mcps TDD physical channel capability
+               tddPhysChCapability                                     SEQUENCE {
+                       downlinkPhysChCapability                        DL-PhysChCapabilityTDD,
+                       uplinkPhysChCapability                          UL-PhysChCapabilityTDD
+               }                                                                                       OPTIONAL,
+               -- tddPhysicalChaCapability-768 describes the 7.68 TDD physical channel capability
+               tddPhysChCapability-768                         SEQUENCE {
+                       downlinkPhysChCapability                        DL-PhysChCapabilityTDD-768,
+                       uplinkPhysChCapability                          UL-PhysChCapabilityTDD
+               }
+}
+
 -- PhysicalChannelCapability-LCR-r4 describes the 1.28Mcps TDD physical channel capability
 PhysicalChannelCapability-LCR-r4 ::=           SEQUENCE {
                tdd128-PhysChCapability                                 SEQUENCE {
@@ -1174,8 +1259,8 @@ PhysicalChannelCapability-hspdsch-r5 ::=          SEQUENCE {
        fdd-hspdsch                                                                             CHOICE {
                supported                                                                               SEQUENCE {
                        hsdsch-physical-layer-category                                  HSDSCH-physical-layer-category,
-                       -- dummy and dummy2 are not used in this version of the specification, they should not
-                       -- be sent and if received they should be ignored.
+                       -- dummy and dummy2 are not used in this version of the specification
+                       -- and if received they should be ignored.
                        dummy                                                                                   BOOLEAN,
                        dummy2                                                                                  BOOLEAN
                },
@@ -1191,6 +1276,24 @@ PhysicalChannelCapability-hspdsch-r5 ::=         SEQUENCE {
        }
 }
 
+PhysicalChannelCapability-hspdsch-r7 ::=               SEQUENCE {
+       fdd-hspdsch                                                                             CHOICE {
+               supported                                                                               SEQUENCE {
+                       hsdsch-physical-layer-category                                  HSDSCH-physical-layer-category,
+                       hs-DSCH-64QAM-Support                                                   BOOLEAN                                         OPTIONAL
+               },
+               unsupported                                                                             NULL
+       },
+       tdd384-hspdsch                                                                  CHOICE {
+               supported                                                                               HSDSCH-physical-layer-category,
+               unsupported                                                                             NULL
+       },
+       tdd128-hspdsch                                                                  CHOICE {
+               supported                                                                               HSDSCH-physical-layer-category,
+               unsupported                                                                             NULL
+       }
+}
+
 PNBSCH-Allocation-r4 ::=                               SEQUENCE {
                numberOfRepetitionsPerSFNPeriod ENUMERATED {
                                                                                        c2, c3, c4, c5, c6, c7, c8, c9, c10,
@@ -1268,7 +1371,12 @@ RadioFrequencyBandFDD2 ::=                       ENUMERATED {
 RadioFrequencyBandTDDList ::=          ENUMERATED {
                                                                                a, b, c, ab, ac, bc, abc, spare }
 
-RadioFrequencyBandTDD ::=                      ENUMERATED {a, b, c, spare}
+RadioFrequencyBandTDDList-r7 ::=       ENUMERATED {
+                                                                               a, b, c, d, ab, ac, ad, bc, bd, cd, abc, abd, acd, bcd,
+                                                                               abcd, spare }
+
+RadioFrequencyBandTDD ::=                      ENUMERATED {
+                                                                               a, b, c, d }
 
 RadioFrequencyBandGSM ::=                      ENUMERATED {
                                                                                gsm450,
@@ -1333,6 +1441,18 @@ RF-Capability-r4-ext ::=                         SEQUENCE {
                }                                                                       OPTIONAL
 }
 
+RF-Capability-r7 ::=                           SEQUENCE {
+               fddRF-Capability                                SEQUENCE {
+                       ue-PowerClass                                   UE-PowerClass,
+                       txRxFrequencySeparation                 TxRxFrequencySeparation
+               }                                                                       OPTIONAL,
+               tddRF-Capability                                SEQUENCE {
+                       ue-PowerClass                                   UE-PowerClass,
+                       radioFrequencyTDDBandList               RadioFrequencyBandTDDList-r7,
+                       chipRateCapability                              ChipRateCapability-r7
+               }       OPTIONAL
+}
+
 RLC-Capability ::=                                     SEQUENCE {
        -- If present, the "totalRLC-AM-BufferSize" in the IE "RLC-Capability-r5-ext" overrides the
        -- corresponding value in this IE. The value in this IE may be used by a pre-REL-5 UTRAN.
@@ -1369,7 +1489,7 @@ S-RNTI-2 ::=                                              BIT STRING (SIZE (10))
 
 SecurityCapability ::=                         SEQUENCE {
        cipheringAlgorithmCap                           BIT STRING {
-                                                                               -- For each bit value \930\94 means false/ not supported
+                                                                               -- For each bit value "0" means false/ not supported
                                                                                        spare15(0),
                                                                                        spare14(1),
                                                                                        spare13(2),
@@ -1383,12 +1503,12 @@ SecurityCapability ::=                          SEQUENCE {
                                                                                        spare5(10),
                                                                                        spare4(11),
                                                                                        spare3(12),
-                                                                                       spare2(13),
+                                                                                       uea2(13),
                                                                                        uea1(14),
                                                                                        uea0(15)
                                                                                        }       (SIZE (16)),
        integrityProtectionAlgorithmCap         BIT STRING {
-                                                                               -- For each bit value \930\94 means false/ not supported
+                                                                               -- For each bit value "0" means false/ not supported
                                                                                        spare15(0),
                                                                                        spare14(1),
                                                                                        spare13(2),
@@ -1402,7 +1522,7 @@ SecurityCapability ::=                            SEQUENCE {
                                                                                        spare5(10),
                                                                                        spare4(11),
                                                                                        spare3(12),
-                                                                                       spare2(13),
+                                                                                       uia2(13),
                                                                                        uia1(14),
                                                                                        spare0(15)
                                                                                        }        (SIZE (16))
@@ -1411,7 +1531,7 @@ SecurityCapability ::=                            SEQUENCE {
 Serving-HSDSCH-CellInformation ::=             SEQUENCE {
        deltaACK                                                DeltaACK                                        OPTIONAL,
        deltaNACK                                               DeltaNACK                                       OPTIONAL,
-       harq-Preamble-Mode                              HARQ-Preamble-Mode                      OPTIONAL,
+       harq-Preamble-Mode                              HARQ-Preamble-Mode,
        primaryCPICH-Info                               PrimaryCPICH-Info                       OPTIONAL,
        dl-hspdsch-Information                  DL-HSPDSCH-Information          OPTIONAL,
        harqInfo                                                HARQ-Info                                       OPTIONAL,
@@ -1565,9 +1685,10 @@ TurboSupport ::=                                 CHOICE {
        supported                                                       MaxNoBits
 }
 
+-- Values defined as spare shall not be sent in this version of the protocol. If a spare value is
+-- received, it should be interpreted as 'default-RxTX-sparation'.
 TxRxFrequencySeparation ::=                    ENUMERATED {
-                                                                               mhz190, mhz174-8-205-2,
-                                                                               mhz134-8-245-2 }
+                                                                               default-TxRx-separation, spare2, spare1 }
 
 U-RNTI ::=                                                     SEQUENCE {
        srnc-Identity                                           SRNC-Identity,
@@ -1618,9 +1739,17 @@ U-RNTI-Short ::=                                 SEQUENCE {
 UE-CapabilityContainer-IEs ::=                         SEQUENCE {
 -- Container for transparent transfer of capability information not related to
 -- features for which early implementation is desired
-               ue-RadioAccessCapability-v6xyext        UE-RadioAccessCapability-v6xyext,
-               ue-RATSpecificCapability-v6xyext        InterRAT-UE-RadioAccessCapability-v6xyext       OPTIONAL,
-               nonCriticalExtensions                           SEQUENCE {}             OPTIONAL
+               ue-RadioAccessCapability-v690ext        UE-RadioAccessCapability-v690ext,
+               ue-RATSpecificCapability-v690ext        InterRAT-UE-RadioAccessCapability-v690ext       OPTIONAL,
+               v6b0NonCriticalExtensions                       SEQUENCE {
+                       ue-RadioAccessCapability-v6b0ext        UE-RadioAccessCapability-v6b0ext-IEs,
+                       nonCriticalExtensions                           SEQUENCE {}             OPTIONAL
+               }               OPTIONAL
+}
+
+UE-RadioAccessCapability-v6b0ext-IEs ::= SEQUENCE {
+       -- User equipment IEs
+               supportForSIB11bis                                      ENUMERATED { true }                     OPTIONAL
 }
 
 UE-ConnTimersAndConstants ::=          SEQUENCE {
@@ -1695,6 +1824,12 @@ UE-IdleTimersAndConstants ::=            SEQUENCE {
        n-312                                                           N-312   
 }
 
+UE-HSPA-Identities-r6 ::= SEQUENCE {
+       new-H-RNTI                                              H-RNTI                                                          OPTIONAL,
+       newPrimary-E-RNTI                               E-RNTI                                                          OPTIONAL,
+       newSecondary-E-RNTI                             E-RNTI                                                          OPTIONAL
+}
+
 UE-IdleTimersAndConstants-v3a0ext ::=          SEQUENCE {
        n-312                                                           N-312ext                                                                OPTIONAL
 }
@@ -1751,13 +1886,20 @@ UE-RadioAccessCapability-v650ext ::=    SEQUENCE {
        ue-RadioAccessCapabBandFDDList-ext      UE-RadioAccessCapabBandFDDList-ext      OPTIONAL
 }
 
-UE-RadioAccessCapability-v6xyext ::= SEQUENCE {
+UE-RadioAccessCapability-v690ext ::= SEQUENCE {
                physicalchannelcapability-edch  PhysicalChannelCapability-edch-r6,
-               -- TABULAR: device-Type is MD in tabular description
-               -- Default value is DoesBenefitFromBatteryConsumptionOptimisation
+               -- TABULAR: deviceType is MD in tabular description
+               -- Default value is 'doesBenefitFromBatteryConsumptionOptimisation'
                deviceType              ENUMERATED { doesNotBenefitFromBatteryConsumptionOptimisation } OPTIONAL
 }
 
+UE-RadioAccessCapability-v7xyext ::=           SEQUENCE {
+       rf-Capability                                                           RF-Capability-r7                                OPTIONAL,
+       physicalChannelCapability-r7                            PhysicalChannelCapability-r7    OPTIONAL,
+       physicalchannelcapability-tddedch                       PhysicalChannelCapability-tddedch-r7    OPTIONAL,
+       physicalChannelCapability-hspdsch-r7            PhysicalChannelCapability-hspdsch-r7    OPTIONAL
+}
+
 UE-RadioAccessCapabBandFDDList2 ::=    SEQUENCE (SIZE (1..maxFreqBandsFDD)) OF
                                                                                        UE-RadioAccessCapabBandFDD2
 
@@ -1819,6 +1961,24 @@ UE-RadioAccessCapabilityComp ::= SEQUENCE {
        rf-CapabilityComp                                               RF-CapabilityComp
 }
 
+UE-RadioAccessCapabilityComp-ext ::= SEQUENCE {
+       rf-CapabilityFDDComp                            RF-CapabBandListFDDComp-ext
+}
+
+UE-RadioAccessCapabilityComp-r7 ::= SEQUENCE {
+       totalAM-RLCMemoryExceeds10kB                    BOOLEAN,
+       rf-CapabilityComp                                               RF-CapabilityComp-r7
+}
+
+UE-RadioAccessCapabilityComp2 ::=              SEQUENCE {
+       fddPhysicalChannelCapab-hspdsch-edch    SEQUENCE {
+               dl-CapabilityWithSimultaneousHS-DSCHConfig
+                                                                                               DL-CapabilityWithSimultaneousHS-DSCHConfig      OPTIONAL,
+               physicalChannelCapabComp-hspdsch-r6             HSDSCH-physical-layer-category,
+               physicalChannelCapability-edch-r6               PhysicalChannelCapability-edch-r6
+       }               OPTIONAL
+}
+
 RF-CapabilityComp ::= SEQUENCE {
        fdd                                     CHOICE {
                notSupported                                    NULL,
@@ -1834,13 +1994,41 @@ RF-CapabilityComp ::= SEQUENCE {
        }
 }
 
--- NOTE: This IE is the frequency separation in MHz
-RF-CapabBandFDDComp ::=        ENUMERATED { notSupported, mhz190,
-                                                                               mhz174-8-205-2, mhz134-8-245-2 }
+RF-CapabilityComp-r7 ::= SEQUENCE {
+       fdd                                     CHOICE {
+               notSupported                                    NULL,
+               supported                                               RF-CapabBandListFDDComp
+       },
+       tdd384-RF-Capability    CHOICE {
+               notSupported                                    NULL,
+               supported                                               RadioFrequencyBandTDDList-r7
+       },
+       tdd768-RF-Capability    CHOICE  {
+               notSupported                                    NULL,
+               supported                                               RadioFrequencyBandTDDList-r7
+       },
+       tdd128-RF-Capability    CHOICE {
+               notSupported                                    NULL,
+               supported                                               RadioFrequencyBandTDDList-r7
+       }
+}
+
+-- NOTE: This IE defines the supported TX/RX frequency separation for the respective supported
+-- frequency band. Values defined as spare shall not be sent in this version of the protocol.
+-- If a spare value is received, it should be interpreted as 'default-RxTX-sparation'.
+RF-CapabBandFDDComp ::=                                ENUMERATED { notSupported,
+                                                                               default-TxRx-separation, spare2, spare1 }
+
+RF-CapabBandListFDDComp ::=                    SEQUENCE (SIZE (1..maxFreqBandsFDD)) OF
+       -- The first entry corresponds with the first value of IE RadioFrequencyBandFDD,
+       -- fdd2100, and so on. No more than seven entries should be included in this IE. The
+       -- 8'th entry, if present, shall be ignored.
+       -- An extension of this IE may be provided using the IE 'RF-CapabBandListFDDComp-ext'.
+       RF-CapabBandFDDComp
 
-RF-CapabBandListFDDComp ::=    SEQUENCE (SIZE (1..maxFreqBandsFDD)) OF
-       -- the first entry corresponds with the first value of IE RadioFrequencyBandFDD,
-       -- fdd2100, and so on
+RF-CapabBandListFDDComp-ext ::=                SEQUENCE (SIZE (1..maxFreqBandsFDD-ext)) OF
+       -- The first entry corresponds with the first value of IE RadioFrequencyBandFDD2,
+       -- bandVIII, and so on.
        RF-CapabBandFDDComp
 
 UE-RadioAccessCapability-v590ext ::=   SEQUENCE {
@@ -1855,6 +2043,10 @@ UE-RadioAccessCapability-v5c0ext ::= SEQUENCE {
        pdcp-Capability-r5-ext2                         PDCP-Capability-r5-ext2
 }
 
+UE-RadioAccessCapability-v680ext ::= SEQUENCE {
+       multiModeRAT-Capability-v680ext         MultiModeRAT-Capability-v680ext
+}
+
 UL-PhysChCapabilityFDD ::=                     SEQUENCE {
        maxNoDPDCH-BitsTransmitted                      MaxNoDPDCH-BitsTransmitted,
        -- dummy is not used in this version of the specification and
@@ -1867,6 +2059,12 @@ UL-PhysChCapabilityFDD-r6 ::=                    SEQUENCE {
        physicalchannelcapability-edch                  PhysicalChannelCapability-edch-r6
 }
 
+UL-PhysChCapabilityFDD-r7 ::=                  SEQUENCE {
+       maxNoDPDCH-BitsTransmitted                              MaxNoDPDCH-BitsTransmitted,
+       physicalchannelcapability-edch                  PhysicalChannelCapability-edch-r6,
+       ue-MIMO-Support                                                 ENUMERATED { true }                             OPTIONAL
+}
+
 UL-PhysChCapabilityTDD ::=                     SEQUENCE {
        maxTS-PerFrame                                          MaxTS-PerFrame,
        maxPhysChPerTimeslot                            MaxPhysChPerTimeslot,
@@ -1891,6 +2089,24 @@ PhysicalChannelCapability-edch-r6 ::=    SEQUENCE {
        }
 }
 
+
+PhysicalChannelCapability-tddedch-r7 ::=       SEQUENCE {
+       modeSpecificInfo                                                CHOICE {
+               tdd384-tdd768-edch                                              CHOICE {
+                       supported                                                               SEQUENCE {
+                               tdd-edch-PhysicalLayerCategory                  INTEGER (1..16)
+                       },
+                       unsupported                                                             NULL
+               },
+               tdd128-edch                                                             CHOICE {
+                       supported                                                               SEQUENCE {
+                               tdd-edch-PhysicalLayerCategory                  INTEGER (1..5)
+                       },
+                       unsupported                                                             NULL
+               }
+       }
+}
+
 UL-TransChCapability ::=                       SEQUENCE {
        maxNoBitsTransmitted                            MaxNoBits,
        maxConvCodeBitsTransmitted                      MaxNoBits,
@@ -1964,6 +2180,10 @@ DefaultConfigIdentity-r4 ::=             INTEGER (0..12)
 
 DefaultConfigIdentity-r5 ::=           INTEGER (0..13)
 
+-- DefaultConfigIdentity-r6 values 23..31 are spare and shall not be used in this version of 
+-- the protocol
+DefaultConfigIdentity-r6 ::=           INTEGER (0..31)
+
 DefaultConfigMode ::=                          ENUMERATED {
                                                                                fdd,
                                                                                tdd }
@@ -2013,7 +2233,8 @@ DL-LogicalChannelMappingList-r5 ::=       SEQUENCE (SIZE (1..maxLoCHperRLC)) OF
 DL-Reception-Window-Size-r6 ::=                ENUMERATED { size32, size48, size64, size80, size96, size112 }
 
 DL-RFC3095-r4 ::=                                      SEQUENCE {
-       cid-InclusionInfo                                       CID-InclusionInfo-r4,
+       -- dummy is not used in this version of the specification and shall be ignored by the receiver.
+       dummy                                                           CID-InclusionInfo-r4,
        max-CID                                                         INTEGER (1..16383)                                      DEFAULT 15,
        reverseDecompressionDepth                       INTEGER (0..65535)                                      DEFAULT 0
 }
@@ -2024,15 +2245,15 @@ DL-RLC-Mode ::=                                         CHOICE {
        dl-TM-RLC-Mode                                          DL-TM-RLC-Mode
 }
 
-DL-RLC-Mode-r5 ::=                                             CHOICE {
-       dl-AM-RLC-Mode-r5                                       DL-AM-RLC-Mode-r5,
-       dl-UM-RLC-Mode-r5                                       DL-UM-RLC-Mode-r5,
+DL-RLC-Mode-r5 ::=                                     CHOICE {
+       dl-AM-RLC-Mode                                          DL-AM-RLC-Mode-r5,
+       dl-UM-RLC-Mode                                          DL-UM-RLC-Mode-r5,
        dl-TM-RLC-Mode                                          DL-TM-RLC-Mode
 }
 
-DL-RLC-Mode-r6 ::=                                             CHOICE {
-       dl-AM-RLC-Mode-r5                                       DL-AM-RLC-Mode-r5,
-       dl-UM-RLC-Mode-r5                                       DL-UM-RLC-Mode-r6,
+DL-RLC-Mode-r6 ::=                                     CHOICE {
+       dl-AM-RLC-Mode                                          DL-AM-RLC-Mode-r5,
+       dl-UM-RLC-Mode                                          DL-UM-RLC-Mode-r6,
        dl-TM-RLC-Mode                                          DL-TM-RLC-Mode
 }
 
@@ -2040,7 +2261,7 @@ DL-RLC-StatusInfo ::=                             SEQUENCE {
        timerStatusProhibit                                     TimerStatusProhibit                                     OPTIONAL,
        -- dummy is not used in this version of the specification, it should not be sent 
        -- and if received they should be ignored.
-       dummy-TimerEPC                                                  TimerEPC                                                        OPTIONAL,
+       dummy                                                   TimerEPC                                                        OPTIONAL,
        missingPDU-Indicator                                    BOOLEAN,
        timerStatusPeriodic                                     TimerStatusPeriodic                                     OPTIONAL
 }
@@ -2052,10 +2273,10 @@ DL-TM-RLC-Mode ::=                                      SEQUENCE {
 DL-TransportChannelType ::=                    CHOICE {
        dch                                                                     TransportChannelIdentity,
        fach                                                            NULL,
-       -- The choice \93dsch\94 should not be used in FDD mode, and if received
+       -- The choice "dsch" should not be used in FDD mode, and if received
        -- the UE behaviour is unspecified.
        dsch                                                            TransportChannelIdentity,
-       -- The choice \93dch-and-dsch\94 should not be used in FDD mode, and if received the UE
+       -- The choice "dch-and-dsch" should not be used in FDD mode, and if received the UE
        -- behaviour is unspecified
        dch-and-dsch                                            TransportChannelIdentityDCHandDSCH
 }
@@ -2063,10 +2284,10 @@ DL-TransportChannelType ::=                     CHOICE {
 DL-TransportChannelType-r5 ::=                 CHOICE {
        dch                                                                     TransportChannelIdentity,
        fach                                                            NULL,
-       -- The choice \93dsch\94 should not be used in FDD mode, and if received
+       -- The choice "dsch" should not be used in FDD mode, and if received
        -- the UE behaviour is unspecified.
        dsch                                                            TransportChannelIdentity,
-       -- The choice \93dch-and-dsch\94 should not be used in FDD mode, and if received the UE 
+       -- The choice "dch-and-dsch" should not be used in FDD mode, and if received the UE 
        -- behaviour is unspecified
        dch-and-dsch                                            TransportChannelIdentityDCHandDSCH,
        hsdsch                                                          MAC-d-FlowIdentity,
@@ -2166,7 +2387,7 @@ PDCP-InfoReconfig ::=                             SEQUENCE {
        pdcp-Info                                                       PDCP-Info,
        -- dummy is not used in this version of the specification and
        -- it should be ignored.
-       dummy-INTEGER-0-65535                           INTEGER (0..65535)
+       dummy                                                           INTEGER (0..65535)
 }
 
 PDCP-InfoReconfig-r4 ::=                       SEQUENCE {
@@ -2265,6 +2486,10 @@ RAB-Info-r6-ext ::=                                      SEQUENCE {
        mbms-SessionIdentity                            MBMS-SessionIdentity                            OPTIONAL
 }
 
+RAB-Info-v6b0ext ::=                           SEQUENCE {
+       mbms-ServiceIdentity                            OCTET STRING (SIZE (3))
+}
+
 RAB-Info-r6 ::=                                                SEQUENCE {
        rab-Identity                                            RAB-Identity,
        mbms-SessionIdentity                            MBMS-SessionIdentity                            OPTIONAL,
@@ -2273,6 +2498,15 @@ RAB-Info-r6 ::=                                          SEQUENCE {
        re-EstablishmentTimer                           Re-EstablishmentTimer
 }
 
+RAB-Info-r7 ::=                                                SEQUENCE {
+       rab-Identity                                            RAB-Identity,
+       mbms-SessionIdentity                            MBMS-SessionIdentity                            OPTIONAL,
+       mbms-ServiceIdentity                            OCTET STRING (SIZE (3))                         OPTIONAL,
+       cn-DomainIdentity                                       CN-DomainIdentity,
+       nas-Synchronisation-Indicator           NAS-Synchronisation-Indicator           OPTIONAL,
+       re-EstablishmentTimer                           Re-EstablishmentTimer
+}
+
 RAB-InformationList ::=                                SEQUENCE (SIZE (1..maxRABsetup)) OF
                                                                                RAB-Info
 
@@ -2318,6 +2552,15 @@ RAB-InformationSetup-r6 ::=                      SEQUENCE {
        rb-InformationSetupList                         RB-InformationSetupList-r6
 }
 
+RAB-InformationSetup-v6b0ext ::=       SEQUENCE {
+       rab-Info-v6b0ext                                        RAB-Info-v6b0ext                        OPTIONAL
+}
+
+RAB-InformationSetup-r7 ::=                    SEQUENCE {
+       rab-Info                                                        RAB-Info-r7,
+       rb-InformationSetupList                         RB-InformationSetupList-r6
+}
+
 RAB-InformationSetupList ::=           SEQUENCE (SIZE (1..maxRABsetup)) OF
                                                                                RAB-InformationSetup
 
@@ -2335,6 +2578,12 @@ RAB-InformationSetupList-r6 ::=          SEQUENCE (SIZE (1..maxRABsetup)) OF
 RAB-InformationSetupList-r6-ext ::= SEQUENCE (SIZE (1..maxRABsetup)) OF
                                                                                RAB-InformationSetup-r6-ext
 
+RAB-InformationSetupList-v6b0ext ::= SEQUENCE (SIZE (1..maxRABsetup)) OF
+                                                                               RAB-InformationSetup-v6b0ext
+
+RAB-InformationSetupList-r7 ::=                SEQUENCE (SIZE (1..maxRABsetup)) OF
+                                                                               RAB-InformationSetup-r7
+
 RB-ActivationTimeInfo ::=                      SEQUENCE {
        rb-Identity                                                     RB-Identity,
        rlc-SequenceNumber                                      RLC-SequenceNumber
@@ -2565,35 +2814,43 @@ RLC-Info ::=                                            SEQUENCE {
 
 RLC-Info-r5 ::=                                                SEQUENCE {
        ul-RLC-Mode                                                     UL-RLC-Mode                                                     OPTIONAL,
-       dl-RLC-Mode-r5                                          DL-RLC-Mode-r5                                          OPTIONAL,
+       dl-RLC-Mode                                                     DL-RLC-Mode-r5                                          OPTIONAL,
        rlc-OneSidedReEst                                       BOOLEAN
 }
 
 RLC-Info-r6 ::=                                                SEQUENCE {
        ul-RLC-Mode                                                     UL-RLC-Mode                                                     OPTIONAL,
-       dl-RLC-Mode-r5                                          DL-RLC-Mode-r6                                          OPTIONAL,
+       dl-RLC-Mode                                                     DL-RLC-Mode-r6                                          OPTIONAL,
        rlc-OneSidedReEst                                       BOOLEAN,
        altE-bitInterpretation                          ENUMERATED { true }                                     OPTIONAL
 }
 
-RLC-Info-MBMS-r6 ::=                           SEQUENCE {
+RLC-Info-MCCH-r6 ::=                           SEQUENCE {
        dl-UM-RLC-LI-size                                       DL-UM-RLC-LI-size,
-       dl-UM-RLC-DuplAvoid-Reord-Info          UM-RLC-DuplAvoid-Reord-Info-r6          OPTIONAL,
        dl-UM-RLC-OutOSeqDelivery-Info          UM-RLC-OutOSeqDelivery-Info-r6          OPTIONAL
 }
 
+RLC-Info-MSCH-r6 ::=                           SEQUENCE {
+       dl-UM-RLC-LI-size                                       DL-UM-RLC-LI-size
+}
+
+RLC-Info-MTCH-r6 ::=                           SEQUENCE {
+       dl-UM-RLC-LI-size                                       DL-UM-RLC-LI-size,
+       dl-UM-RLC-DuplAvoid-Reord-Info          UM-RLC-DuplAvoid-Reord-Info-r6          OPTIONAL
+}
+
 RLC-InfoChoice ::=                                     CHOICE {
        rlc-Info                                                        RLC-Info,
        same-as-RB                                                      RB-Identity
 }
 
-RLC-InfoChoice-r5 ::=                                  CHOICE {
-       rlc-Info-r5                                                     RLC-Info-r5,
+RLC-InfoChoice-r5 ::=                          CHOICE {
+       rlc-Info                                                        RLC-Info-r5,
        same-as-RB                                                      RB-Identity
 }
 
-RLC-InfoChoice-r6 ::=                                  CHOICE {
-       rlc-Info-r6                                                     RLC-Info-r6,
+RLC-InfoChoice-r6 ::=                          CHOICE {
+       rlc-Info                                                        RLC-Info-r6,
        same-as-RB                                                      RB-Identity
 }
 
@@ -2613,12 +2870,12 @@ RLC-SizeExplicitList ::=                        SEQUENCE (SIZE  (1..maxTF))     OF
 
 ROHC-Profile-r4 ::=                                    INTEGER (1..3)
 
-ROHC-ProfileList-r4 ::=                                SEQUENCE (SIZE  (1..maxROHCProfiler4))  OF
+ROHC-ProfileList-r4 ::=                                SEQUENCE (SIZE  (1..maxROHC-Profile-r4))        OF
                                                                                ROHC-Profile-r4
 
 ROHC-PacketSize-r4 ::=                         INTEGER (2..1500)
 
-ROHC-PacketSizeList-r4 ::=                     SEQUENCE (SIZE  (1..maxPRACHFPACH))     OF
+ROHC-PacketSizeList-r4 ::=                     SEQUENCE (SIZE  (1..maxROHC-PacketSizes-r4))    OF
                                                                                ROHC-PacketSize-r4
 
 SRB-InformationSetup ::=                       SEQUENCE {
@@ -2654,6 +2911,9 @@ SRB-InformationSetupList-r6 ::=           SEQUENCE (SIZE (1..maxSRBsetup)) OF
 SRB-InformationSetupList2 ::=          SEQUENCE (SIZE (3..4)) OF
                                                                                SRB-InformationSetup
 
+SRB-InformationSetupList2-r6 ::=       SEQUENCE (SIZE (3..4)) OF
+                                                                               SRB-InformationSetup-r6
+
 TimerDAR-r6 ::=                                                ENUMERATED {
                                                                                ms40, ms80, ms120, ms160, ms240, ms320, ms480, ms640,
                                                                                ms960, ms1280, ms1920, ms2560, ms3840, ms5120 }
@@ -2776,7 +3036,7 @@ UL-LogicalChannelMapping ::=              SEQUENCE {
 
 UL-LogicalChannelMapping-r6 ::=                SEQUENCE {
        ul-TrCH-Type                                            CHOICE {
-               dch-rach-cpch-usch                                      SEQUENCE {
+               dch-rach-usch                                           SEQUENCE {
                        -- TABULAR: UL-TransportChannelType contains TransportChannelIdentity as well.
                        ul-TransportChannelType                         UL-TransportChannelType,
                        logicalChannelIdentity                          LogicalChannelIdentity                          OPTIONAL,
@@ -2824,9 +3084,12 @@ UL-LogicalChannelMappings-r6 ::= CHOICE {
 }
 
 UL-RFC3095-r4 ::=                                      SEQUENCE {
-       cid-InclusionInfo                                       CID-InclusionInfo-r4,
+       -- dummy1 is not used in this version of the specification and shall be ignored by the receiver.
+       dummy1                                                          CID-InclusionInfo-r4,
        max-CID                                                         INTEGER (1..16383)                                      DEFAULT 15,
-       rohcPacketSizeList                                      ROHC-PacketSizeList-r4
+       -- dummy is not used in this version of the specification and
+       -- it should be ignored by the receiver.
+       dummy                                                           ROHC-PacketSizeList-r4
 }
 
 UL-RLC-Mode ::=                                                CHOICE {
@@ -2850,7 +3113,7 @@ UL-TransportChannelType ::=                       CHOICE {
        rach                                                            NULL,
        -- dummy is not used in this version of the specification and
        -- if received the UE behaviour is not specified.
-       dummy-NULL                                                      NULL,
+       dummy                                                           NULL,
        usch                                                            TransportChannelIdentity
 }
 
@@ -2866,11 +3129,11 @@ UM-RLC-OutOSeqDelivery-Info-r6 ::=      SEQUENCE {
 
 WindowSizeDAR-r6 ::=                           ENUMERATED {
                                                                                ws4, ws8, ws16, ws32, ws40, ws48,
-                                                                               ws56, ws64, spare1 }
+                                                                               ws56, ws64 }
 
 WindowSizeOSD-r6 ::=                           ENUMERATED {
                                                                                ws8, ws16, ws32, ws40, ws48,
-                                                                               ws56, ws64, spare1 }
+                                                                               ws56, ws64 }
 
 -- ***************************************************
 --
@@ -3047,7 +3310,7 @@ DL-AddReconfTransChInformation ::=        SEQUENCE {
        dch-QualityTarget                                       QualityTarget                                           OPTIONAL,
        -- dummy is not used in this version of the specification, it should 
        -- not be sent and if received it should be ignored.
-       dummy-TM-SignallingInfo                         TM-SignallingInfo                                       OPTIONAL
+       dummy                                                           TM-SignallingInfo                                       OPTIONAL
 }
 
 DL-AddReconfTransChInformation-r4 ::=  SEQUENCE {
@@ -3134,12 +3397,12 @@ DL-TransportChannelIdentity-r5 ::=              SEQUENCE {
        dl-TransportChannelType                         DL-TrCH-TypeId2-r5
 }
 
--- The choice \93dsch\94 should not be used in FDD mode, and if received the UE behaviour is unspecified
+-- The choice "dsch" should not be used in FDD mode, and if received the UE behaviour is unspecified
 DL-TrCH-Type ::=                                       ENUMERATED {dch, dsch}
 
 DL-TrCH-TypeId1-r5 ::=                         CHOICE {
        dch                                                                     TransportChannelIdentity,
-       -- The choice \93dsch\94 should not be used in FDD mode, and if received
+       -- The choice "dsch" should not be used in FDD mode, and if received
        -- the UE behaviour is unspecified.
        dsch                                                            TransportChannelIdentity,
        hsdsch                                                          NULL
@@ -3147,7 +3410,7 @@ DL-TrCH-TypeId1-r5 ::=                            CHOICE {
 
 DL-TrCH-TypeId2-r5 ::=                         CHOICE {
        dch                                                                     TransportChannelIdentity,
-       -- The choice \93dsch\94 should not be used in FDD mode, and if received
+       -- The choice "dsch" should not be used in FDD mode, and if received
        -- the UE behaviour is unspecified.
        dsch                                                            TransportChannelIdentity,
        hsdsch                                                          MAC-d-FlowIdentity
@@ -3170,7 +3433,7 @@ E-DCH-AddReconf-MAC-d-Flow ::=            SEQUENCE {
        mac-d-FlowMaxRetrans                            E-DCH-MAC-d-FlowMaxRetrans                      OPTIONAL,
        mac-d-FlowMultiplexingList                      E-DCH-MAC-d-FlowMultiplexingList        OPTIONAL,
        transmissionGrantType                           CHOICE {
-               non-ScheduledTranmGrantInfo                     SEQUENCE {
+               non-ScheduledTransGrantInfo                     SEQUENCE {
                        maxMAC-e-PDUContents                            INTEGER (1..19982),
                        ms2-NonSchedTransmGrantHARQAlloc        BIT STRING (SIZE (8))           OPTIONAL
                },
@@ -3178,18 +3441,79 @@ E-DCH-AddReconf-MAC-d-Flow ::=          SEQUENCE {
        }       OPTIONAL
 }
 
-E-DCH-Harq-Info ::=                                    SEQUENCE {
-       harq-RV-Configuration                           ENUMERATED { rv0 }                                      OPTIONAL
+E-DCH-AddReconf-MAC-d-Flow-r7 ::=      SEQUENCE {
+       mac-d-FlowIdentity                                      E-DCH-MAC-d-FlowIdentity,
+       mac-d-FlowPowerOffset                           E-DCH-MAC-d-FlowPowerOffset                     OPTIONAL,
+       mac-d-FlowMaxRetrans                            E-DCH-MAC-d-FlowMaxRetrans                      OPTIONAL,
+       mac-d-FlowRetransTimer                          E-DCH-MAC-d-FlowRetransTimer            OPTIONAL,
+       mac-d-FlowMultiplexingList                      E-DCH-MAC-d-FlowMultiplexingList        OPTIONAL,
+       transmissionGrantType                           CHOICE {
+               non-ScheduledTransGrantInfo                     SEQUENCE {
+                       modeSpecificInfo                                        CHOICE {
+                               fdd                                                                     SEQUENCE {
+                                       maxMAC-e-PDUContents                            INTEGER (1..19982),
+                                       ms2-NonSchedTransmGrantHARQAlloc        BIT STRING (SIZE (8))           OPTIONAL
+                               },
+                               tdd                                                                     SEQUENCE {
+                                       tddOption                                                       CHOICE {
+                                               tdd384-768                                                      SEQUENCE {
+                                                       timeslotResourceRelatedInfo                     BIT STRING (SIZE (13)),
+                                                       powerResourceRelatedInfo                        INTEGER (1..16),
+                                                       activationTime                                          ActivationTime,
+                                                       repetitionPeriod                                        ENUMERATED { rp1, rp2, rp4, rp8,
+                                                                                                                                       rp16, rp32, rp64}       OPTIONAL,
+                                                       repetitionLength                                        INTEGER (0..64),
+                                                       codeResourceInfo                                        UL-TS-ChannelisationCode
+                                               },
+                                               tdd128                                                          SEQUENCE {
+                                                       noSlotsForTFCIandTPC                            INTEGER (1..5)          OPTIONAL,
+                                                       timeslotResourceRelatedInfo                     BIT STRING (SIZE (5)),
+                                                       powerResourceRelatedInfo                        INTEGER (1..16),
+                                                       activationTime                                          ActivationTime,
+                                                       sfnNum                                                          INTEGER (0..1),
+                                                       repetitionPeriod                                        ENUMERATED { rp1, rp2, rp4, rp8,
+                                                                                                                                       rp16, rp32, rp64}       OPTIONAL,
+                                                       repetitionLength                                        INTEGER (0..63),
+                                                       codeResourceInfo                                        UL-TS-ChannelisationCode,
+                                                       e-HICH-Info                                                     SEQUENCE {
+                                                               timeslotNumber                                          TimeslotNumber-LCR-r4,
+                                                               channelisation-Code                                     HS-ChannelisationCode-LCR,
+                                                               midambleAllocationMode                          CHOICE {
+                                                                       defaultMidamble                                         NULL,
+                                                                       ueSpecificMidamble                                      INTEGER (0..15)
+                                                               },
+                                                               -- Actual value midambleConfiguration = IE value * 2
+                                                               midambleConfiguration                           INTEGER (1..8)
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+               },
+               scheduledTransmissionGrantInfo          NULL
+       }       OPTIONAL
 }
 
-E-DCH-MAC-d-FlowIdentity ::=           INTEGER (0..maxEDCHMACdFlow1)
+E-DCH-AddReconf-MAC-d-FlowList ::=     SEQUENCE (SIZE (1..maxE-DCHMACdFlow)) OF
+                                                       E-DCH-AddReconf-MAC-d-Flow
+
+E-DCH-AddReconf-MAC-d-FlowList-r7 ::= SEQUENCE (SIZE (1..maxE-DCHMACdFlow)) OF
+                                                                               E-DCH-AddReconf-MAC-d-Flow-r7
+
+E-DCH-MAC-d-FlowIdentity ::=           INTEGER (0..maxE-DCHMACdFlow-1)
 
 E-DCH-MAC-d-FlowMaxRetrans ::=         INTEGER (0..15)
 
-E-DCH-MAC-d-FlowMultiplexingList ::= BIT STRING (SIZE (maxEDCHMACdFlow))
+E-DCH-MAC-d-FlowMultiplexingList ::= BIT STRING (SIZE (maxE-DCHMACdFlow))
 
 E-DCH-MAC-d-FlowPowerOffset ::=                INTEGER (0..6)
 
+E-DCH-MAC-d-FlowRetransTimer ::=       ENUMERATED {
+                                                                               ms10, ms15, ms20, ms25, ms30, ms35, ms40, ms45, ms50,
+                                                                               ms55, ms60, ms65, ms70, ms75, ms80, ms85, ms90, ms95,
+                                                                               ms100, ms110, ms120, ms140, ms160, ms200, ms240, ms280,
+                                                                               ms320, ms400, ms480, ms560 }
+
 E-DCH-TTI ::=                                          ENUMERATED { tti2, tti10 }
 
 ExplicitTFCS-Configuration ::=         CHOICE {
@@ -3277,7 +3601,7 @@ MAC-d-FlowIdentityDCHandHSDSCH ::=        SEQUENCE {
 
 MAC-d-FlowIdentity ::=                         INTEGER (0..7)
 
-MAC-d-PDU-SizeInfo-List ::=                    SEQUENCE (SIZE(1.. maxMACdPDUsizes)) OF
+MAC-d-PDU-SizeInfo-List ::=                    SEQUENCE (SIZE(1.. maxMAC-d-PDUsizes)) OF
                                                                                MAC-d-PDUsizeInfo
 
 --MAC-d-Pdu sizes need to be defined
@@ -3435,12 +3759,6 @@ TFC-Subset ::=                                           CHOICE {
        fullTFCS                                                        NULL
 }
 
-TFC-Subset-ID-With3b ::=                       INTEGER (0..7)
-
-TFC-Subset-ID-With5b ::=                       INTEGER (0..31)
-
-TFC-Subset-ID-With10b ::=                      INTEGER (0..1023)
-
 TFC-SubsetList ::=                                     SEQUENCE (SIZE (1.. maxTFCsub)) OF SEQUENCE {
        modeSpecificInfo                                        CHOICE {
                fdd                                                                     NULL,
@@ -3463,14 +3781,14 @@ TFCI-Range ::=                                          SEQUENCE {
        tfcs-InfoForDSCH                                        TFCS-InfoForDSCH
 }
 
-TFCI-RangeList ::=                                     SEQUENCE (SIZE (1..maxPDSCHTFCIgroups)) OF
+TFCI-RangeList ::=                                     SEQUENCE (SIZE (1..maxPDSCH-TFCIgroups)) OF
                                                                                TFCI-Range
 
 TFCS ::=                                                       CHOICE {
        normalTFCI-Signalling                           ExplicitTFCS-Configuration,
        -- dummy is not used in this version of specification, it should
-       -- not be sent and if received it should be ignored.
-       dummy-SplitTFCI-Signalling                      SplitTFCI-Signalling
+       -- not be sent and if received the UE behaviour is not specified.
+       dummy                                                           SplitTFCI-Signalling
 }
 
 TFCS-Identity ::=                                      SEQUENCE {
@@ -3574,6 +3892,10 @@ UL-AddReconfTransChInfoList ::=          SEQUENCE (SIZE (1..maxTrCHpreconf)) OF
 UL-AddReconfTransChInfoList-r6 ::=     SEQUENCE (SIZE (1..maxTrCH)) OF
                                                                                UL-AddReconfTransChInformation-r6
 
+-- The maximum allowed size of UL-AddReconfTransChInfoList-r7 sequence is 32
+UL-AddReconfTransChInfoList-r7 ::=     SEQUENCE (SIZE (1..maxTrCH)) OF
+                                                                               UL-AddReconfTransChInformation-r7
+
 UL-AddReconfTransChInformation ::= SEQUENCE {
        ul-TransportChannelType                         UL-TrCH-Type,
        transportChannelIdentity                        TransportChannelIdentity,
@@ -3588,8 +3910,26 @@ UL-AddReconfTransChInformation-r6 ::= CHOICE {
        },
        e-dch                                                           SEQUENCE {
                tti                                                                     E-DCH-TTI,
-               harq-Info                                                       E-DCH-Harq-Info                                 OPTIONAL,
-               addReconf-MAC-d-Flow                            E-DCH-AddReconf-MAC-d-Flow              OPTIONAL
+               harq-Info                                                       ENUMERATED { rv0, rvtable },
+               addReconf-MAC-d-FlowList                        E-DCH-AddReconf-MAC-d-FlowList  OPTIONAL
+       }
+}
+
+UL-AddReconfTransChInformation-r7 ::= CHOICE {
+       dch-usch                                                        SEQUENCE {
+               ul-TransportChannelType                         UL-TrCH-Type,
+               transportChannelIdentity                        TransportChannelIdentity,
+               transportFormatSet                                      TransportFormatSet
+       },
+       e-dch                                                           SEQUENCE {
+               modeSpecific                                            CHOICE {
+                       fdd                                                                     SEQUENCE {
+                               tti                                                                     E-DCH-TTI
+                       },
+                       tdd                                                                     NULL
+               },
+               harq-Info                                                       ENUMERATED { rv0, rvtable },
+               addReconf-MAC-d-FlowList                        E-DCH-AddReconf-MAC-d-FlowList-r7       OPTIONAL
        }
 }
 
@@ -3721,6 +4061,74 @@ AccessServiceClass-TDD ::=                       SEQUENCE {
        }
 }
 
+AccessServiceClass-TDD-r7 ::=                  SEQUENCE {
+       channelisationCodeIndices                       BIT STRING      {
+                                                                                       chCodeIndex15(0),
+                                                                                       chCodeIndex14(1),
+                                                                                       chCodeIndex13(2),
+                                                                                       chCodeIndex12(3),
+                                                                                       chCodeIndex11(4),
+                                                                                       chCodeIndex10(5),
+                                                                                       chCodeIndex9(6),
+                                                                                       chCodeIndex8(7),
+                                                                                       chCodeIndex7(8),
+                                                                                       chCodeIndex6(9),
+                                                                                       chCodeIndex5(10),
+                                                                                       chCodeIndex4(11),
+                                                                                       chCodeIndex3(12),
+                                                                                       chCodeIndex2(13),
+                                                                                       chCodeIndex1(14),
+                                                                                       chCodeIndex0(15)
+                                                                                       } (SIZE(16))                            OPTIONAL,
+       subchannelSize                                          CHOICE {
+               size1                                                           NULL,
+               size2                                                           SEQUENCE {
+                       -- subch0 means bitstring '01' in the tabular, subch1 means bitsring '10'
+                       subchannels                                                     ENUMERATED      { subch0, subch1 }      OPTIONAL
+               },
+               size4                                                           SEQUENCE {
+                       subchannels                                                     BIT STRING      {
+                                                                                                       subCh3(0), 
+                                                                                                       subCh2(1), 
+                                                                                                       subCh1(2), 
+                                                                                                       subCh0(3) 
+                                                                                                       } (SIZE(4))             OPTIONAL
+               },
+               size8                                                           SEQUENCE {
+                       subchannels                                                     BIT STRING      {
+                                                                                                       subCh7(0), 
+                                                                                                       subCh6(1), 
+                                                                                                       subCh5(2), 
+                                                                                                       subCh4(3), 
+                                                                                                       subCh3(4), 
+                                                                                                       subCh2(5), 
+                                                                                                       subCh1(6), 
+                                                                                                       subCh0(7) 
+                                                                                                       } (SIZE(8))             OPTIONAL
+               },
+               size16                                                          SEQUENCE {
+                       subchannels                                                     BIT STRING      {
+                                                                                                       subCh15(0), 
+                                                                                                       subCh14(1), 
+                                                                                                       subCh13(2), 
+                                                                                                       subCh12(3), 
+                                                                                                       subCh11(4), 
+                                                                                                       subCh10(5), 
+                                                                                                       subCh9(6), 
+                                                                                                       subCh8(7),
+                                                                                                       subCh7(8),
+                                                                                                       subCh6(9),
+                                                                                                       subCh5(10),
+                                                                                                       subCh4(11),
+                                                                                                       subCh3(12),
+                                                                                                       subCh2(13),
+                                                                                                       subCh1(14),
+                                                                                                       subCh0(15) 
+                                                                                                       } (SIZE(16))            OPTIONAL
+               }
+       }
+}
+
 AccessServiceClass-TDD-LCR-r4 ::=      SEQUENCE {
        availableSYNC-UlCodesIndics                 BIT STRING {
                                                                                        sulCodeIndex7(0),
@@ -3763,7 +4171,7 @@ AccessServiceClass-TDD-LCR-r4 ::= SEQUENCE {
 }
 
 AdditionalPRACH-TF-and-TFCS-CCCH-IEs ::= SEQUENCE {
-       powerOffsetInformation                          PowerOffsetInformation                  OPTIONAL,
+       powerOffsetInformation                          PowerOffsetInformation,
        dynamicTFInformationCCCH                        DynamicTFInformationCCCH
 }
 
@@ -3822,6 +4230,14 @@ ASCSetting-TDD ::=                                               SEQUENCE {
        accessServiceClass-TDD                                  AccessServiceClass-TDD  OPTIONAL
 }
 
+ASCSetting-TDD-r7 ::=                                          SEQUENCE {
+       -- TABULAR: accessServiceClass-TDD is MD in tabular description
+       -- Default value is previous ASC
+       -- If this is the first ASC, the default value is all available channelisation codes and
+       -- all available sub-channels with subchannelSize=size1.
+       accessServiceClass-TDD                                          AccessServiceClass-TDD-r7       OPTIONAL
+}
+
 ASCSetting-TDD-LCR-r4 ::=                                              SEQUENCE {
        -- TABULAR: accessServiceClass-TDD-LCR is MD in tabular description
        -- Default value is previous ASC
@@ -3830,16 +4246,16 @@ ASCSetting-TDD-LCR-r4 ::=                                               SEQUENCE {
        accessServiceClass-TDD-LCR                                      AccessServiceClass-TDD-LCR-r4   OPTIONAL
 }
 
-AvailableAP-Signature-VCAMList ::=     SEQUENCE (SIZE (1..maxPCPCHAPsig)) OF
+AvailableAP-Signature-VCAMList ::=     SEQUENCE (SIZE (1..maxPCPCH-APsig)) OF
                                                                                AP-Signature-VCAM
 
-AvailableAP-SignatureList ::=          SEQUENCE (SIZE (1..maxPCPCHAPsig)) OF
+AvailableAP-SignatureList ::=          SEQUENCE (SIZE (1..maxPCPCH-APsig)) OF
                                                                                AP-Signature
 
-AvailableAP-SubchannelList ::=         SEQUENCE (SIZE (1..maxPCPCHAPsubCh)) OF
+AvailableAP-SubchannelList ::=         SEQUENCE (SIZE (1..maxPCPCH-APsubCh)) OF
                                                                                AP-Subchannel
 
-AvailableMinimumSF-ListVCAM ::=                SEQUENCE (SIZE (1..maxPCPCHSF)) OF
+AvailableMinimumSF-ListVCAM ::=                SEQUENCE (SIZE (1..maxPCPCH-SF)) OF
                                                                                AvailableMinimumSF-VCAM
 
 AvailableMinimumSF-VCAM ::=                    SEQUENCE {
@@ -3906,9 +4322,14 @@ CCTrCH-PowerControlInfo-r5 ::=           SEQUENCE {
        ul-DPCH-PowerControlInfo                        UL-DPCH-PowerControlInfo-r5
 }
 
+CCTrCH-PowerControlInfo-r7 ::=         SEQUENCE {
+       tfcs-Identity                                           TFCS-Identity                                           OPTIONAL,
+       ul-DPCH-PowerControlInfo                        UL-DPCH-PowerControlInfo-r7
+}
+
 CD-AccessSlotSubchannel ::=                    INTEGER (0..11)
 
-CD-AccessSlotSubchannelList ::=                SEQUENCE (SIZE (1..maxPCPCHCDsubCh)) OF
+CD-AccessSlotSubchannelList ::=                SEQUENCE (SIZE (1..maxPCPCH-CDsubCh)) OF
                                                                                CD-AccessSlotSubchannel
 
 CD-CA-ICH-ChannelisationCode ::=       INTEGER (0..255)
@@ -3917,7 +4338,7 @@ CD-PreambleScramblingCode ::=             INTEGER (0..79)
 
 CD-SignatureCode ::=                           INTEGER (0..15)
 
-CD-SignatureCodeList ::=                       SEQUENCE (SIZE (1..maxPCPCHCDsig)) OF
+CD-SignatureCodeList ::=                       SEQUENCE (SIZE (1..maxPCPCH-CDsig)) OF
                                                                                CD-SignatureCode
 
 CellAndChannelIdentity ::=                     SEQUENCE {
@@ -3968,6 +4389,14 @@ CommonTimeslotInfo ::=                           SEQUENCE {
        repetitionPeriodAndLength                       RepetitionPeriodAndLength                       OPTIONAL
 }
 
+CommonTimeslotInfoMBMS ::=                     SEQUENCE {
+       -- TABULAR: secondInterleavingMode is MD, but since it can be encoded in a single
+       -- bit it is not defined as OPTIONAL.
+       secondInterleavingMode                          SecondInterleavingMode,
+       tfci-Coding                                                     TFCI-Coding                                                     OPTIONAL,
+       puncturingLimit                                         PuncturingLimit
+}
+
 CommonTimeslotInfoSCCPCH ::=           SEQUENCE {
        -- TABULAR: secondInterleavingMode is MD, but since it can be encoded in a single
        -- bit it is not defined as OPTIONAL.
@@ -4017,6 +4446,24 @@ CPCH-StatusIndicationMode ::=            ENUMERATED {
                                                                                pa-mode,
                                                                                pamsf-mode }
 
+CQI-DTX-Timer ::=                                      ENUMERATED {
+                                                                               sub-frames-0,
+                                                                               sub-frames-1,
+                                                                               sub-frames-2,
+                                                                               sub-frames-4,
+                                                                               sub-frames-8,
+                                                                               sub-frames-16,
+                                                                               sub-frames-32,
+                                                                               sub-frames-64,
+                                                                               sub-frames-128,
+                                                                               sub-frames-256,
+                                                                               sub-frames-512,
+                                                                               sub-frames-Infinity,
+                                                                               spare4,
+                                                                               spare3,
+                                                                               spare2,
+                                                                               spare1 }
+
 CQI-RepetitionFactor ::=                       INTEGER(1..4)
 
 CSICH-PowerOffset ::=                          INTEGER (-10..5)
@@ -4064,25 +4511,43 @@ DL-CCTrCh-r4 ::=                                        SEQUENCE {
        ul-CCTrChTPCList                                        UL-CCTrChTPCList                OPTIONAL
 }
 
+DL-CCTrCh-r7 ::=                                       SEQUENCE {
+       tfcs-ID                                                         TFCS-IdentityPlain                                      DEFAULT 1,
+       timeInfo                                                        TimeInfo,
+       commonTimeslotInfo                                      CommonTimeslotInfo                                      OPTIONAL,
+       tddOption                                                       CHOICE {
+               tdd384                                                          SEQUENCE {
+                       dl-CCTrCH-TimeslotsCodes                        DownlinkTimeslotsCodes  OPTIONAL
+               },
+               tdd768                                                          SEQUENCE {
+                       dl-CCTrCH-TimeslotsCodes                        DownlinkTimeslotsCodes-VHCR             OPTIONAL
+               },
+               tdd128                                                          SEQUENCE {
+                       dl-CCTrCH-TimeslotsCodes                        DownlinkTimeslotsCodes-LCR-r4   OPTIONAL
+               }
+       },
+       ul-CCTrChTPCList                                        UL-CCTrChTPCList                OPTIONAL
+}
+
 DL-CCTrChList ::=                                      SEQUENCE (SIZE (1..maxCCTrCH)) OF
                                                                                DL-CCTrCh
 
+DL-CCTrChList-r7 ::=                           SEQUENCE (SIZE (1..maxCCTrCH)) OF
+                                                                               DL-CCTrCh-r7
+
 DL-CCTrChList-r4 ::=                           SEQUENCE (SIZE (1..maxCCTrCH)) OF
                                                                                DL-CCTrCh-r4
 
 DL-CCTrChListToRemove ::=                      SEQUENCE (SIZE (1..maxCCTrCH)) OF
                                                                                TFCS-IdentityPlain
 
-DL-CCTrChTPCList ::=                           SEQUENCE (SIZE (0..maxCCTrCH)) OF
-                                                                                       TFCS-Identity
-
 DL-ChannelisationCode ::=                      SEQUENCE {
        secondaryScramblingCode                         SecondaryScramblingCode                         OPTIONAL,
        sf-AndCodeNumber                                        SF512-AndCodeNumber,
        scramblingCodeChange                            ScramblingCodeChange                            OPTIONAL
 }
 
-DL-ChannelisationCodeList ::=          SEQUENCE (SIZE (1..maxDPCHDLchan)) OF
+DL-ChannelisationCodeList ::=          SEQUENCE (SIZE (1..maxDPCH-DLchan)) OF
                                                                                DL-ChannelisationCode
 
 DL-CommonInformation ::=                       SEQUENCE {
@@ -4094,7 +4559,7 @@ DL-CommonInformation ::=                  SEQUENCE {
                        tx-DiversityMode                                        TX-DiversityMode                        OPTIONAL,
                        -- dummy is not used in this version of the specification, it should
                        -- not be sent and if received it should be ignored.
-                       dummy-SSDT-Information                          SSDT-Information                        OPTIONAL
+                       dummy                                                           SSDT-Information                        OPTIONAL
                },
                tdd                                                                     SEQUENCE {
                        defaultDPCH-OffsetValue                         DefaultDPCH-OffsetValueTDD      OPTIONAL
@@ -4111,7 +4576,7 @@ DL-CommonInformation-r4 ::=                       SEQUENCE {
                        tx-DiversityMode                                        TX-DiversityMode                        OPTIONAL,
                        -- dummy is not used in this version of the specification, it should
                        -- not be sent and if received it should be ignored.
-                       dummy-SSDT-Information-r4                       SSDT-Information-r4                     OPTIONAL
+                       dummy                                                           SSDT-Information-r4                     OPTIONAL
                },
                tdd                                                                     SEQUENCE {
                        tddOption                                                       CHOICE {
@@ -4135,7 +4600,7 @@ DL-CommonInformation-r5 ::=                       SEQUENCE {
                        tx-DiversityMode                                        TX-DiversityMode                        OPTIONAL,
                        -- dummy is not used in this version of the specification, it should
                        -- not be sent and if received it should be ignored.
-                       dummy-SSDT-Information-r4                       SSDT-Information-r4                     OPTIONAL
+                       dummy                                                           SSDT-Information-r4                     OPTIONAL
                },
                tdd                                                                     SEQUENCE {
                        tddOption                                                       CHOICE {
@@ -4175,6 +4640,32 @@ DL-CommonInformation-r6 ::=                      SEQUENCE {
        postVerificationPeriod                          ENUMERATED { true }                     OPTIONAL
 }
 
+DL-CommonInformation-r7 ::=                    SEQUENCE {
+       dl-dpchInfoCommon                                       CHOICE {
+               dl-DPCH-InfoCommon                                      DL-DPCH-InfoCommon-r6,
+               dl-FDPCH-InfoCommon                                     DL-FDPCH-InfoCommon-r6
+       }                                                                                                                                               OPTIONAL,
+       modeSpecificInfo                                        CHOICE {
+               fdd                                                                     SEQUENCE {
+                       defaultDPCH-OffsetValue                         DefaultDPCH-OffsetValueFDD      OPTIONAL,
+                       dpch-CompressedModeInfo                         DPCH-CompressedModeInfo         OPTIONAL,
+                       tx-DiversityMode                                        TX-DiversityMode                        OPTIONAL
+               },
+               tdd                                                                     SEQUENCE {
+                       tddOption                                                       CHOICE {
+                               tdd384                                                          NULL,
+                               tdd768                                                          NULL,
+                               tdd128                                                          SEQUENCE {
+                                       tstd-Indicator                                          BOOLEAN
+                               }
+                       },
+                       defaultDPCH-OffsetValue                         DefaultDPCH-OffsetValueTDD      OPTIONAL
+               }
+       },
+       mac-hsResetIndicator                            ENUMERATED { true }                     OPTIONAL,
+       postVerificationPeriod                          ENUMERATED { true }                     OPTIONAL
+}
+
 DL-CommonInformationPost ::=           SEQUENCE {
        dl-DPCH-InfoCommon                                      DL-DPCH-InfoCommonPost
 }
@@ -4185,7 +4676,7 @@ DL-CommonInformationPredef ::=            SEQUENCE {
 
 DL-CompressedModeMethod ::=                    ENUMERATED {
                -- dummy is not used in this version of the specification, it should
-               -- not be sent and if received it should be ignored.
+               -- not be sent and if received the UE behaviour is not specified.
                                                                                dummy, sf-2,
                                                                                higherLayerScheduling }
 
@@ -4193,7 +4684,9 @@ DL-DPCH-InfoCommon ::=                            SEQUENCE {
        cfnHandling                                                     CHOICE {
                maintain                                                        NULL,
                initialise                                                      SEQUENCE {
-                       cfntargetsfnframeoffset                         Cfntargetsfnframeoffset                         OPTIONAL
+                       -- IE dummy is not used in this version of the specification
+                       -- The IE should not be sent and if received it should be ignored
+                       dummy                                                           Cfntargetsfnframeoffset                         OPTIONAL
                }
        },
        modeSpecificInfo                                        CHOICE {
@@ -4216,7 +4709,9 @@ DL-DPCH-InfoCommon-r4 ::=                 SEQUENCE {
        cfnHandling                                                     CHOICE {
                maintain                                                        NULL,
                initialise                                                      SEQUENCE {
-                       cfntargetsfnframeoffset                         Cfntargetsfnframeoffset                         OPTIONAL
+                       -- IE dummy is not used in this version of the specification
+                       -- The IE should not be sent and if received it should be ignored
+                       dummy                                                           Cfntargetsfnframeoffset                         OPTIONAL
                }
        },
        modeSpecificInfo                                        CHOICE {
@@ -4261,9 +4756,9 @@ DL-DPCH-InfoCommon-r6 ::=                         SEQUENCE {
                        dl-DPCH-PowerControlInfo                        DL-DPCH-PowerControlInfo                        OPTIONAL
                }
        },
-       -- The IE mac-d-HFN-initial-value should be absent in the RRCConnectionSetup-r4-IEs or 
-       -- RRCConnectionSetup-r5-IEs or HandoverToUTRANCommand-r4-IEs or HandoverToUTRANCommand-r5-IEs
-       -- and if the IE is included, the general error handling for conditional IEs applies.
+       -- The IE mac-d-HFN-initial-value should be absent in the RRCConnectionSetup and the
+       -- HandoverToUTRANCommand messages. If the IE is included, the general error handling
+       -- for conditional IEs applies.
        mac-d-HFN-initial-value                         MAC-d-HFN-initial-value                         OPTIONAL
 }
 
@@ -4294,7 +4789,7 @@ DL-DPCH-InfoPerRL ::=                             CHOICE {
                tpc-CombinationIndex                            TPC-CombinationIndex,
                -- dummy is not used in this version of the specification, it should
                -- not be sent and if received it should be ignored.
-               dummy-SSDT-CellIdentity                         SSDT-CellIdentity                               OPTIONAL,
+               dummy                                                           SSDT-CellIdentity                               OPTIONAL,
                closedLoopTimingAdjMode                         ClosedLoopTimingAdjMode                 OPTIONAL
        },
        tdd                                                                     SEQUENCE {
@@ -4312,7 +4807,7 @@ DL-DPCH-InfoPerRL-r4 ::=                  CHOICE {
                tpc-CombinationIndex                            TPC-CombinationIndex,
                -- dummy is not used in this version of the specification, it should
                -- not be sent and if received it should be ignored.
-               dummy-SSDT-CellIdentity                         SSDT-CellIdentity                               OPTIONAL,
+               dummy                                                           SSDT-CellIdentity                               OPTIONAL,
                closedLoopTimingAdjMode                         ClosedLoopTimingAdjMode                 OPTIONAL
        },
        tdd                                                                     SEQUENCE {
@@ -4331,7 +4826,7 @@ DL-DPCH-InfoPerRL-r5 ::=                  CHOICE {
                powerOffsetTPC-pdpdch                           PowerOffsetTPC-pdpdch                   OPTIONAL,
                -- dummy is not used in this version of the specification, it should
                -- not be sent and if received it should be ignored.
-               dummy-SSDT-CellIdentity                         SSDT-CellIdentity                               OPTIONAL,
+               dummy                                                           SSDT-CellIdentity                               OPTIONAL,
                closedLoopTimingAdjMode                         ClosedLoopTimingAdjMode                 OPTIONAL
        },
        tdd                                                                     SEQUENCE {
@@ -4356,6 +4851,23 @@ DL-DPCH-InfoPerRL-r6 ::=                 CHOICE {
        }
 }
 
+DL-DPCH-InfoPerRL-r7 ::=                       CHOICE {
+       fdd                                                                     SEQUENCE {
+               pCPICH-UsageForChannelEst                       PCPICH-UsageForChannelEst,
+               dpch-FrameOffset                                        DPCH-FrameOffset,
+               secondaryCPICH-Info                                     SecondaryCPICH-Info                             OPTIONAL,
+               dl-ChannelisationCodeList                       DL-ChannelisationCodeList,
+               tpc-CombinationIndex                            TPC-CombinationIndex,
+               sttdIndication                                          STTDIndication                                  OPTIONAL,
+               powerOffsetTPC-pdpdch                           PowerOffsetTPC-pdpdch                   OPTIONAL,
+               closedLoopTimingAdjMode                         ClosedLoopTimingAdjMode                 OPTIONAL
+       },
+       tdd                                                                     SEQUENCE {
+               dl-CCTrChListToEstablish                        DL-CCTrChList-r7                                OPTIONAL,
+               dl-CCTrChListToRemove                           DL-CCTrChListToRemove                   OPTIONAL
+       }
+}
+
 DL-FDPCH-InfoPerRL-r6 ::=                      SEQUENCE {
        pCPICH-UsageForChannelEst                       PCPICH-UsageForChannelEst,
        fdpch-FrameOffset                                       DPCH-FrameOffset,
@@ -4365,6 +4877,16 @@ DL-FDPCH-InfoPerRL-r6 ::=                        SEQUENCE {
        tpc-CombinationIndex                            TPC-CombinationIndex
 }
 
+DL-FDPCH-InfoPerRL-r7 ::=                      SEQUENCE {
+       pCPICH-UsageForChannelEst                       PCPICH-UsageForChannelEst,
+       fdpch-FrameOffset                                       DPCH-FrameOffset,
+       secondaryCPICH-Info                                     SecondaryCPICH-Info                             OPTIONAL,
+       secondaryScramblingCode                         SecondaryScramblingCode                 OPTIONAL,
+       dl-ChannelisationCode                           INTEGER (0..255),
+       tpc-CombinationIndex                            TPC-CombinationIndex,
+       sttdIndication                                          STTDIndication                                  OPTIONAL
+}
+
 DL-DPCH-InfoPerRL-PostFDD ::=                                                          SEQUENCE {
                pCPICH-UsageForChannelEst                               PCPICH-UsageForChannelEst,
                dl-ChannelisationCode                                   DL-ChannelisationCode,
@@ -4441,28 +4963,57 @@ DL-HSPDSCH-Information-r6 ::=   SEQUENCE {
        }
 }
 
+DL-HSPDSCH-Information-r7 ::=  SEQUENCE {
+       hs-scch-Info                                    HS-SCCH-Info-r7                                                 OPTIONAL,
+       measurement-feedback-Info               Measurement-Feedback-Info-r7                    OPTIONAL,
+       modeSpecificInfo                                CHOICE {
+               tdd                                                             CHOICE {
+                       tdd384                                                  SEQUENCE {
+                               dl-HSPDSCH-TS-Configuration             DL-HSPDSCH-TS-Configuration     OPTIONAL
+                       },
+                       tdd768                                                  SEQUENCE {
+                               dl-HSPDSCH-TS-Configuration             DL-HSPDSCH-TS-Configuration-VHCR        OPTIONAL
+                       },
+                       tdd128                                                  SEQUENCE {
+                               hs-PDSCH-Midamble-Configuration-tdd128
+                                               HS-PDSCH-Midamble-Configuration-TDD128                                          OPTIONAL
+                       }
+               },
+               fdd                                                             SEQUENCE {
+                       dl-64QAM-Configured                             ENUMERATED { true }                                     OPTIONAL
+               }
+       }
+}
+
 -- The IE 'DL-HSPDSCH-TS-Configuration' applies to tdd-384 REL-5 onward
-DL-HSPDSCH-TS-Configuration ::=                SEQUENCE (SIZE (1..maxTS1)) OF
+DL-HSPDSCH-TS-Configuration ::=                SEQUENCE (SIZE (1..maxTS-1)) OF
                                                                                SEQUENCE {
        timeslot                                                                TimeslotNumber,
        midambleShiftAndBurstType                               MidambleShiftAndBurstType-DL
 }
 
+-- The IE 'DL-HSPDSCH-TS-Configuration-VHCR' applies to tdd-768 REL-7 onward
+DL-HSPDSCH-TS-Configuration-VHCR ::= SEQUENCE (SIZE (1..maxTS-1)) OF
+                                                                               SEQUENCE {
+       timeslot                                                                TimeslotNumber,
+       midambleShiftAndBurstType                               MidambleShiftAndBurstType-DL-VHCR
+}
+
 DL-InformationPerRL ::=                                SEQUENCE {
        modeSpecificInfo                                        CHOICE {
                fdd                                                                     SEQUENCE {
                        primaryCPICH-Info                                       PrimaryCPICH-Info,
                        -- dummy1 and dummy 2 are not used in this version of specification, they should
                        -- not be sent and if received they should be ignored.
-                       dummy1-PDSCH-SHO-DCH-Info                                                               PDSCH-SHO-DCH-Info                      OPTIONAL,
-                       dummy2-PDSCH-CodeMapping                                                                PDSCH-CodeMapping                       OPTIONAL
+                       dummy1                                                          PDSCH-SHO-DCH-Info                      OPTIONAL,
+                       dummy2                                                          PDSCH-CodeMapping                       OPTIONAL
                },
                tdd                                                                     PrimaryCCPCH-Info
        },
        dl-DPCH-InfoPerRL                                       DL-DPCH-InfoPerRL                                       OPTIONAL,
        -- dummy is not used in this version of the specification, it should
        -- not be sent and if received it should be ignored.
-       dummy-SCCPCH-InfoForFACH                                                                SCCPCH-InfoForFACH                                      OPTIONAL
+       dummy                                                           SCCPCH-InfoForFACH                                      OPTIONAL
 }
 
 DL-InformationPerRL-r4 ::=                     SEQUENCE {
@@ -4471,15 +5022,15 @@ DL-InformationPerRL-r4 ::=                      SEQUENCE {
                        primaryCPICH-Info                                       PrimaryCPICH-Info,
                        -- dummy1 and dummy 2 are not used in this version of specification, they should
                        -- not be sent and if received they should be ignored.
-                       dummy1-PDSCH-SHO-DCH-Info                                                               PDSCH-SHO-DCH-Info                      OPTIONAL,
-                       dummy2-PDSCH-CodeMapping                                                                PDSCH-CodeMapping                       OPTIONAL
+                       dummy1                                                          PDSCH-SHO-DCH-Info                      OPTIONAL,
+                       dummy2                                                          PDSCH-CodeMapping                       OPTIONAL
                },
                tdd                                                                     PrimaryCCPCH-Info-r4
        },
        dl-DPCH-InfoPerRL                                       DL-DPCH-InfoPerRL-r4                            OPTIONAL,
        -- dummy is not used in this version of the specification, it should
        -- not be sent and if received it should be ignored.
-       dummy-SCCPCH-InfoForFACH-r4                                                             SCCPCH-InfoForFACH-r4                           OPTIONAL,
+       dummy                                                           SCCPCH-InfoForFACH-r4                           OPTIONAL,
        cell-id                                                         CellIdentity                                            OPTIONAL
 }
 
@@ -4489,8 +5040,8 @@ DL-InformationPerRL-r5 ::=                        SEQUENCE {
                        primaryCPICH-Info                                       PrimaryCPICH-Info,
                        -- dummy1 and dummy 2 are not used in this version of specification, they should
                        -- not be sent and if received they should be ignored.
-                       dummy1-PDSCH-SHO-DCH-Info                                                               PDSCH-SHO-DCH-Info                      OPTIONAL,
-                       dummy2-PDSCH-CodeMapping                                                                PDSCH-CodeMapping                       OPTIONAL,
+                       dummy1                                                          PDSCH-SHO-DCH-Info                      OPTIONAL,
+                       dummy2                                                          PDSCH-CodeMapping                       OPTIONAL,
                        servingHSDSCH-RL-indicator                      BOOLEAN
                },
                tdd                                                                     PrimaryCCPCH-Info-r4
@@ -4498,7 +5049,7 @@ DL-InformationPerRL-r5 ::=                        SEQUENCE {
        dl-DPCH-InfoPerRL                                       DL-DPCH-InfoPerRL-r5                            OPTIONAL,
        -- dummy is not used in this version of the specification, it should
        -- not be sent and if received it should be ignored.
-       dummy-SCCPCH-InfoForFACH-r4                                                             SCCPCH-InfoForFACH-r4                           OPTIONAL,
+       dummy                                                           SCCPCH-InfoForFACH-r4                           OPTIONAL,
        cell-id                                                         CellIdentity                                            OPTIONAL
 }
 
@@ -4508,15 +5059,15 @@ DL-InformationPerRL-r5bis ::=           SEQUENCE {
                        primaryCPICH-Info                                       PrimaryCPICH-Info,
                        -- dummy1 and dummy 2 are not used in this version of specification, they should
                        -- not be sent and if received they should be ignored.
-                       dummy1-PDSCH-SHO-DCH-Info                                                               PDSCH-SHO-DCH-Info                      OPTIONAL,
-                       dummy2-PDSCH-CodeMapping                                                                PDSCH-CodeMapping                       OPTIONAL
+                       dummy1                                                          PDSCH-SHO-DCH-Info                      OPTIONAL,
+                       dummy2                                                          PDSCH-CodeMapping                       OPTIONAL
                },
                tdd                                                                     PrimaryCCPCH-Info-r4
        },
        dl-DPCH-InfoPerRL                                       DL-DPCH-InfoPerRL-r5                            OPTIONAL,
        -- dummy is not used in this version of the specification, it should
        -- not be sent and if received it should be ignored.
-       dummy-SCCPCH-InfoForFACH-r4                                                             SCCPCH-InfoForFACH-r4                           OPTIONAL,
+       dummy                                                           SCCPCH-InfoForFACH-r4                           OPTIONAL,
        cell-id                                                         CellIdentity                                            OPTIONAL
 }
 
@@ -4534,8 +5085,55 @@ DL-InformationPerRL-r6 ::=                       SEQUENCE {
                dl-FDPCH-InfoPerRL                                      DL-FDPCH-InfoPerRL-r6
        }                                                                                                                                               OPTIONAL,
        e-AGCH-Information                                      E-AGCH-Information                                      OPTIONAL,
-       e-HICH-Information                                      E-HICH-Information                                      OPTIONAL,
-       e-RGCH-Information                                      E-RGCH-Information                                      OPTIONAL,
+       e-HICH-Info                                                     CHOICE  {
+               e-HICH-Information                                      E-HICH-Information,
+               releaseIndicator                                        NULL
+       }       OPTIONAL,
+       e-RGCH-Info                                                     CHOICE  {
+               e-RGCH-Information                                      E-RGCH-Information,
+               releaseIndicator                                        NULL
+       }       OPTIONAL,
+       cell-id                                                         CellIdentity                                            OPTIONAL
+}
+
+DL-InformationPerRL-v6b0ext ::=                SEQUENCE {
+               sttdIndication                                  STTDIndication                                          OPTIONAL
+}
+
+DL-InformationPerRL-r7 ::=                     SEQUENCE {
+       modeSpecificInfo                                        CHOICE {
+               fdd                                                                     SEQUENCE {
+                       primaryCPICH-Info                                       PrimaryCPICH-Info,
+                       servingHSDSCH-RL-indicator                      BOOLEAN,
+                       servingEDCH-RL-indicator                        BOOLEAN
+               },
+               tdd                                                                     PrimaryCCPCH-Info-r7
+       },
+       dl-dpchInfo                                                     CHOICE {
+               dl-DPCH-InfoPerRL                                       DL-DPCH-InfoPerRL-r7,
+               dl-FDPCH-InfoPerRL                                      DL-FDPCH-InfoPerRL-r6
+       }                                                                                                                                               OPTIONAL,
+       e-AGCH-Information                                      E-AGCH-Information-r7                           OPTIONAL,
+       modeSpecificInfo2                                       CHOICE {
+               fdd                                                                     SEQUENCE {
+                       e-HICH-Info                                                     CHOICE {
+                               e-HICH-Information                                      E-HICH-Information,
+                               releaseIndicator                                        NULL
+                       }       OPTIONAL,
+                       e-RGCH-Info                                                     CHOICE {
+                               e-RGCH-Information                                      E-RGCH-Information,
+                               releaseIndicator                                        NULL
+                       }       OPTIONAL
+               },
+               tdd                                                                     CHOICE {
+                       tdd384-tdd768                                           SEQUENCE {
+                               e-HICH-Info                                                     E-HICH-Information-TDD384-768
+                               },
+                       tdd128                                                          SEQUENCE {
+                               e-HICH-Info                                                     E-HICH-Information-TDD128
+                       }
+               }
+       },
        cell-id                                                         CellIdentity                                            OPTIONAL
 }
 
@@ -4551,9 +5149,15 @@ DL-InformationPerRL-List-r5 ::=          SEQUENCE (SIZE (1..maxRL)) OF
 DL-InformationPerRL-List-r6 ::=                SEQUENCE (SIZE (1..maxRL)) OF
                                                                                DL-InformationPerRL-r6
 
+DL-InformationPerRL-List-v6b0ext ::= SEQUENCE (SIZE (1..maxRL)) OF
+                                                                               DL-InformationPerRL-v6b0ext
+
 DL-InformationPerRL-List-r5bis ::=             SEQUENCE (SIZE (1..maxRL)) OF
                                                                                        DL-InformationPerRL-r5bis
 
+DL-InformationPerRL-List-r7 ::=                SEQUENCE (SIZE (1..maxRL)) OF
+                                                                               DL-InformationPerRL-r7
+
 DL-InformationPerRL-ListPostFDD ::=    SEQUENCE (SIZE (1..maxRL)) OF
                                                                                DL-InformationPerRL-PostFDD
 
@@ -4575,8 +5179,8 @@ DL-InformationPerRL-PostTDD-LCR-r4 ::=    SEQUENCE {
 DL-PDSCH-Information ::=                       SEQUENCE {
        -- dummy1 and dummy 2 are not used in this version of specification, it should
        -- not be sent and if received it should be ignored.
-       dummy1-PDSCH-SHO-DCH-Info                                                               PDSCH-SHO-DCH-Info                                      OPTIONAL,
-       dummy2-PDSCH-CodeMapping                                                                PDSCH-CodeMapping                                       OPTIONAL
+       dummy1                                                          PDSCH-SHO-DCH-Info                                      OPTIONAL,
+       dummy2                                                          PDSCH-CodeMapping                                       OPTIONAL
 }
 
 Dl-rate-matching-restriction ::=       SEQUENCE {
@@ -4598,6 +5202,16 @@ DL-TS-ChannelisationCode ::=             ENUMERATED {
                                                                                cc16-9, cc16-10, cc16-11, cc16-12,
                                                                                cc16-13, cc16-14, cc16-15, cc16-16 }
 
+DL-TS-ChannelisationCode-VHCR ::=      ENUMERATED {
+                                                                               cc32-1, cc32-2, cc32-3, cc32-4,
+                                                                               cc132-5, cc32-6, cc32-7, cc32-8,
+                                                                               cc32-9, cc32-10, cc32-11, cc32-12,
+                                                                               cc32-13, cc32-14, cc32-15, cc32-16,
+                                                                               cc32-17, cc32-18, cc32-19, cc32-20,
+                                                                               cc32-21, cc32-22, cc32-23, cc32-24,
+                                                                               cc32-25, cc32-26, cc32-27, cc32-28,
+                                                                               cc32-29, cc32-30, cc32-31, cc32-32 }
+
 DL-TS-ChannelisationCodesShort ::=     SEQUENCE {
        codesRepresentation                                     CHOICE {
                consecutive                                                     SEQUENCE {
@@ -4625,6 +5239,49 @@ DL-TS-ChannelisationCodesShort ::=       SEQUENCE {
        }
 }
 
+DL-TS-ChannelisationCodesShort-VHCR ::=        SEQUENCE {
+       codesRepresentation                                     CHOICE {
+               consecutive                                                     SEQUENCE {
+                       firstChannelisationCode                         DL-TS-ChannelisationCode-VHCR,
+                       lastChannelisationCode                          DL-TS-ChannelisationCode-VHCR
+               },
+               bitmap                                                          BIT STRING {
+                                                                                               chCode32-SF32(0),
+                                                                                               chCode31-SF32(1),
+                                                                                               chCode30-SF32(2),
+                                                                                               chCode29-SF32(3),
+                                                                                               chCode28-SF32(4),
+                                                                                               chCode27-SF32(5),
+                                                                                               chCode26-SF32(6),
+                                                                                               chCode25-SF32(7),
+                                                                                               chCode24-SF32(8),
+                                                                                               chCode23-SF32(9),
+                                                                                               chCode22-SF32(10),
+                                                                                               chCode21-SF32(11),
+                                                                                               chCode20-SF32(12),
+                                                                                               chCode19-SF32(13),
+                                                                                               chCode18-SF32(14),
+                                                                                               chCode17-SF32(15),
+                                                                                               chCode16-SF32(16),
+                                                                                               chCode15-SF32(17),
+                                                                                               chCode14-SF32(18),
+                                                                                               chCode13-SF32(19),
+                                                                                               chCode12-SF32(20),
+                                                                                               chCode11-SF32(21),
+                                                                                               chCode10-SF32(22),
+                                                                                               chCode9-SF32(23),
+                                                                                               chCode8-SF32(24),
+                                                                                               chCode7-SF32(25),
+                                                                                               chCode6-SF32(26),
+                                                                                               chCode5-SF32(27),
+                                                                                               chCode4-SF32(28),
+                                                                                               chCode3-SF32(29),
+                                                                                               chCode2-SF32(30),
+                                                                                               chCode1-SF32(31)
+                                                                                               }       (SIZE (32))
+       }
+}
+
 DownlinkAdditionalTimeslots ::=                SEQUENCE {
        parameters                                                      CHOICE {
                sameAsLast                                                      SEQUENCE {
@@ -4637,6 +5294,18 @@ DownlinkAdditionalTimeslots ::=          SEQUENCE {
        }
 }
 
+DownlinkAdditionalTimeslots-VHCR ::= SEQUENCE {
+       parameters                                                      CHOICE {
+               sameAsLast                                                      SEQUENCE {
+                       timeslotNumber                                          TimeslotNumber
+               },
+               newParameters                                           SEQUENCE {
+                       individualTimeslotInfo                          IndividualTimeslotInfo-VHCR,
+                       dl-TS-ChannelisationCodesShort          DL-TS-ChannelisationCodesShort-VHCR
+               }
+       }
+}
+
 DownlinkAdditionalTimeslots-LCR-r4 ::= SEQUENCE {
        parameters                                                      CHOICE {
                sameAsLast                                                      SEQUENCE {
@@ -4655,21 +5324,34 @@ DownlinkTimeslotsCodes ::=              SEQUENCE {
        moreTimeslots                                           CHOICE {
                noMore                                                          NULL,
                additionalTimeslots                                     CHOICE {
-                       consecutive                                                     INTEGER (1..maxTS1),
-                       timeslotList                                            SEQUENCE (SIZE (1..maxTS1)) OF
+                       consecutive                                                     INTEGER (1..maxTS-1),
+                       timeslotList                                            SEQUENCE (SIZE (1..maxTS-1)) OF
                                                                                                        DownlinkAdditionalTimeslots
                }
        }
 }
 
+DownlinkTimeslotsCodes-VHCR ::=                SEQUENCE {
+       firstIndividualTimeslotInfo                     IndividualTimeslotInfo-VHCR,
+       dl-TS-ChannelisationCodesShort          DL-TS-ChannelisationCodesShort,
+       moreTimeslots                                           CHOICE {
+               noMore                                                          NULL,
+               additionalTimeslots                                     CHOICE {
+                       consecutive                                                     INTEGER (1..maxTS-1),
+                       timeslotList                                            SEQUENCE (SIZE (1..maxTS-1)) OF
+                                                                                                       DownlinkAdditionalTimeslots-VHCR
+               }
+       }
+}
+
 DownlinkTimeslotsCodes-LCR-r4 ::=      SEQUENCE {
        firstIndividualTimeslotInfo                     IndividualTimeslotInfo-LCR-r4,
        dl-TS-ChannelisationCodesShort          DL-TS-ChannelisationCodesShort,
        moreTimeslots                                           CHOICE {
                noMore                                                          NULL,
                additionalTimeslots                                     CHOICE {
-                       consecutive                                                     INTEGER (1..maxTSLCR1),
-                       timeslotList                                            SEQUENCE (SIZE (1..maxTSLCR1)) OF
+                       consecutive                                                     INTEGER (1..maxTS-LCR-1),
+                       timeslotList                                            SEQUENCE (SIZE (1..maxTS-LCR-1)) OF
                                                                                                        DownlinkAdditionalTimeslots-LCR-r4
                }
        }
@@ -4698,6 +5380,32 @@ DPCH-CompressedModeStatusInfo ::=        SEQUENCE {
 -- Actual value DPCH-FrameOffset = IE value * 256
 DPCH-FrameOffset::=                                    INTEGER (0..149)
 
+UE-DRX-Cycle-InactivityThreshold ::= ENUMERATED {
+                                                                               sub-frames-0,
+                                                                               sub-frames-1,
+                                                                               sub-frames-2,
+                                                                               sub-frames-4,
+                                                                               sub-frames-8,
+                                                                               sub-frames-16,
+                                                                               sub-frames-32,
+                                                                               sub-frames-64,
+                                                                               sub-frames-128,
+                                                                               sub-frames-256,
+                                                                               sub-frames-512,
+                                                                               spare5,
+                                                                               spare4,
+                                                                               spare3,
+                                                                               spare2,
+                                                                               spare1 }
+
+DRX-Info ::=                                           SEQUENCE {
+       ue-drx-Cycle                                            UE-DRX-Cycle,
+       ue-drx-Cycle-InactivityThreshold        UE-DRX-Cycle-InactivityThreshold,
+       ue-GrantMonitoring-InactivityThreshold
+                                                                               UE-GrantMonitoring-InactivityThreshold,
+       ue-drx-GrantMonitoring                          BOOLEAN
+}
+
 DSCH-Mapping ::=                                       SEQUENCE {
        maxTFCI-Field2Value                                     MaxTFCI-Field2Value,
        spreadingFactor                                         SF-PDSCH,
@@ -4705,7 +5413,7 @@ DSCH-Mapping ::=                                  SEQUENCE {
        multiCodeInfo                                           MultiCodeInfo
 }
 
-DSCH-MappingList ::=                           SEQUENCE (SIZE (1..maxPDSCHTFCIgroups)) OF
+DSCH-MappingList ::=                           SEQUENCE (SIZE (1..maxPDSCH-TFCIgroups)) OF
                                                                                DSCH-Mapping
 
 DSCH-RadioLinkIdentifier ::=           INTEGER (0..511)
@@ -4715,6 +5423,39 @@ DSCH-TransportChannelsInfo ::=           SEQUENCE (SIZE (1..maxTrCH)) OF
        dsch-transport-channel-identity                 TransportChannelIdentity,
        dsch-TFS                                                                TransportFormatSet
 }
+
+DTX-DRX-Info-r7 ::=                                    SEQUENCE {
+       dtx-Info                                                        DTX-Info                                                        OPTIONAL,
+       drx-Info                                                        DRX-Info                                                        OPTIONAL,
+       uplink-DPCCHSlotFormatInformation       Uplink-DPCCH-Slot-Format-Information
+}
+
+DTX-E-DCH-TTI-10ms ::=                         SEQUENCE {
+       ue-dtx-Cycle1-10ms                                      UE-DTX-Cycle1-10ms,
+       ue-dtx-Cycle2-10ms                                      UE-DTX-Cycle2-10ms,
+       mac-dtx-Cycle-10ms                                      MAC-DTX-Cycle-10ms
+}
+
+DTX-E-DCH-TTI-2ms ::=                          SEQUENCE {
+       ue-dtx-Cycle1-2ms                                       UE-DTX-Cycle1-2ms,
+       ue-dtx-Cycle2-2ms                                       UE-DTX-Cycle2-2ms,
+       mac-dtx-Cycle-2ms                                       MAC-DTX-Cycle-2ms
+}
+
+DTX-Info ::=                                           SEQUENCE {
+       e-dch-TTI-Length                                        CHOICE {
+               dtx-e-dch-TTI-10ms                                      DTX-E-DCH-TTI-10ms,
+               dtx-e-dch-TTI-2ms                                       DTX-E-DCH-TTI-2ms
+       },
+       ue-dtx-cycle2InactivityThreshold        UE-DTX-Cycle2InactivityThreshold,
+       -- if the IE is not present the value is 'false'
+       ue-dtx-long-preamble-length                     UE-DTX-long-preamble-length                     OPTIONAL,
+       mac-InactivityThreshold                         MAC-InactivityThreshold,
+       cqi-dtx-Timer                                           CQI-DTX-Timer,
+       ue-dpcch-Burst1                                         UE-DPCCH-Burst,
+       ue-dpcch-Burst2                                         UE-DPCCH-Burst
+}
+
 DurationTimeInfo ::=                           INTEGER (1..4096)
 
 DynamicPersistenceLevel ::=                    INTEGER (1..8)
@@ -4722,7 +5463,7 @@ DynamicPersistenceLevel ::=                       INTEGER (1..8)
 DynamicPersistenceLevelList ::=                SEQUENCE (SIZE (1..maxPRACH)) OF
                                                                                DynamicPersistenceLevel
 
-DynamicPersistenceLevelTF-List ::= SEQUENCE (SIZE (1..maxTFCPCH)) OF
+DynamicPersistenceLevelTF-List ::= SEQUENCE (SIZE (1..maxTF-CPCH)) OF
                                                                                DynamicPersistenceLevel
 
 DynamicTFInformationCCCH ::=           SEQUENCE {
@@ -4731,15 +5472,94 @@ DynamicTFInformationCCCH ::=            SEQUENCE {
 
 E-AGCH-ChannelisationCode ::=          INTEGER (0..255)
 
+E-AGCH-Individual ::=                          SEQUENCE {
+       tS-number                                                       INTEGER (0..14),
+       channelisation-code                                     DL-TS-ChannelisationCode,
+       midambleShiftAndBurstType                       MidambleShiftAndBurstType
+}
+
+E-AGCH-Individual-LCR ::=                      SEQUENCE {
+       timeslotNumber                                          TimeslotNumber-LCR-r4,
+       firstChannelisationCode                         HS-ChannelisationCode-LCR,
+       secondChannelisationCode                        HS-ChannelisationCode-LCR,
+       midambleAllocationMode                          CHOICE {
+               defaultMidamble                                         NULL,
+               commonMidamble                                          NULL,
+               ueSpecificMidamble                                      INTEGER (0..15)
+       },
+       -- Actual value midambleConfiguration = IE value * 2
+       midambleConfiguration                           INTEGER (1..8)
+}
+
 E-AGCH-Information ::=                         SEQUENCE {
        e-AGCH-ChannelisationCode                       E-AGCH-ChannelisationCode
 }
 
+E-AGCH-Information-r7 ::=                      SEQUENCE {
+       modeSpecific                                            CHOICE {
+               fdd                                                                     SEQUENCE {
+                       e-AGCH-ChannelisationCode                       E-AGCH-ChannelisationCode
+                       },
+               tdd                                                                     CHOICE {
+                       tdd384-tdd768                                           SEQUENCE {
+                               long-Term-Grant-Indicator                       BOOLEAN         OPTIONAL,
+                               length-of-TTRI-field                            INTEGER (1..12),
+                               e-AGCH-Set-Config                                       E-AGCH-Set-Config,
+                               e-AGCH-BLER-Target                                      Bler-Target
+                       },
+                       tdd128                                                          SEQUENCE {
+                               rdi-Indicator                                           BOOLEAN,
+                               tpc-StepSize                                            TPC-StepSizeTDD,
+                               e-AGCH-Set-Config                                       E-AGCH-Set-Config-LCR,
+                               e-AGCH-BLER-Target                                      Bler-Target
+                       }
+               }
+       }
+}
+
+E-AGCH-Set-Config ::=                          SEQUENCE (SIZE (1..maxNumE-AGCH)) OF
+                                                                               E-AGCH-Individual
+
+E-AGCH-Set-Config-LCR ::=                      SEQUENCE (SIZE (1..maxNumE-AGCH)) OF
+                                                                               E-AGCH-Individual-LCR
+
 E-DCH-MinimumSet-E-TFCI ::=                    INTEGER (0..127)
 
-E-DCH-RL-Info ::=                                      SEQUENCE {
+E-DCH-ReconfigurationInfo ::=  SEQUENCE {
+       e-DCH-RL-InfoNewServingCell                     E-DCH-RL-InfoNewServingCell                             OPTIONAL,
+       e-DCH-RL-InfoOtherCellList                      SEQUENCE (SIZE (1..maxEDCHRL)) OF
+                                                                                       E-DCH-RL-InfoOtherCell                          OPTIONAL
+}
+
+E-DCH-RL-InfoNewServingCell ::=                SEQUENCE {
+       primaryCPICH-Info                                       PrimaryCPICH-Info,
+       e-AGCH-Information                                      E-AGCH-Information,
+       servingGrant                                            SEQUENCE {
+               value                                                           INTEGER (0..38)                                         OPTIONAL,
+               primary-Secondary-GrantSelector         ENUMERATED { primary, secondary }
+       }       OPTIONAL,
+       e-DPCCH-DPCCH-PowerOffset                       E-DPCCH-DPCCH-PowerOffset                               OPTIONAL,
+       reference-E-TFCIs                                       E-DPDCH-Reference-E-TFCIList                    OPTIONAL,
+       powerOffsetForSchedInfo                         INTEGER (0..6)                                                  OPTIONAL,
+       threeIndexStepThreshold                         INTEGER (0..37)                                                 OPTIONAL,
+       twoIndexStepThreshold                           INTEGER (0..37)                                                 OPTIONAL,
        e-HICH-Information                                      E-HICH-Information              OPTIONAL,
-       e-RGCH-Information                                      E-RGCH-Information              OPTIONAL
+       e-RGCH-Info                                                     CHOICE  {
+               e-RGCH-Information                                      E-RGCH-Information,
+               releaseIndicator                                        NULL
+       }       OPTIONAL
+}
+
+E-DCH-RL-InfoOtherCell ::=                     SEQUENCE {
+       primaryCPICH-Info                                       PrimaryCPICH-Info,
+       e-HICH-Info                                                     CHOICE {
+               e-HICH-Information                                      E-HICH-Information,
+               releaseIndicator                                        NULL
+       }       OPTIONAL,
+       e-RGCH-Info                                                     CHOICE {
+               e-RGCH-Information                                      E-RGCH-Information,
+               releaseIndicator                                        NULL
+       }       OPTIONAL
 }
 
 E-DPCCH-Info ::=                                       SEQUENCE {
@@ -4756,19 +5576,20 @@ E-DPDCH-Info ::=                                        SEQUENCE {
        maxChannelisationCodes                          E-DPDCH-MaxChannelisationCodes,
        pl-NonMax                                                       E-DPDCH-PL-NonMax,
        schedulingInfoConfiguration                     E-DPDCH-SchedulingInfoConfiguration,
-       schedulingTransmConfiguraration         E-DPDCH-SchedulingTransmConfiguration
+       threeIndexStepThreshold                         INTEGER (0..37)                                         OPTIONAL,
+       twoIndexStepThreshold                           INTEGER (0..37)                                         OPTIONAL
 }
 
 E-DPDCH-PeriodicyOfSchedInfo ::=       ENUMERATED {
-                                                                               everyMACePDU, pdu4, pdu10, pdu20, pdu50, 
-                                                                               pdu100, pdu200, pdu500, pdu1000 }
+                                                                               everyEDCHTTI, ms4, ms10, ms20, ms50, ms100, ms200, ms500,
+                                                                               ms1000 }
 
 -- The actual value of E-DPDCH-PL-NonMax is: IE value * 0.04
-E-DPDCH-PL-NonMax ::=                          INTEGER (11..100)
+E-DPDCH-PL-NonMax ::=                          INTEGER (11..25)
 
 E-DPDCH-Reference-E-TFCI ::=           SEQUENCE {
        reference-E-TFCI                                        INTEGER (0..127),
-       reference-E-TFCI-PO                                     INTEGER (0)             -- FFS
+       reference-E-TFCI-PO                                     INTEGER (0..29)
 }
 
 E-DPDCH-Reference-E-TFCIList ::=       SEQUENCE (SIZE (1..8)) OF E-DPDCH-Reference-E-TFCI
@@ -4781,35 +5602,169 @@ E-DPDCH-SchedulingInfoConfiguration ::= SEQUENCE {
 
 E-DPDCH-SchedulingTransmConfiguration ::= SEQUENCE {
        ms2-SchedTransmGrantHARQAlloc           BIT STRING (SIZE (8))                           OPTIONAL,
-       servingGrant                                            INTEGER (0..31)                                         OPTIONAL,
-       primary-Secondary-GrantSelector         ENUMERATED { primary, secondary }       OPTIONAL
+       servingGrant                                            SEQUENCE {
+               value                                                           INTEGER (0..38),
+               primary-Secondary-GrantSelector         ENUMERATED { primary, secondary }
+       }               OPTIONAL
 }
 
 E-DPDCH-MaxChannelisationCodes ::=     ENUMERATED {
-                                                                               sf64, sf32, sf16, sf8, sf4, sf4x2, sf2x2, sf4x2-and-sf2x2 }
+                                                                               sf256, sf128, sf64, sf32, sf16, sf8, sf4, sf4x2, sf2x2, sf4x2-and-sf2x2 }
 
 E-HICH-ChannelisationCode ::=          INTEGER (0..127)
 
 E-HICH-Information ::=                         SEQUENCE {
-       dl-ScramblingCode                                       SecondaryScramblingCode                         OPTIONAL,
        channelisationCode                                      E-HICH-ChannelisationCode,
        signatureSequence                                       E-HICH-RGCH-SignatureSequence
 }
 
+E-HICH-Information-TDD384-768 ::=      SEQUENCE {
+       n-E-HICH                                                        INTEGER (4..44),
+       tS-Number                                                       INTEGER (0..14),
+       modeSpecificInfo                                                CHOICE  {
+               tdd384                                                                  DL-TS-ChannelisationCode,
+               tdd768                                                                  DL-TS-ChannelisationCode-VHCR
+       },
+       burst-Type                                                      ENUMERATED { type1, type2 },
+       midamble-Allocation-Mode                        ENUMERATED { default, common }
+}
+
+E-HICH-Information-LCR ::=                     SEQUENCE {
+       ei                                                                      INTEGER (0..3),
+       timeslotNumber                                          TimeslotNumber-LCR-r4,
+       channelisation-Code                                     HS-ChannelisationCode-LCR,
+       midambleAllocationMode                          CHOICE {
+               defaultMidamble                                         NULL,
+               ueSpecificMidamble                                      INTEGER (0..15)
+       },
+       -- Actual value midambleConfiguration = IE value * 2
+       midambleConfiguration                           INTEGER (1..8)
+}
+
+E-HICH-Information-TDD128 ::=          SEQUENCE {
+       n-E-HICH                                                        INTEGER (4..15),
+       e-HICH-InfoList                                         E-HICH-Information-LCR-List
+}
+
+E-HICH-Information-LCR-List ::=                SEQUENCE (SIZE (1..maxNumE-HICH)) OF
+                                                                               E-HICH-Information-LCR
+
 E-HICH-RGCH-SignatureSequence ::=      INTEGER (0..39)
 
+E-PUCH-Info ::=                                                SEQUENCE {
+       e-TFCS-Info                                                     E-TFCS-Info,
+       modeSpecificInfo                                        CHOICE {
+               tdd348-tdd768                                           SEQUENCE {
+                       noSlotsForTFCIandTPC                            INTEGER (1..12),
+                       e-PUCH-ContantValue                                     INTEGER (-35..10),
+                       e-PUCH-TS-ConfigurationList                     SEQUENCE (SIZE (1..maxTS-2)) OF E-PUCH-TS-Slots,
+                       e-PUCH-CodeHopping                                      BOOLEAN,
+                       e-PUCH-TPC-Step-Size                            INTEGER (1..3),
+                       minimum-Allowed-Code-Rate                       INTEGER (0..63),
+                       maximum-Allowed-Code-Rate                       INTEGER (0..63)
+               },
+               tdd128                                                          SEQUENCE {
+                       snpl-ReportType                                         ENUMERATED { type1, type2 },
+                       prxBASEdes                                                      INTEGER (-112..-50),
+                       beaconPLEst                                                     BOOLEAN                                                                 OPTIONAL,
+                       tpc-StepSize                                            TPC-StepSizeTDD,
+                       ul-SynchronisationParameters            UL-SynchronisationParameters-r4                 OPTIONAL,
+                       e-PUCH-TS-ConfigurationList                     SEQUENCE (SIZE (1..maxTS-1)) OF E-PUCH-TS-Slots-LCR,
+                       minimum-Allowed-Code-Rate                       INTEGER (0..63),
+                       maximum-Allowed-Code-Rate                       INTEGER (0..63)
+               }
+       }
+}
+
+E-PUCH-TS-Slots ::=                                    SEQUENCE {
+       tS-Numnber                                                      INTEGER (0..14),
+       midambleShiftAndBurstType                       MidambleShiftAndBurstType
+}
+
+E-PUCH-TS-Slots-LCR ::=                                SEQUENCE {
+       timeslotNumber                                          TimeslotNumber-LCR-r4,
+       midambleAllocationMode                          CHOICE {
+               defaultMidamble                                         NULL,
+               ueSpecificMidamble                                      INTEGER (0..15)
+       },
+       -- Actual value midambleConfiguration = IE value * 2
+       midambleConfiguration                           INTEGER (1..8)
+}
+
 E-RGCH-CombinationIndex ::=                    INTEGER (0..5)
 
 E-RGCH-Information ::=                         SEQUENCE {
        signatureSequence                                       E-HICH-RGCH-SignatureSequence,
-       rg-CombinationIndex                                     E-RGCH-CombinationIndex,
-       e-RGCH-StepSize                                         E-RGCH-StepSize                                         OPTIONAL
+       rg-CombinationIndex                                     E-RGCH-CombinationIndex
 }
 
-E-RGCH-StepSize ::=                                    INTEGER (1..6)
+E-RUCCH-Info ::=                                       SEQUENCE {
+       modeSpecificInfo                                        CHOICE {
+               tdd384-tdd768                                           SEQUENCE {
+                       e-RUCCH-ConstantValue                           INTEGER (-35..10),
+                       e-RUCCH-PersistenceScalingFactor        PersistenceScalingFactor,
+                       t-RUCCH                                                         ENUMERATED {ms40, ms80, ms120, ms160, ms200,
+                                                                                                       ms240, ms280, ms320}                            OPTIONAL,
+                       e-RUCCH-TS-Number                                       INTEGER (0..14)                                                 OPTIONAL,
+                       e-RUCCH-Midamble                                        ENUMERATED {direct, direct-Inverted}    OPTIONAL,
+                       modeSpecificInfo                                        CHOICE {
+                               tdd384                                                          CHOICE {
+                                       sF16                                                            SEQUENCE (SIZE (1..8)) OF SF16Codes,
+                                       sF8                                                                     SEQUENCE (SIZE (1..8)) OF SF8Codes
+                                       },
+                               tdd768                                                  CHOICE {
+                                       sF32                                                            SEQUENCE (SIZE (1..16)) OF SF32Codes,
+                                       sF816                                                           SEQUENCE (SIZE (1..16)) OF SF16Codes2
+                               }
+                       }
+               },
+               tdd128                                                          SEQUENCE {
+                       t-RUCCH                                                         ENUMERATED { ms100, ms200, ms400, ms600, ms800,
+                                                                                                       ms1000, ms1200, ms1400, ms1600, ms1800,
+                                                                                                       ms2000 }                                                        OPTIONAL,
+                       n-RUCCH                                                         INTEGER (0..7)                                                  OPTIONAL,
+                       t-WAIT                                                          ENUMERATED {ms20, ms40, ms60, ms80, ms160,
+                                                                                                       ms200 }                                                         OPTIONAL
+               }
+       }
+}
 
 E-TFCI-TableIndex ::=                          INTEGER (0..1)
 
+E-TFCS-Info ::=                                                SEQUENCE {
+       reference-Beta-QPSK-List                        SEQUENCE (SIZE (1..8)) OF Reference-Beta-QPSK,
+       reference-Beta-16QAM-List                       SEQUENCE (SIZE (1..8)) OF Reference-Beta-16QAM
+}
+
+EnablingDelay ::=                                      ENUMERATED {
+                                                                               radio-frames-0,
+                                                                               radio-frames-1,
+                                                                               radio-frames-2,
+                                                                               radio-frames-4,
+                                                                               radio-frames-8,
+                                                                               radio-frames-16,
+                                                                               radio-frames-32,
+                                                                               radio-frames-64,
+                                                                               radio-frames-128,
+                                                                               spare7,
+                                                                               spare6,
+                                                                               spare5,
+                                                                               spare4,
+                                                                               spare3,
+                                                                               spare2,
+                                                                               spare1 }
+
+EXT-UL-TimingAdvance ::=                       SEQUENCE {
+       modeSpecificInfo                                CHOICE {
+               tdd384                                                  SEQUENCE {
+                       ex-ul-TimingAdvance                     INTEGER (0..255)
+               },
+               tdd768                                                  SEQUENCE {
+                       ex-ul-TimingAdvance                     INTEGER (0..511)
+               }
+       }
+}
+
 FACH-PCH-Information ::=                       SEQUENCE {
        transportFormatSet                                      TransportFormatSet,
        transportChannelIdentity                        TransportChannelIdentity,
@@ -4822,6 +5777,10 @@ FACH-PCH-InformationList ::=             SEQUENCE (SIZE (1..maxFACHPCH)) OF
 Feedback-cycle ::=                                     ENUMERATED {
                                                                                fc0, fc2, fc4, fc8, fc10, fc20, fc40, fc80, fc160}
 
+Feedback-cycle-r7 ::=                          ENUMERATED {
+                                                                               fc0, fc2, fc4, fc8, fc10, fc20, fc40, fc80, fc160,
+                                                                               fc16, fc32, fc64, spare4, spare3, spare2, spare1 }
+
 FPACH-Info-r4 ::=                                              SEQUENCE {
        timeslot                                                        TimeslotNumber-LCR-r4,
        channelisationCode                                      TDD-FPACH-CCode16-r4,
@@ -4897,17 +5856,77 @@ HS-SCCH-Info-r6 ::=                                     SEQUENCE {
                                nack-ack-power-offset                           INTEGER (-7..8), 
                                hs-SICH-PowerControl-Info                       HS-SICH-Power-Control-Info-TDD384,
                                dhs-sync                                                        DHS-Sync                                        OPTIONAL,
+                               bler-target                                                     Bler-Target,
                                hS-SCCH-SetConfiguration                        SEQUENCE (SIZE (1..maxHSSCCHs)) OF
-                                                                                                               HS-SCCH-TDD384
+                                                                                                               HS-SCCH-TDD384-r6
                                },
-                       tdd128                                                          SEQUENCE (SIZE (1..maxHSSCCHs)) OF
-                                                                                                       HS-SCCH-TDD128
+                       tdd128                                                          SEQUENCE {
+                               nack-ack-power-offset                           INTEGER (-7..8),
+                               power-level-HSSICH                                      INTEGER (-120..-58),
+                               tpc-step-size                                           ENUMERATED { s1, s2, s3 , spare1 },
+                               bler-target                                                     Bler-Target,
+                               hS-SCCH-SetConfiguration                        SEQUENCE (SIZE (1..maxHSSCCHs)) OF
+                                                                                                               HS-SCCH-TDD128-r6
+                       }
+               }
+       }
+}
+
+HS-SCCH-Info-r7 ::=                                    SEQUENCE {
+       modeSpecificInfo                                        CHOICE {
+               fdd                                                                     SEQUENCE {
+                       hS-SCCHChannelisationCodeInfo           SEQUENCE (SIZE (1..maxHSSCCHs)) OF
+                                                                                                       HS-SCCH-Codes,
+                       dl-ScramblingCode                                       SecondaryScramblingCode                 OPTIONAL
+               },
+               tdd                                                                     CHOICE {
+                       tdd384                                                          SEQUENCE {
+                               nack-ack-power-offset                           INTEGER (-7..8), 
+                               hs-SICH-PowerControl-Info                       HS-SICH-Power-Control-Info-TDD384,
+                               dhs-sync                                                        DHS-Sync                                        OPTIONAL,
+                               hS-SCCH-SetConfiguration                        SEQUENCE (SIZE (1..maxHSSCCHs)) OF
+                                                                                                               HS-SCCH-TDD384-r6
+                               },
+                       tdd768                                                          SEQUENCE {
+                               nack-ack-power-offset                           INTEGER (-7..8), 
+                               hs-SICH-PowerControl-Info                       HS-SICH-Power-Control-Info-TDD768,
+                               dhs-sync                                                        DHS-Sync                                        OPTIONAL,
+                               bler-target                                                     Bler-Target,
+                               hS-SCCH-SetConfiguration                        SEQUENCE (SIZE (1..maxHSSCCHs)) OF
+                                                                                                               HS-SCCH-TDD768
+                               },
+                       tdd128                                                          SEQUENCE {
+                               nack-ack-power-offset                           INTEGER (-7..8),
+                               power-level-HSSICH                                      INTEGER (-120..-58),
+                               tpc-step-size                                           ENUMERATED { s1, s2, s3 , spare1 },
+                               bler-target                                                     Bler-Target,
+                               hS-SCCH-SetConfiguration                        SEQUENCE (SIZE (1..maxHSSCCHs)) OF
+                                                                                                               HS-SCCH-TDD128-r6
+                       }
                }
        }
 }
 
 HS-SCCH-Codes ::=                                      INTEGER (0..127)
 
+HS-SCCH-Less-NewOperation ::=          SEQUENCE {
+       hs-pdsch-CodeIndex                                      INTEGER (1..15),
+       hs-scch-LessTFS                                         HS-SCCH-LessTFS
+}
+
+HS-SCCH-LessInfo-r7 ::=                                SEQUENCE {
+       hs-scchLessOperation                            CHOICE {
+               continue                                                        NULL,
+               newOperation                                            HS-SCCH-Less-NewOperation
+       }
+}
+
+HS-SCCH-LessTFS ::=                                    SEQUENCE (SIZE (1..maxHS-SCCHLessTrBlk)) OF
+                                                                               SEQUENCE {
+       hs-scch-LessTFI                                                 INTEGER (1..90),
+       hs-scch-LessSecondCodeApplicability             BOOLEAN
+}
+
 HS-SCCH-TDD128 ::=                             SEQUENCE {
        timeslotNumber                                          TimeslotNumber-LCR-r4,
        firstChannelisationCode                         HS-ChannelisationCode-LCR,
@@ -4923,6 +5942,20 @@ HS-SCCH-TDD128 ::=                               SEQUENCE {
        hs-sich-configuration                           HS-SICH-Configuration-TDD128
 }
 
+HS-SCCH-TDD128-r6 ::=                          SEQUENCE {
+       timeslotNumber                                          TimeslotNumber-LCR-r4,
+       firstChannelisationCode                         HS-ChannelisationCode-LCR,
+       secondChannelisationCode                        HS-ChannelisationCode-LCR,
+       midambleAllocationMode                          CHOICE {
+               defaultMidamble                                         NULL,
+               commonMidamble                                          NULL,
+               ueSpecificMidamble                                      INTEGER(0..15)
+       },
+       -- Actual value midambleConfiguration = IE value * 2
+       midambleConfiguration                           INTEGER (1..8),
+       hs-sich-configuration                           HS-SICH-Configuration-TDD128-r6
+}
+
 HS-SICH-Configuration-TDD128 ::=       SEQUENCE {
        timeslotNumber                                          TimeslotNumber-LCR-r4,
        channelisationCode                                      HS-ChannelisationCode-LCR,
@@ -4939,7 +5972,18 @@ HS-SICH-Configuration-TDD128 ::= SEQUENCE {
        tpc-step-size                                           ENUMERATED { s1, s2, s3 , spare1}
 }
 
-
+HS-SICH-Configuration-TDD128-r6 ::=    SEQUENCE {
+       timeslotNumber                                          TimeslotNumber-LCR-r4,
+       channelisationCode                                      HS-ChannelisationCode-LCR,
+       midambleAllocationMode                          CHOICE {
+               defaultMidamble                                         NULL,
+               ueSpecificMidamble                                      SEQUENCE {
+                       midambleShift                                           MidambleShiftLong
+               }
+       },
+       -- Actual value midambleConfiguration = IE value * 2
+       midambleConfiguration                           INTEGER (1..8)
+}
 
 HS-SCCH-TDD384 ::=                             SEQUENCE {
        timeslotNumber                                          TimeslotNumber,
@@ -4956,6 +6000,34 @@ HS-SCCH-TDD384 ::=                               SEQUENCE {
        hs-sich-configuration                           HS-SICH-Configuration-TDD384
 }
 
+HS-SCCH-TDD384-r6 ::=                          SEQUENCE {
+       timeslotNumber                                          TimeslotNumber,
+       channelisationCode                                      DL-TS-ChannelisationCode,
+       midambleAllocationMode                          CHOICE {
+               defaultMidamble                                         NULL,
+               commonMidamble                                          NULL,
+               ueSpecificMidamble                                      SEQUENCE {
+                       midambleShift                                           MidambleShiftLong
+               }
+       },
+       midambleconfiguration                           MidambleConfigurationBurstType1and3,
+       hs-sich-configuration                           HS-SICH-Configuration-TDD384
+}
+
+HS-SCCH-TDD768 ::=                             SEQUENCE {
+       timeslotNumber                                          TimeslotNumber,
+       channelisationCode                                      DL-TS-ChannelisationCode-VHCR,
+       midambleAllocationMode                          CHOICE {
+               defaultMidamble                                         NULL,
+               commonMidamble                                          NULL,
+               ueSpecificMidamble                                      SEQUENCE {
+                       midambleShift                                           MidambleShiftLong
+               }
+       },
+       midambleconfiguration                           MidambleConfigurationBurstType1and3,
+       hs-sich-configuration                           HS-SICH-Configuration-TDD768
+}
+
 HS-SICH-Configuration-TDD384 ::=       SEQUENCE {
        timeslotNumber                                          TimeslotNumber,
        channelisationCode                                      DL-TS-ChannelisationCode,
@@ -4968,12 +6040,29 @@ HS-SICH-Configuration-TDD384 ::=        SEQUENCE {
        midambleconfiguration                           MidambleConfigurationBurstType1and3
 }
 
+HS-SICH-Configuration-TDD768 ::=       SEQUENCE {
+       timeslotNumber                                          TimeslotNumber,
+       channelisationCode                                      DL-TS-ChannelisationCode-VHCR,
+       midambleAllocationMode                          CHOICE {
+               defaultMidamble                                         NULL,
+               ueSpecificMidamble                                      SEQUENCE {
+                       midambleShift                                           MidambleShiftLong
+               }
+       },
+       midambleconfiguration                           MidambleConfigurationBurstType1and3
+}
+
 HS-SICH-Power-Control-Info-TDD384 ::= SEQUENCE {
        -- Actual value ul-target-SIR = IE value * 0.5
        ul-target-SIR                                           INTEGER (-22..40),
     hs-sich-ConstantValue                          ConstantValue
 }
 
+HS-SICH-Power-Control-Info-TDD768 ::= SEQUENCE {
+       -- Actual value ul-target-SIR = IE value * 0.5
+       ul-target-SIR                                           INTEGER (-22..40),
+       hs-sich-ConstantValue                           ConstantValue
+}
 
 IndividualTimeslotInfo ::=                     SEQUENCE {
        timeslotNumber                                          TimeslotNumber,
@@ -4981,6 +6070,12 @@ IndividualTimeslotInfo ::=                       SEQUENCE {
        midambleShiftAndBurstType                       MidambleShiftAndBurstType
 }
 
+IndividualTimeslotInfo-VHCR ::=                        SEQUENCE {
+       timeslotNumber                                          TimeslotNumber,
+       tfci-Existence                                          BOOLEAN,
+       midambleShiftAndBurstType-VHCR          MidambleShiftAndBurstType-VHCR
+}
+
 IndividualTimeslotInfo-LCR-r4 ::=      SEQUENCE {
        timeslotNumber                                          TimeslotNumber-LCR-r4,
        tfci-Existence                                          BOOLEAN,
@@ -5011,6 +6106,40 @@ ITP ::=                                                          ENUMERATED {
 
 NidentifyAbort ::=     INTEGER (1..128)
 
+MAC-DTX-Cycle-10ms ::=                         ENUMERATED {
+                                                                               sub-frames-5,
+                                                                               sub-frames-10,
+                                                                               sub-frames-20,
+                                                                               spare1 }
+
+MAC-DTX-Cycle-2ms ::=                          ENUMERATED {
+                                                                               sub-frames-1,
+                                                                               sub-frames-4,
+                                                                               sub-frames-5,
+                                                                               sub-frames-8,
+                                                                               sub-frames-10,
+                                                                               sub-frames-16,
+                                                                               sub-frames-20,
+                                                                               spare1 }
+
+MAC-InactivityThreshold ::=                    ENUMERATED {
+                                                                               e-dch-tti-1,
+                                                                               e-dch-tti-2,
+                                                                               e-dch-tti-4,
+                                                                               e-dch-tti-8,
+                                                                               e-dch-tti-16,
+                                                                               e-dch-tti-32,
+                                                                               e-dch-tti-64,
+                                                                               e-dch-tti-128,
+                                                                               e-dch-tti-256,
+                                                                               e-dch-tti-512,
+                                                                               e-dch-tti-Infinity,
+                                                                               spare5,
+                                                                               spare4,
+                                                                               spare3,
+                                                                               spare2,
+                                                                               spare1 }
+
 MaxAllowedUL-TX-Power ::=                      INTEGER (-50..33)
 
 MaxAvailablePCPCH-Number ::=           INTEGER (1..64)
@@ -5030,11 +6159,24 @@ Measurement-Feedback-Info ::=           SEQUENCE {
        }
 }
 
+Measurement-Feedback-Info-r7 ::= SEQUENCE {
+       modeSpecificInfo                                CHOICE {
+               fdd                                                             SEQUENCE {
+                       measurementPowerOffset                  MeasurementPowerOffset,
+                       feedback-cycle                                  Feedback-cycle-r7,
+                       cqi-RepetitionFactor                    CQI-RepetitionFactor,
+                       deltaCQI                                                DeltaCQI
+               },
+               tdd                                                             NULL
+       }
+}
 
 MidambleConfigurationBurstType1and3 ::= ENUMERATED {ms4, ms8, ms16}
 
 MidambleConfigurationBurstType2 ::=            ENUMERATED {ms3, ms6}
 
+MidambleConfigurationBurstType2-VHCR ::=               ENUMERATED {ms4, ms8}
+
 MidambleShiftAndBurstType ::=          SEQUENCE {
        burstType                                                       CHOICE {        
                type1                                                           SEQUENCE {
@@ -5069,6 +6211,40 @@ MidambleShiftAndBurstType ::=            SEQUENCE {
        }
 }
 
+MidambleShiftAndBurstType-VHCR ::=     SEQUENCE {
+       burstType                                                       CHOICE {
+               type1                                                           SEQUENCE {
+                       midambleConfigurationBurstType1and3     MidambleConfigurationBurstType1and3,
+                       midambleAllocationMode                          CHOICE {
+                               defaultMidamble                                         NULL,
+                               commonMidamble                                          NULL,
+                               ueSpecificMidamble                                      SEQUENCE {
+                                       midambleShift                                           MidambleShiftLong
+                               }
+                       }
+               },
+               type2                                                           SEQUENCE {
+                       midambleConfigurationBurstType2         MidambleConfigurationBurstType2-VHCR,
+                       midambleAllocationMode                          CHOICE {
+                               defaultMidamble                                         NULL,
+                               commonMidamble                                          NULL,
+                               ueSpecificMidamble                                      SEQUENCE {
+                                       midambleShift                                           MidambleShiftShort-VHCR
+                               }
+                       }
+               },
+               type3                                                           SEQUENCE {
+                       midambleConfigurationBurstType1and3     MidambleConfigurationBurstType1and3,
+                       midambleAllocationMode                          CHOICE {
+                               defaultMidamble                                         NULL,
+                               ueSpecificMidamble                                      SEQUENCE {
+                                       midambleShift                                           MidambleShiftLong
+                               }
+                       }
+               }
+       }
+}
+
 MidambleShiftAndBurstType-DL ::=               SEQUENCE {
        burstType                                                       CHOICE {        
                type1                                                           SEQUENCE {
@@ -5094,6 +6270,31 @@ MidambleShiftAndBurstType-DL ::=         SEQUENCE {
        }
 }
 
+MidambleShiftAndBurstType-DL-VHCR ::= SEQUENCE {
+       burstType                                                       CHOICE {        
+               type1                                                           SEQUENCE {
+                       midambleConfigurationBurstType1and3     MidambleConfigurationBurstType1and3,
+                       midambleAllocationMode                          CHOICE {
+                               defaultMidamble                                         NULL,
+                               commonMidamble                                          NULL,
+                               ueSpecificMidamble                                      SEQUENCE {
+                                       midambleShift                                           MidambleShiftLong
+                               }
+                       }
+               },
+               type2                                                           SEQUENCE {
+                       midambleConfigurationBurstType2         MidambleConfigurationBurstType2-VHCR,
+                       midambleAllocationMode                          CHOICE {
+                               defaultMidamble                                         NULL,
+                               commonMidamble                                          NULL,
+                               ueSpecificMidamble                                      SEQUENCE {
+                                       midambleShift                                           MidambleShiftShort-VHCR
+                               }
+                       }
+               }
+       }
+}
+
 MidambleShiftAndBurstType-LCR-r4 ::=   SEQUENCE {
        midambleAllocationMode                          CHOICE {
                defaultMidamble                                         NULL,
@@ -5111,6 +6312,30 @@ MidambleShiftLong ::=                            INTEGER (0..15)
 
 MidambleShiftShort ::=                         INTEGER (0..5)
 
+MidambleShiftShort-VHCR ::=                    INTEGER (0..7)
+
+MIMO-N-M-Ratio ::=                                     ENUMERATED {
+                                                                               mnm12, mnm23, mnm34, mnm45, mnm56,
+                                                                               mnm67, mnm78, mnm89, mnm910, mnm11 }
+
+MIMO-Operation ::=                                     ENUMERATED {
+                                                                               start, continue }
+
+MIMO-Parameters ::=                                    SEQUENCE {
+       mimoOperation                                           MIMO-Operation,
+       mimoN-M-Ratio                                           MIMO-N-M-Ratio                                  OPTIONAL,
+       mimoPilotConfiguration                          MIMO-PilotConfiguration                 OPTIONAL
+}
+
+MIMO-PilotConfiguration ::=                    SEQUENCE {
+       secondCPICH-Pattern                                     CHOICE {
+               normalPattern                                           NULL,
+               diversityPattern                                        SEQUENCE {
+                       channelisationCode                                      ChannelisationCode256
+               }
+       }
+}
+
 MinimumSpreadingFactor ::=                     ENUMERATED {
                                                                                sf4, sf8, sf16, sf32,
                                                                                sf64, sf128, sf256 }
@@ -5129,9 +6354,14 @@ N-StartMessage ::=                                       INTEGER (1..8)
 
 NB01 ::=                                                       INTEGER (0..50)
 
+NewTiming ::=                                          SEQUENCE {
+       enablingDelay                                           EnablingDelay,
+       ue-dtx-drx-Offset                                       UE-DTX-DRX-Offset
+}
+
 NF-Max ::=                                                     INTEGER (1..64)
 
-NumberOfDPDCH ::=                                      INTEGER (1..maxDPDCHUL)
+NumberOfDPDCH ::=                                      INTEGER (1..maxDPDCH-UL)
 
 NumberOfFBI-Bits ::=                           INTEGER (1..2)
 
@@ -5190,7 +6420,22 @@ PDSCH-CapacityAllocationInfo ::= SEQUENCE {
        }
 }
 
-PDSCH-CapacityAllocationInfo-r4 ::=    SEQUENCE {
+PDSCH-CapacityAllocationInfo-r4 ::=    SEQUENCE {
+       pdsch-AllocationPeriodInfo                      AllocationPeriodInfo,
+       configuration                                           CHOICE {
+               old-Configuration                                       SEQUENCE {
+                       tfcs-ID                                                         TFCS-IdentityPlain                                      DEFAULT 1,
+                       pdsch-Identity                                          PDSCH-Identity
+               },
+               new-Configuration                                       SEQUENCE {
+                       pdsch-Info                                                      PDSCH-Info-r4,
+                       pdsch-Identity                                          PDSCH-Identity                          OPTIONAL,
+                       pdsch-PowerControlInfo                          PDSCH-PowerControlInfo          OPTIONAL
+               }
+       }
+}
+
+PDSCH-CapacityAllocationInfo-r7 ::=    SEQUENCE {
        pdsch-AllocationPeriodInfo                      AllocationPeriodInfo,
        configuration                                           CHOICE {
                old-Configuration                                       SEQUENCE {
@@ -5198,7 +6443,7 @@ PDSCH-CapacityAllocationInfo-r4 ::=       SEQUENCE {
                        pdsch-Identity                                          PDSCH-Identity
                },
                new-Configuration                                       SEQUENCE {
-                       pdsch-Info                                                      PDSCH-Info-r4,
+                       pdsch-Info                                                      PDSCH-Info-r7,
                        pdsch-Identity                                          PDSCH-Identity                          OPTIONAL,
                        pdsch-PowerControlInfo                          PDSCH-PowerControlInfo          OPTIONAL
                }
@@ -5211,7 +6456,7 @@ PDSCH-CodeInfo ::=                                        SEQUENCE {
        multiCodeInfo                                           MultiCodeInfo
 }
 
-PDSCH-CodeInfoList ::=                         SEQUENCE (SIZE (1..maxTFCI2Combs)) OF
+PDSCH-CodeInfoList ::=                         SEQUENCE (SIZE (1..maxTFCI-2-Combs)) OF
                                                                                PDSCH-CodeInfo
 
 PDSCH-CodeMap ::=                                      SEQUENCE {
@@ -5221,7 +6466,7 @@ PDSCH-CodeMap ::=                                 SEQUENCE {
        codeNumberStop                                          CodeNumberDSCH
 }
 
-PDSCH-CodeMapList ::=                          SEQUENCE (SIZE (1..maxPDSCHTFCIgroups)) OF
+PDSCH-CodeMapList ::=                          SEQUENCE (SIZE (1..maxPDSCH-TFCIgroups)) OF
                                                                                PDSCH-CodeMap
 
 PDSCH-CodeMapping ::=                          SEQUENCE {
@@ -5236,7 +6481,6 @@ PDSCH-CodeMapping ::=                             SEQUENCE {
 
 PDSCH-Identity ::=                                     INTEGER (1..hiPDSCHidentities)
 
 PDSCH-Info ::=                                         SEQUENCE {
        tfcs-ID                                                         TFCS-IdentityPlain                                      DEFAULT 1,
        commonTimeslotInfo                                      CommonTimeslotInfo                                      OPTIONAL,
@@ -5256,6 +6500,22 @@ PDSCH-Info-r4 ::=                                                SEQUENCE {
        }
 }
 
+PDSCH-Info-r7 ::=                                              SEQUENCE {
+       tfcs-ID                                                         TFCS-IdentityPlain                                      DEFAULT 1,
+       commonTimeslotInfo                                      CommonTimeslotInfo                                      OPTIONAL,
+       tddOption                                                       CHOICE {
+               tdd384                                                          SEQUENCE {
+                       pdsch-TimeslotsCodes                            DownlinkTimeslotsCodes          OPTIONAL
+               },
+               tdd768                                                          SEQUENCE {
+                       pdsch-TimeslotsCodes                            DownlinkTimeslotsCodes-VHCR             OPTIONAL
+               },
+               tdd128                                                          SEQUENCE {
+                       pdsch-TimeslotsCodes                            DownlinkTimeslotsCodes-LCR-r4   OPTIONAL
+               }
+       }
+}
+
 PDSCH-Info-LCR-r4 ::=                          SEQUENCE {
        tfcs-ID                                                         TFCS-IdentityPlain                                      DEFAULT 1,
        commonTimeslotInfo                                      CommonTimeslotInfo                                      OPTIONAL,
@@ -5279,6 +6539,13 @@ PDSCH-SysInfo ::=                                        SEQUENCE {
        dsch-TFCS                                                       TFCS                                                            OPTIONAL
 }
 
+PDSCH-SysInfo-r7 ::=                           SEQUENCE {
+       pdsch-Identity                                          PDSCH-Identity,
+       pdsch-Info                                                      PDSCH-Info-r7,
+       dsch-TransportChannelsInfo                      DSCH-TransportChannelsInfo                      OPTIONAL,
+       dsch-TFCS                                                       TFCS                                                            OPTIONAL
+}
+
 PDSCH-SysInfo-HCR-r5 ::=                                       SEQUENCE {
        pdsch-Identity                                          PDSCH-Identity,
        pdsch-Info                                                      PDSCH-Info,
@@ -5296,6 +6563,8 @@ PDSCH-SysInfo-LCR-r4 ::=                  SEQUENCE {
 PDSCH-SysInfoList ::=                          SEQUENCE (SIZE (1..maxPDSCH)) OF
                                                                                PDSCH-SysInfo
 
+PDSCH-SysInfoList-r7 ::=                       SEQUENCE (SIZE (1..maxPDSCH)) OF PDSCH-SysInfo-r7
+
 PDSCH-SysInfoList-HCR-r5 ::=                   SEQUENCE (SIZE (1..maxPDSCH)) OF PDSCH-SysInfo-HCR-r5
 
 PDSCH-SysInfoList-LCR-r4 ::=           SEQUENCE (SIZE (1..maxPDSCH)) OF
@@ -5349,6 +6618,32 @@ PICH-Info ::=                                            CHOICE {
        }       
 }
 
+PICH-Info-r7 ::=                                       CHOICE {
+       fdd                                                                     SEQUENCE {
+               channelisationCode256                           ChannelisationCode256,
+               pi-CountPerFrame                                        PI-CountPerFrame,
+               sttd-Indicator                                          BOOLEAN
+       },
+       tdd384                                                                  SEQUENCE {
+               channelisationCode                                      TDD-PICH-CCode                                  OPTIONAL,
+               timeslot                                                        TimeslotNumber                                  OPTIONAL,
+               midambleShiftAndBurstType                       MidambleShiftAndBurstType,
+               repetitionPeriodLengthOffset            RepPerLengthOffset-PICH                 OPTIONAL,
+               pagingIndicatorLength                           PagingIndicatorLength                   DEFAULT pi4,
+               n-GAP                                                           N-GAP                                                   DEFAULT f4,
+               n-PCH                                                           N-PCH                                                   DEFAULT 2
+       },
+       tdd768                                                                  SEQUENCE {
+               channelisationCode                                      TDD768-PICH-CCode                               OPTIONAL,
+               timeslot                                                        TimeslotNumber                                  OPTIONAL,
+               midambleShiftAndBurstType                       MidambleShiftAndBurstType,
+               repetitionPeriodLengthOffset            RepPerLengthOffset-PICH                 OPTIONAL,
+               pagingIndicatorLength                           PagingIndicatorLength                   DEFAULT pi4,
+               n-GAP                                                           N-GAP                                                   DEFAULT f4,
+               n-PCH                                                           N-PCH                                                   DEFAULT 2
+       }
+}
+
 PICH-Info-LCR-r4 ::=                           SEQUENCE {
        timeslot                                                        TimeslotNumber-LCR-r4                           OPTIONAL,
        pichChannelisationCodeList-LCR-r4       PichChannelisationCodeList-LCR-r4,
@@ -5370,6 +6665,13 @@ PilotBits256 ::=                                 ENUMERATED {
        -- Actual measurement power offset value = IE value * 0.5
 MeasurementPowerOffset ::=                     INTEGER (-12..26)
 
+PLCCH-Info             ::=                                     SEQUENCE {
+       plcchSequenceNumber                             INTEGER(1..14),
+       timeslotNumber                                  TimeslotNumber-LCR-r4,
+       channelisationCode                              DL-TS-ChannelisationCode,
+       tpcCommandTargetRate                    TPC-CommandTargetRate
+}
+
 PositionFixedOrFlexible ::=                    ENUMERATED {
                                                                                fixed,
                                                                                flexible }
@@ -5410,6 +6712,17 @@ PRACH-Partitioning ::=                           CHOICE {
                                                                                        ASCSetting-TDD
 }      
 
+PRACH-Partitioning-r7 ::=                      CHOICE {
+       fdd                                                                     SEQUENCE (SIZE (1..maxASC)) OF
+       -- TABULAR: If only "NumASC+1" (with, NumASC+1 < maxASC) ASCSetting-FDD are listed,
+       -- the remaining (NumASC+2 through maxASC) ASCs are unspecified.
+                                                                                       ASCSetting-FDD,
+       tdd                                                                     SEQUENCE (SIZE (1..maxASC)) OF
+       -- TABULAR: If only "NumASC+1" (with, NumASC+1 < maxASC) ASCSetting-TDD are listed,
+       -- the remaining (NumASC+2 through maxASC) ASCs are unspecified.
+                                                                                       ASCSetting-TDD-r7
+}
+
 PRACH-Partitioning-LCR-r4 ::=          SEQUENCE (SIZE (1..maxASC)) OF
        -- TABULAR: If only "NumASC+1" (with, NumASC+1 < maxASC) ASCSetting-TDD-LCR-r4 are listed, 
        -- the remaining (NumASC+2 through maxASC) ASCs are unspecified.
@@ -5437,9 +6750,43 @@ PRACH-RACH-Info ::=                                      SEQUENCE {
        }
 }
 
+PRACH-RACH-Info-r7 ::=                         SEQUENCE {
+       modeSpecificInfo                                        CHOICE {
+               fdd                                                                     SEQUENCE {
+                       availableSignatures                                     AvailableSignatures,
+                       availableSF                                                     SF-PRACH,
+                       preambleScramblingCodeWordNumber        PreambleScramblingCodeWordNumber,
+                       puncturingLimit                                         PuncturingLimit,
+                       availableSubChannelNumbers                      AvailableSubChannelNumbers
+               },
+               tdd384                                                                  SEQUENCE {
+                       timeslot                                                        TimeslotNumber,
+                       channelisationCodeList                          TDD-PRACH-CCodeList,
+                       prach-Midamble                                          PRACH-Midamble
+               },
+               tdd768                                                                  SEQUENCE {
+                       timeslot                                                        TimeslotNumber,
+                       channelisationCodeList                          TDD768-PRACH-CCodeList,
+                       prach-Midamble                                          PRACH-Midamble
+               },
+               tdd128                                                                  SEQUENCE {
+                       e-RUCCH-Sync-UL-Codes-Bitmap                    BIT STRING {
+                                                                                                               code7(0),
+                                                                                                               code6(1),
+                                                                                                               code5(2),
+                                                                                                               code4(3),
+                                                                                                               code3(4),
+                                                                                                               code2(5),
+                                                                                                               code1(6),
+                                                                                                               code0(7)
+                                                                                                       }       (SIZE (8))
+               }
+       }
+}
+
 PRACH-RACH-Info-LCR-r4 ::=                     SEQUENCE {
        sync-UL-Info                                            SYNC-UL-Info-r4,
-       prach-DefinitionList                            SEQUENCE (SIZE (1..maxPRACHFPACH)) OF
+       prach-DefinitionList                            SEQUENCE (SIZE (1..maxPRACH-FPACH)) OF
                                                                                        PRACH-Definition-LCR-r4
 }
 
@@ -5463,6 +6810,26 @@ PRACH-SystemInformation ::=                      SEQUENCE {
        }       
 }
 
+PRACH-SystemInformation-r7 ::=         SEQUENCE {
+       prach-RACH-Info                                         PRACH-RACH-Info-r7,
+       transportChannelIdentity                        TransportChannelIdentity,
+       rach-TransportFormatSet                         TransportFormatSet                                      OPTIONAL,
+       rach-TFCS                                                       TFCS                                                            OPTIONAL,
+       prach-Partitioning                                      PRACH-Partitioning-r7                           OPTIONAL,
+       persistenceScalingFactorList            PersistenceScalingFactorList            OPTIONAL,
+       ac-To-ASC-MappingTable                          AC-To-ASC-MappingTable                          OPTIONAL,
+       modeSpecificInfo                                        CHOICE {
+               fdd                                                                     SEQUENCE {
+                       primaryCPICH-TX-Power                           PrimaryCPICH-TX-Power           OPTIONAL,
+                       constantValue                                           ConstantValue                           OPTIONAL,
+                       prach-PowerOffset                                       PRACH-PowerOffset                       OPTIONAL,
+                       rach-TransmissionParameters                     RACH-TransmissionParameters     OPTIONAL,
+                       aich-Info                                                       AICH-Info                                       OPTIONAL
+               },
+               tdd                                                                     NULL
+       }
+}
+
 PRACH-SystemInformation-LCR-r4 ::=     SEQUENCE {
        prach-RACH-Info-LCR                     &n