Move some types from GSM_RR_Types.ttcn to RLCMAC_CSN1_Types.ttcn
Some types already available in GSM_RR_Types.ttcn will also be required by messages sent over PDCH and which belong to RLCMAC_CSN1_Types. Since GSM_RR_Types.ttcn already requires RLCMAC_CSN1_Types.ttcn, let's move them there so they can be used in both places. Change-Id: Iccaaa2743dc44a36046c19d4d4ff882dc02fb479
This commit is contained in:
parent
02c972d8aa
commit
2ec84fd0e5
|
@ -512,67 +512,6 @@ module GSM_RR_Types {
|
||||||
} with {
|
} with {
|
||||||
variant (compressed_irat_ho_info_ind) "CSN.1 L/H"
|
variant (compressed_irat_ho_info_ind) "CSN.1 L/H"
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
type record of AccessTechnologiesRequest
|
|
||||||
AccessTechnologiesRequestRepetition
|
|
||||||
with { variant "EXTENSION_BIT(reverse)" };
|
|
||||||
|
|
||||||
type record AccessTechnologiesRequest
|
|
||||||
{
|
|
||||||
BIT4 accessTechnType,
|
|
||||||
BIT1 extensionBit
|
|
||||||
} with { variant "FIELDORDER(msb)" };
|
|
||||||
|
|
||||||
type enumerated EgprsChCodingCommand {
|
|
||||||
CH_CODING_MCS1 ('0000'B),
|
|
||||||
CH_CODING_MCS2 ('0001'B),
|
|
||||||
CH_CODING_MCS3 ('0010'B),
|
|
||||||
CH_CODING_MCS4 ('0011'B),
|
|
||||||
CH_CODING_MCS5 ('0100'B),
|
|
||||||
CH_CODING_MCS6 ('0101'B),
|
|
||||||
CH_CODING_MCS7 ('0110'B),
|
|
||||||
CH_CODING_MCS8 ('0111'B),
|
|
||||||
CH_CODING_MCS9 ('1000'B),
|
|
||||||
CH_CODING_MCS5_7 ('1001'B),
|
|
||||||
CH_CODING_MCS6_9 ('1010'B)
|
|
||||||
} with { variant "FIELDLENGTH(4)" };
|
|
||||||
|
|
||||||
/* TS 44.060 Table 12.5.2.1 */
|
|
||||||
type enumerated EgprsWindowSize {
|
|
||||||
EGPRS_WS_64 ('00000'B),
|
|
||||||
EGPRS_WS_96 ('00001'B),
|
|
||||||
EGPRS_WS_128 ('00010'B),
|
|
||||||
EGPRS_WS_160 ('00011'B),
|
|
||||||
EGPRS_WS_192 ('00100'B),
|
|
||||||
EGPRS_WS_224 ('00101'B),
|
|
||||||
EGPRS_WS_256 ('00110'B),
|
|
||||||
EGPRS_WS_288 ('00111'B),
|
|
||||||
EGPRS_WS_320 ('01000'B),
|
|
||||||
EGPRS_WS_352 ('01001'B),
|
|
||||||
EGPRS_WS_384 ('01010'B),
|
|
||||||
EGPRS_WS_416 ('01011'B),
|
|
||||||
EGPRS_WS_448 ('01100'B),
|
|
||||||
EGPRS_WS_480 ('01101'B),
|
|
||||||
EGPRS_WS_512 ('01110'B),
|
|
||||||
EGPRS_WS_544 ('01111'B),
|
|
||||||
EGPRS_WS_576 ('10000'B),
|
|
||||||
EGPRS_WS_608 ('10001'B),
|
|
||||||
EGPRS_WS_640 ('10010'B),
|
|
||||||
EGPRS_WS_672 ('10011'B),
|
|
||||||
EGPRS_WS_704 ('10100'B),
|
|
||||||
EGPRS_WS_736 ('10101'B),
|
|
||||||
EGPRS_WS_768 ('10110'B),
|
|
||||||
EGPRS_WS_800 ('10111'B),
|
|
||||||
EGPRS_WS_832 ('11000'B),
|
|
||||||
EGPRS_WS_864 ('11001'B),
|
|
||||||
EGPRS_WS_896 ('11010'B),
|
|
||||||
EGPRS_WS_928 ('11011'B),
|
|
||||||
EGPRS_WS_960 ('11100'B),
|
|
||||||
EGPRS_WS_992 ('11101'B),
|
|
||||||
EGPRS_WS_1024 ('11110'B)
|
|
||||||
} with { variant "FIELDLENGTH(5)" };
|
|
||||||
|
|
||||||
type record EgprsUlAssignDyn {
|
type record EgprsUlAssignDyn {
|
||||||
uint5_t tfi_assignment,
|
uint5_t tfi_assignment,
|
||||||
BIT1 polling,
|
BIT1 polling,
|
||||||
|
|
|
@ -56,6 +56,55 @@ module RLCMAC_CSN1_Types {
|
||||||
MBMS_DL_ACK_NACK ('010000'B)
|
MBMS_DL_ACK_NACK ('010000'B)
|
||||||
} with { variant "FIELDLENGTH(6)" };
|
} with { variant "FIELDLENGTH(6)" };
|
||||||
|
|
||||||
|
type enumerated EgprsChCodingCommand {
|
||||||
|
CH_CODING_MCS1 ('0000'B),
|
||||||
|
CH_CODING_MCS2 ('0001'B),
|
||||||
|
CH_CODING_MCS3 ('0010'B),
|
||||||
|
CH_CODING_MCS4 ('0011'B),
|
||||||
|
CH_CODING_MCS5 ('0100'B),
|
||||||
|
CH_CODING_MCS6 ('0101'B),
|
||||||
|
CH_CODING_MCS7 ('0110'B),
|
||||||
|
CH_CODING_MCS8 ('0111'B),
|
||||||
|
CH_CODING_MCS9 ('1000'B),
|
||||||
|
CH_CODING_MCS5_7 ('1001'B),
|
||||||
|
CH_CODING_MCS6_9 ('1010'B)
|
||||||
|
} with { variant "FIELDLENGTH(4)" };
|
||||||
|
|
||||||
|
/* TS 44.060 Table 12.5.2.1 */
|
||||||
|
type enumerated EgprsWindowSize { /* This probably needs to be moved to RLCMAC_CSN1_Types.ttcn */
|
||||||
|
EGPRS_WS_64 ('00000'B),
|
||||||
|
EGPRS_WS_96 ('00001'B),
|
||||||
|
EGPRS_WS_128 ('00010'B),
|
||||||
|
EGPRS_WS_160 ('00011'B),
|
||||||
|
EGPRS_WS_192 ('00100'B),
|
||||||
|
EGPRS_WS_224 ('00101'B),
|
||||||
|
EGPRS_WS_256 ('00110'B),
|
||||||
|
EGPRS_WS_288 ('00111'B),
|
||||||
|
EGPRS_WS_320 ('01000'B),
|
||||||
|
EGPRS_WS_352 ('01001'B),
|
||||||
|
EGPRS_WS_384 ('01010'B),
|
||||||
|
EGPRS_WS_416 ('01011'B),
|
||||||
|
EGPRS_WS_448 ('01100'B),
|
||||||
|
EGPRS_WS_480 ('01101'B),
|
||||||
|
EGPRS_WS_512 ('01110'B),
|
||||||
|
EGPRS_WS_544 ('01111'B),
|
||||||
|
EGPRS_WS_576 ('10000'B),
|
||||||
|
EGPRS_WS_608 ('10001'B),
|
||||||
|
EGPRS_WS_640 ('10010'B),
|
||||||
|
EGPRS_WS_672 ('10011'B),
|
||||||
|
EGPRS_WS_704 ('10100'B),
|
||||||
|
EGPRS_WS_736 ('10101'B),
|
||||||
|
EGPRS_WS_768 ('10110'B),
|
||||||
|
EGPRS_WS_800 ('10111'B),
|
||||||
|
EGPRS_WS_832 ('11000'B),
|
||||||
|
EGPRS_WS_864 ('11001'B),
|
||||||
|
EGPRS_WS_896 ('11010'B),
|
||||||
|
EGPRS_WS_928 ('11011'B),
|
||||||
|
EGPRS_WS_960 ('11100'B),
|
||||||
|
EGPRS_WS_992 ('11101'B),
|
||||||
|
EGPRS_WS_1024 ('11110'B)
|
||||||
|
} with { variant "FIELDLENGTH(5)" };
|
||||||
|
|
||||||
type record NullGlobalTfi {
|
type record NullGlobalTfi {
|
||||||
BIT1 presence ('0'B),
|
BIT1 presence ('0'B),
|
||||||
GlobalTfi global_tfi
|
GlobalTfi global_tfi
|
||||||
|
@ -184,6 +233,13 @@ module RLCMAC_CSN1_Types {
|
||||||
variant (dyn_block_alloc) "PRESENCE(alloc_present = '01'B)"
|
variant (dyn_block_alloc) "PRESENCE(alloc_present = '01'B)"
|
||||||
variant (sgl_block_alloc) "PRESENCE(alloc_present = '10'B)"
|
variant (sgl_block_alloc) "PRESENCE(alloc_present = '10'B)"
|
||||||
};
|
};
|
||||||
|
type record of AccessTechnologiesRequest AccessTechnologiesRequestRepetition
|
||||||
|
with { variant "EXTENSION_BIT(reverse)" };
|
||||||
|
type record AccessTechnologiesRequest
|
||||||
|
{
|
||||||
|
BIT4 accessTechnType,
|
||||||
|
BIT1 extensionBit
|
||||||
|
} with { variant "FIELDORDER(msb)" };
|
||||||
type record PacketUlAssignment {
|
type record PacketUlAssignment {
|
||||||
PageMode page_mode,
|
PageMode page_mode,
|
||||||
BIT1 persistence_levels_present,
|
BIT1 persistence_levels_present,
|
||||||
|
|
Loading…
Reference in New Issue