gsm_rlcmac: use consistent naming for [Extended] Packet Timing Advance

Change-Id: I6382c81f7569b4c5a68521c04f6b03a34bfc39dd

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/rlcmac/RLCMACTest.err b/tests/rlcmac/RLCMACTest.err
index 3a2b370c..661f37bd 100644
--- a/tests/rlcmac/RLCMACTest.err
+++ b/tests/rlcmac/RLCMACTest.err
@@ -8,8 +8,8 @@ DCSN1 INFO csnStreamDecoder (type: Pkt UL ASS (10): MESSAGE_TYPE = 10 | PAGE_MOD
 DCSN1 INFO csnStreamEncoder (type: Pkt UL ASS (10)): MESSAGE_TYPE = 10 | PAGE_MODE = 0 | Exist_PERSISTENCE_LEVEL = 0 |  : ID | u.Global_TFI = 0 |  : u.Global_TFI | u.DOWNLINK_TFI = 1 | u.DOWNLINK_TFI = 28 |  : End u.Global_TFI |  : End ID | u.PUA_GPRS_Struct = 0 |  : u.PUA_GPRS_Struct | CHANNEL_CODING_COMMAND = 1 | TLLI_BLOCK_CHANNEL_CODING = 1 |  : Packet_Timing_Advance | Exist_TIMING_ADVANCE_VALUE = 0 | Exist_IndexAndtimeSlot = 1 | TIMING_ADVANCE_INDEX = 9 | TIMING_ADVANCE_TIMESLOT_NUMBER = 6 |  : End Packet_Timing_Advance | Exist_Frequency_Parameters = 1 |  : Frequency_Parameters | TSC = 2 | u.ARFCN = 0 | u.ARFCN = 631 |  : End Frequency_Parameters | u.Dynamic_Allocation = 1 |  : u.Dynamic_Allocation | Extended_Dynamic_Allocation = 0 | Exist_P0 = 0 | USF_GRANULARITY = 0 | Exist_UPLINK_TFI_ASSIGNMENT = 1 | UPLINK_TFI_ASSIGNMENT = 19 | Exist_RLC_DATA_BLOCKS_GRANTED = 0 | Exist_TBF_Starting_Time = 0 | u.Timeslot_Allocation_Power_Ctrl_Param = 1 |  : u.Timeslot_Allocation_Power_Ctrl_Param | ALPHA = 8 | Slot[0].Exist = 0 | Slot[1].Exist = 0 | Slot[2].Exist = 0 | Slot[3].Exist = 0 | Slot[4].Exist = 0 | Slot[5].Exist = 0 | Slot[6].Exist = 1 | Slot[6].USF_TN = 0 | Slot[6].GAMMA_TN = 9 | Slot[7].Exist = 0 |  : End u.Timeslot_Allocation_Power_Ctrl_Param |  : End u.Dynamic_Allocation | Exist_AdditionsR99 = 0 |  : End u.PUA_GPRS_Struct | Padding = 43|43|43|43|43|43|43|43|43|43|43|43|
 DCSN1 INFO csnStreamDecoder (type: Pkt DL ASS (2): MESSAGE_TYPE = 2 | PAGE_MODE = 0 | Exist_PERSISTENCE_LEVEL = 0 |  : ID | Choice PacketDownlinkID = 0 |  : u.Global_TFI | u.DOWNLINK_TFI = 1 | u.DOWNLINK_TFI = 0 | : End u.Global_TFI | : End ID | 0x00 = 0 | MAC_MODE = 0 | RLC_MODE = 0 | CONTROL_ACK = 0 | TIMESLOT_ALLOCATION = 3 |  : Packet_Timing_Advance | Exist_TIMING_ADVANCE_VALUE = 0 | Exist_IndexAndtimeSlot = 1 | TIMING_ADVANCE_INDEX = 1 | TIMING_ADVANCE_TIMESLOT_NUMBER = 6 | : End Packet_Timing_Advance | Exist_P0_and_BTS_PWR_CTRL_MODE = 0 | Exist_Frequency_Parameters = 1 |  : Frequency_Parameters | TSC = 0 | u.ARFCN = 0 | u.ARFCN = 623 | : End Frequency_Parameters | Exist_DOWNLINK_TFI_ASSIGNMENT = 1 | DOWNLINK_TFI_ASSIGNMENT = 0 | Exist_Power_Control_Parameters = 1 |  : Power_Control_Parameters | ALPHA = 10 | Slot[0].Exist = 0 | Slot[1].Exist = 0 | Slot[2].Exist = 0 | Slot[3].Exist = 0 | Slot[4].Exist = 0 | Slot[5].Exist = 0 | Slot[6].Exist = 1 | Slot[6].GAMMA_TN = 27 | Slot[7].Exist = 1 | Slot[7].GAMMA_TN = 27 | : End Power_Control_Parameters | Exist_TBF_Starting_Time = 0 | Exist_Measurement_Mapping = 0 | Exist_AdditionsR99 = 1 |  : AdditionsR99 | Exist_EGPRS_Params = 1 | EGPRS_WindowSize = 6 | LINK_QUALITY_MEASUREMENT_MODE = 0 | Exist_BEP_PERIOD2 = 0 | Exist_Packet_Extended_Timing_Advance = 0 | Exist_COMPACT_ReducedMA = 0 | : End AdditionsR99 | Padding = 11|43|43|43|43|43|43|43|43|43|
 DCSN1 INFO csnStreamEncoder (type: Pkt DL ASS (2)): MESSAGE_TYPE = 2 | PAGE_MODE = 0 | Exist_PERSISTENCE_LEVEL = 0 |  : ID | u.Global_TFI = 0 |  : u.Global_TFI | u.DOWNLINK_TFI = 1 | u.DOWNLINK_TFI = 0 |  : End u.Global_TFI |  : End ID | 0x00 = 0 | MAC_MODE = 0 | RLC_MODE = 0 | CONTROL_ACK = 0 | TIMESLOT_ALLOCATION = 3 |  : Packet_Timing_Advance | Exist_TIMING_ADVANCE_VALUE = 0 | Exist_IndexAndtimeSlot = 1 | TIMING_ADVANCE_INDEX = 1 | TIMING_ADVANCE_TIMESLOT_NUMBER = 6 |  : End Packet_Timing_Advance | Exist_P0_and_BTS_PWR_CTRL_MODE = 0 | Exist_Frequency_Parameters = 1 |  : Frequency_Parameters | TSC = 0 | u.ARFCN = 0 | u.ARFCN = 623 |  : End Frequency_Parameters | Exist_DOWNLINK_TFI_ASSIGNMENT = 1 | DOWNLINK_TFI_ASSIGNMENT = 0 | Exist_Power_Control_Parameters = 1 |  : Power_Control_Parameters | ALPHA = 10 | Slot[0].Exist = 0 | Slot[1].Exist = 0 | Slot[2].Exist = 0 | Slot[3].Exist = 0 | Slot[4].Exist = 0 | Slot[5].Exist = 0 | Slot[6].Exist = 1 | Slot[6].GAMMA_TN = 27 | Slot[7].Exist = 1 | Slot[7].GAMMA_TN = 27 |  : End Power_Control_Parameters | Exist_TBF_Starting_Time = 0 | Exist_Measurement_Mapping = 0 | Exist_AdditionsR99 = 1 |  : AdditionsR99 | Exist_EGPRS_Params = 1 | EGPRS_WindowSize = 6 | LINK_QUALITY_MEASUREMENT_MODE = 0 | Exist_BEP_PERIOD2 = 0 | Exist_Packet_Extended_Timing_Advance = 0 | Exist_COMPACT_ReducedMA = 0 |  : End AdditionsR99 | Padding = 11|43|43|43|43|43|43|43|43|43|
-DCSN1 INFO csnStreamDecoder (type: Pkt UL ASS (10): MESSAGE_TYPE = 10 | PAGE_MODE = 0 | Exist_PERSISTENCE_LEVEL = 0 |  : ID | Choice PacketUplinkID = 2 | u.TLLI = 0x78000000 | : End ID | u.PUA_EGPRS_Struct = 1 |  : u.PUA_EGPRS_Struct | u.PUA_EGPRS_00 = 0 |  : u.PUA_EGPRS_00 | Exist_CONTENTION_RESOLUTION_TLLI = 0 | Exist_COMPACT_ReducedMA = 0 | EGPRS_CHANNEL_CODING_COMMAND = 0 | RESEGMENT = 1 | EGPRS_WindowSize = 6 | AccessTechnologyType = 0 | ARAC_RETRANSMISSION_REQUEST = 0 | TLLI_BLOCK_CHANNEL_CODING = 0 | Exist_BEP_PERIOD2 = 0 |  : PacketTimingAdvance | Exist_TIMING_ADVANCE_VALUE = 0 | Exist_IndexAndtimeSlot = 1 | TIMING_ADVANCE_INDEX = 0 | TIMING_ADVANCE_TIMESLOT_NUMBER = 6 | : End PacketTimingAdvance | Exist_Packet_Extended_Timing_Advance = 0 | Exist_Frequency_Parameters = 1 |  : Frequency_Parameters | TSC = 0 | u.ARFCN = 0 | u.ARFCN = 623 | : End Frequency_Parameters | u.Dynamic_Allocation = 1 |  : u.Dynamic_Allocation | Extended_Dynamic_Allocation = 0 | Exist_P0 = 0 | USF_GRANULARITY = 0 | Exist_UPLINK_TFI_ASSIGNMENT = 1 | UPLINK_TFI_ASSIGNMENT = 0 | Exist_RLC_DATA_BLOCKS_GRANTED = 0 | Exist_TBF_Starting_Time = 0 | u.Timeslot_Allocation_Power_Ctrl_Param = 1 |  : u.Timeslot_Allocation_Power_Ctrl_Param | ALPHA = 10 | Slot[0].Exist = 0 | Slot[1].Exist = 0 | Slot[2].Exist = 0 | Slot[3].Exist = 0 | Slot[4].Exist = 0 | Slot[5].Exist = 0 | Slot[6].Exist = 1 | Slot[6].USF_TN = 1 | Slot[6].GAMMA_TN = 27 | Slot[7].Exist = 1 | Slot[7].USF_TN = 1 | Slot[7].GAMMA_TN = 27 |  : End u.Timeslot_Allocation_Power_Ctrl_Param |  : End u.Dynamic_Allocation |  : End u.PUA_EGPRS_00 |  : End u.PUA_EGPRS_Struct | Padding = 11|43|43|43|43|43|
-DCSN1 INFO csnStreamEncoder (type: Pkt UL ASS (10)): MESSAGE_TYPE = 10 | PAGE_MODE = 0 | Exist_PERSISTENCE_LEVEL = 0 |  : ID | u.TLLI = 2 | u.TLLI = 2013265920 |  : End ID | u.PUA_EGPRS_Struct = 1 |  : u.PUA_EGPRS_Struct | u.PUA_EGPRS_00 = 0 |  : u.PUA_EGPRS_00 | Exist_CONTENTION_RESOLUTION_TLLI = 0 | Exist_COMPACT_ReducedMA = 0 | EGPRS_CHANNEL_CODING_COMMAND = 0 | RESEGMENT = 1 | EGPRS_WindowSize = 6 | AccessTechnologyType = 0 | ARAC_RETRANSMISSION_REQUEST = 0 | TLLI_BLOCK_CHANNEL_CODING = 0 | Exist_BEP_PERIOD2 = 0 |  : PacketTimingAdvance | Exist_TIMING_ADVANCE_VALUE = 0 | Exist_IndexAndtimeSlot = 1 | TIMING_ADVANCE_INDEX = 0 | TIMING_ADVANCE_TIMESLOT_NUMBER = 6 |  : End PacketTimingAdvance | Exist_Packet_Extended_Timing_Advance = 0 | Exist_Frequency_Parameters = 1 |  : Frequency_Parameters | TSC = 0 | u.ARFCN = 0 | u.ARFCN = 623 |  : End Frequency_Parameters | u.Dynamic_Allocation = 1 |  : u.Dynamic_Allocation | Extended_Dynamic_Allocation = 0 | Exist_P0 = 0 | USF_GRANULARITY = 0 | Exist_UPLINK_TFI_ASSIGNMENT = 1 | UPLINK_TFI_ASSIGNMENT = 0 | Exist_RLC_DATA_BLOCKS_GRANTED = 0 | Exist_TBF_Starting_Time = 0 | u.Timeslot_Allocation_Power_Ctrl_Param = 1 |  : u.Timeslot_Allocation_Power_Ctrl_Param | ALPHA = 10 | Slot[0].Exist = 0 | Slot[1].Exist = 0 | Slot[2].Exist = 0 | Slot[3].Exist = 0 | Slot[4].Exist = 0 | Slot[5].Exist = 0 | Slot[6].Exist = 1 | Slot[6].USF_TN = 1 | Slot[6].GAMMA_TN = 27 | Slot[7].Exist = 1 | Slot[7].USF_TN = 1 | Slot[7].GAMMA_TN = 27 |  : End u.Timeslot_Allocation_Power_Ctrl_Param |  : End u.Dynamic_Allocation |  : End u.PUA_EGPRS_00 |  : End u.PUA_EGPRS_Struct | Padding = 11|43|43|43|43|43|
+DCSN1 INFO csnStreamDecoder (type: Pkt UL ASS (10): MESSAGE_TYPE = 10 | PAGE_MODE = 0 | Exist_PERSISTENCE_LEVEL = 0 |  : ID | Choice PacketUplinkID = 2 | u.TLLI = 0x78000000 | : End ID | u.PUA_EGPRS_Struct = 1 |  : u.PUA_EGPRS_Struct | u.PUA_EGPRS_00 = 0 |  : u.PUA_EGPRS_00 | Exist_CONTENTION_RESOLUTION_TLLI = 0 | Exist_COMPACT_ReducedMA = 0 | EGPRS_CHANNEL_CODING_COMMAND = 0 | RESEGMENT = 1 | EGPRS_WindowSize = 6 | AccessTechnologyType = 0 | ARAC_RETRANSMISSION_REQUEST = 0 | TLLI_BLOCK_CHANNEL_CODING = 0 | Exist_BEP_PERIOD2 = 0 |  : Packet_Timing_Advance | Exist_TIMING_ADVANCE_VALUE = 0 | Exist_IndexAndtimeSlot = 1 | TIMING_ADVANCE_INDEX = 0 | TIMING_ADVANCE_TIMESLOT_NUMBER = 6 | : End Packet_Timing_Advance | Exist_Packet_Extended_Timing_Advance = 0 | Exist_Frequency_Parameters = 1 |  : Frequency_Parameters | TSC = 0 | u.ARFCN = 0 | u.ARFCN = 623 | : End Frequency_Parameters | u.Dynamic_Allocation = 1 |  : u.Dynamic_Allocation | Extended_Dynamic_Allocation = 0 | Exist_P0 = 0 | USF_GRANULARITY = 0 | Exist_UPLINK_TFI_ASSIGNMENT = 1 | UPLINK_TFI_ASSIGNMENT = 0 | Exist_RLC_DATA_BLOCKS_GRANTED = 0 | Exist_TBF_Starting_Time = 0 | u.Timeslot_Allocation_Power_Ctrl_Param = 1 |  : u.Timeslot_Allocation_Power_Ctrl_Param | ALPHA = 10 | Slot[0].Exist = 0 | Slot[1].Exist = 0 | Slot[2].Exist = 0 | Slot[3].Exist = 0 | Slot[4].Exist = 0 | Slot[5].Exist = 0 | Slot[6].Exist = 1 | Slot[6].USF_TN = 1 | Slot[6].GAMMA_TN = 27 | Slot[7].Exist = 1 | Slot[7].USF_TN = 1 | Slot[7].GAMMA_TN = 27 |  : End u.Timeslot_Allocation_Power_Ctrl_Param |  : End u.Dynamic_Allocation |  : End u.PUA_EGPRS_00 |  : End u.PUA_EGPRS_Struct | Padding = 11|43|43|43|43|43|
+DCSN1 INFO csnStreamEncoder (type: Pkt UL ASS (10)): MESSAGE_TYPE = 10 | PAGE_MODE = 0 | Exist_PERSISTENCE_LEVEL = 0 |  : ID | u.TLLI = 2 | u.TLLI = 2013265920 |  : End ID | u.PUA_EGPRS_Struct = 1 |  : u.PUA_EGPRS_Struct | u.PUA_EGPRS_00 = 0 |  : u.PUA_EGPRS_00 | Exist_CONTENTION_RESOLUTION_TLLI = 0 | Exist_COMPACT_ReducedMA = 0 | EGPRS_CHANNEL_CODING_COMMAND = 0 | RESEGMENT = 1 | EGPRS_WindowSize = 6 | AccessTechnologyType = 0 | ARAC_RETRANSMISSION_REQUEST = 0 | TLLI_BLOCK_CHANNEL_CODING = 0 | Exist_BEP_PERIOD2 = 0 |  : Packet_Timing_Advance | Exist_TIMING_ADVANCE_VALUE = 0 | Exist_IndexAndtimeSlot = 1 | TIMING_ADVANCE_INDEX = 0 | TIMING_ADVANCE_TIMESLOT_NUMBER = 6 |  : End Packet_Timing_Advance | Exist_Packet_Extended_Timing_Advance = 0 | Exist_Frequency_Parameters = 1 |  : Frequency_Parameters | TSC = 0 | u.ARFCN = 0 | u.ARFCN = 623 |  : End Frequency_Parameters | u.Dynamic_Allocation = 1 |  : u.Dynamic_Allocation | Extended_Dynamic_Allocation = 0 | Exist_P0 = 0 | USF_GRANULARITY = 0 | Exist_UPLINK_TFI_ASSIGNMENT = 1 | UPLINK_TFI_ASSIGNMENT = 0 | Exist_RLC_DATA_BLOCKS_GRANTED = 0 | Exist_TBF_Starting_Time = 0 | u.Timeslot_Allocation_Power_Ctrl_Param = 1 |  : u.Timeslot_Allocation_Power_Ctrl_Param | ALPHA = 10 | Slot[0].Exist = 0 | Slot[1].Exist = 0 | Slot[2].Exist = 0 | Slot[3].Exist = 0 | Slot[4].Exist = 0 | Slot[5].Exist = 0 | Slot[6].Exist = 1 | Slot[6].USF_TN = 1 | Slot[6].GAMMA_TN = 27 | Slot[7].Exist = 1 | Slot[7].USF_TN = 1 | Slot[7].GAMMA_TN = 27 |  : End u.Timeslot_Allocation_Power_Ctrl_Param |  : End u.Dynamic_Allocation |  : End u.PUA_EGPRS_00 |  : End u.PUA_EGPRS_Struct | Padding = 11|43|43|43|43|43|
 DCSN1 INFO csnStreamDecoder (type: Pkt UL ACK/NACK (9): MESSAGE_TYPE = 9 | PAGE_MODE = 0 | 0x00 = 0 | UPLINK_TFI = 1 | u.PU_AckNack_EGPRS_Struct = 1 |  : u.PU_AckNack_EGPRS_Struct | u.PU_AckNack_EGPRS_00 = 0 |  : u.PU_AckNack_EGPRS_00 | EGPRS_ChannelCodingCommand = 3 | RESEGMENT = 1 | PRE_EMPTIVE_TRANSMISSION = 1 | PRR_RETRANSMISSION_REQUEST = 0 | ARAC_RETRANSMISSION_REQUEST = 0 | Common_Uplink_Ack_Nack_Data.Exist_CONTENTION_RESOLUTION_TLLI = 1 | Common_Uplink_Ack_Nack_Data.CONTENTION_RESOLUTION_TLLI = 0x78000000 | TBF_EST = 0 | Common_Uplink_Ack_Nack_Data.Exist_Packet_Timing_Advance = 0 | Exist_Packet_Extended_Timing_Advance = 0 | Common_Uplink_Ack_Nack_Data.Exist_Power_Control_Parameters = 0 | Common_Uplink_Ack_Nack_Data.Exist_Extension_Bits = 0 |  : EGPRS_AckNack | Desc = 1 |  : Desc | Desc length = 15 | offset = 0 | FINAL_ACK_INDICATION = 0 | BEGINNING_OF_WINDOW = 1 | END_OF_WINDOW = 1 | STARTING_SEQUENCE_NUMBER = 2 | Exist_CRBB = 0 |  : End Desc | : End EGPRS_AckNack |  : End u.PU_AckNack_EGPRS_00 |  : End u.PU_AckNack_EGPRS_Struct | Padding = 43|43|43|43|43|43|43|43|43|43|43|
 DCSN1 INFO csnStreamEncoder (type: Pkt UL ACK/NACK (9)): MESSAGE_TYPE = 9 | PAGE_MODE = 0 | 0x00 = 0 | UPLINK_TFI = 1 | u.PU_AckNack_EGPRS_Struct = 1 |  : u.PU_AckNack_EGPRS_Struct | u.PU_AckNack_EGPRS_00 = 0 |  : u.PU_AckNack_EGPRS_00 | EGPRS_ChannelCodingCommand = 3 | RESEGMENT = 1 | PRE_EMPTIVE_TRANSMISSION = 1 | PRR_RETRANSMISSION_REQUEST = 0 | ARAC_RETRANSMISSION_REQUEST = 0 | Common_Uplink_Ack_Nack_Data.Exist_CONTENTION_RESOLUTION_TLLI = 1 | Common_Uplink_Ack_Nack_Data.CONTENTION_RESOLUTION_TLLI = 2013265920 | TBF_EST = 0 | Common_Uplink_Ack_Nack_Data.Exist_Packet_Timing_Advance = 0 | Exist_Packet_Extended_Timing_Advance = 0 | Common_Uplink_Ack_Nack_Data.Exist_Power_Control_Parameters = 0 | Common_Uplink_Ack_Nack_Data.Exist_Extension_Bits = 0 |  : EGPRS_AckNack | Desc = 1 |  : Desc | FINAL_ACK_INDICATION = 0 | BEGINNING_OF_WINDOW = 1 | END_OF_WINDOW = 1 | STARTING_SEQUENCE_NUMBER = 2 | Exist_CRBB = 0 | Desc length = 15 |  : End Desc |  : End EGPRS_AckNack |  : End u.PU_AckNack_EGPRS_00 |  : End u.PU_AckNack_EGPRS_Struct | Padding = 43|43|43|43|43|43|43|43|43|43|43|
 DCSN1 INFO csnStreamDecoder (type: Pkt Polling Req (4): MESSAGE_TYPE = 4 | PAGE_MODE = 3 |  : ID | DCSN1 ERROR csnStreamDecoder: error STREAM_NOT_SUPPORTED (-8) at PacketPollingID (idx 16): End ID |