diff --git a/common/utils/T/T_defs.h b/common/utils/T/T_defs.h
index 9285a68d561cfdfc8ce61f640836c19c053ce1ef..eb327bb261e54d6cf09183e92b75822ca6dc042d 100644
--- a/common/utils/T/T_defs.h
+++ b/common/utils/T/T_defs.h
@@ -29,15 +29,15 @@ typedef struct {
#define T_SHM_FILENAME "/T_shm_segment"
/* number of VCD functions (to be kept up to date! see in T_messages.txt) */
-#define VCD_NUM_FUNCTIONS 146
+#define VCD_NUM_FUNCTIONS 142
/* number of VCD variables (to be kept up to date! see in T_messages.txt) */
-#define VCD_NUM_VARIABLES 99
+#define VCD_NUM_VARIABLES 107
/* first VCD function (to be kept up to date! see in T_messages.txt) */
#define VCD_FIRST_FUNCTION ((uintptr_t)T_VCD_FUNCTION_RT_SLEEP)
/* first VCD variable (to be kept up to date! see in T_messages.txt) */
-#define VCD_FIRST_VARIABLE ((uintptr_t)T_VCD_VARIABLE_FRAME_NUMBER_TX_ENB)
+#define VCD_FIRST_VARIABLE ((uintptr_t)T_VCD_VARIABLE_FRAME_NUMBER_TX0_ENB)
#endif /* _T_defs_H_ */
diff --git a/common/utils/T/T_messages.txt b/common/utils/T/T_messages.txt
index 050c48d0a9c78c99ce24a33bb19db25708f2397f..321225a597f5c7ec8fc22576fb6795c32209b1fc 100644
--- a/common/utils/T/T_messages.txt
+++ b/common/utils/T/T_messages.txt
@@ -806,12 +806,36 @@ ID = buf_test
#variables
-ID = VCD_VARIABLE_FRAME_NUMBER_TX_ENB
- DESC = VCD variable FRAME_NUMBER_TX_ENB
+ID = VCD_VARIABLE_FRAME_NUMBER_TX0_ENB
+ DESC = VCD variable FRAME_NUMBER_TX0_ENB
GROUP = ALL:VCD:ENB:VCD_VARIABLE
FORMAT = ulong,value
-ID = VCD_VARIABLE_FRAME_NUMBER_RX_ENB
- DESC = VCD variable FRAME_NUMBER_RX_ENB
+ID = VCD_VARIABLE_FRAME_NUMBER_TX1_ENB
+ DESC = VCD variable FRAME_NUMBER_TX1_ENB
+ GROUP = ALL:VCD:ENB:VCD_VARIABLE
+ FORMAT = ulong,value
+ID = VCD_VARIABLE_FRAME_NUMBER_RX0_ENB
+ DESC = VCD variable FRAME_NUMBER_RX0_ENB
+ GROUP = ALL:VCD:ENB:VCD_VARIABLE
+ FORMAT = ulong,value
+ID = VCD_VARIABLE_FRAME_NUMBER_RX1_ENB
+ DESC = VCD variable FRAME_NUMBER_RX1_ENB
+ GROUP = ALL:VCD:ENB:VCD_VARIABLE
+ FORMAT = ulong,value
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_TX0_ENB
+ DESC = VCD variable SUBFRAME_NUMBER_TX0_ENB
+ GROUP = ALL:VCD:ENB:VCD_VARIABLE
+ FORMAT = ulong,value
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_TX1_ENB
+ DESC = VCD variable SUBFRAME_NUMBER_TX1_ENB
+ GROUP = ALL:VCD:ENB:VCD_VARIABLE
+ FORMAT = ulong,value
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_RX0_ENB
+ DESC = VCD variable SUBFRAME_NUMBER_RX0_ENB
+ GROUP = ALL:VCD:ENB:VCD_VARIABLE
+ FORMAT = ulong,value
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_RX1_ENB
+ DESC = VCD variable SUBFRAME_NUMBER_RX1_ENB
GROUP = ALL:VCD:ENB:VCD_VARIABLE
FORMAT = ulong,value
ID = VCD_VARIABLE_RUNTIME_TX_ENB
@@ -822,28 +846,36 @@ ID = VCD_VARIABLE_RUNTIME_RX_ENB
DESC = VCD variable RUNTIME_RX_ENB
GROUP = ALL:VCD:ENB:VCD_VARIABLE
FORMAT = ulong,value
-ID = VCD_VARIABLE_FRAME_NUMBER_TX_UE
- DESC = VCD variable FRAME_NUMBER_TX_UE
+ID = VCD_VARIABLE_FRAME_NUMBER_TX0_UE
+ DESC = VCD variable FRAME_NUMBER_TX0_UE
+ GROUP = ALL:VCD:UE:VCD_VARIABLE
+ FORMAT = ulong,value
+ID = VCD_VARIABLE_FRAME_NUMBER_TX1_UE
+ DESC = VCD variable FRAME_NUMBER_TX1_UE
GROUP = ALL:VCD:UE:VCD_VARIABLE
FORMAT = ulong,value
-ID = VCD_VARIABLE_FRAME_NUMBER_RX_UE
- DESC = VCD variable FRAME_NUMBER_RX_UE
+ID = VCD_VARIABLE_FRAME_NUMBER_RX0_UE
+ DESC = VCD variable FRAME_NUMBER_RX0_UE
GROUP = ALL:VCD:UE:VCD_VARIABLE
FORMAT = ulong,value
-ID = VCD_VARIABLE_SLOT_NUMBER_TX_UE
- DESC = VCD variable SLOT_NUMBER_TX_UE
+ID = VCD_VARIABLE_FRAME_NUMBER_RX1_UE
+ DESC = VCD variable FRAME_NUMBER_RX1_UE
GROUP = ALL:VCD:UE:VCD_VARIABLE
FORMAT = ulong,value
-ID = VCD_VARIABLE_SLOT_NUMBER_RX_UE
- DESC = VCD variable SLOT_NUMBER_RX_UE
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_TX0_UE
+ DESC = VCD variable SUBFRAME_NUMBER_TX0_UE
GROUP = ALL:VCD:UE:VCD_VARIABLE
FORMAT = ulong,value
-ID = VCD_VARIABLE_SUBFRAME_NUMBER_TX_UE
- DESC = VCD variable SUBFRAME_NUMBER_TX_UE
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_TX1_UE
+ DESC = VCD variable SUBFRAME_NUMBER_TX1_UE
GROUP = ALL:VCD:UE:VCD_VARIABLE
FORMAT = ulong,value
-ID = VCD_VARIABLE_SUBFRAME_NUMBER_RX_UE
- DESC = VCD variable SUBFRAME_NUMBER_RX_UE
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_RX0_UE
+ DESC = VCD variable SUBFRAME_NUMBER_RX0_UE
+ GROUP = ALL:VCD:UE:VCD_VARIABLE
+ FORMAT = ulong,value
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_RX1_UE
+ DESC = VCD variable SUBFRAME_NUMBER_RX1_UE
GROUP = ALL:VCD:UE:VCD_VARIABLE
FORMAT = ulong,value
ID = VCD_VARIABLE_MISSED_SLOTS_ENB
@@ -1217,92 +1249,32 @@ ID = VCD_FUNCTION_TRX_WRITE
DESC = VCD function TRX_WRITE
GROUP = ALL:VCD:ENB:VCD_FUNCTION
FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_TX0
- DESC = VCD function eNB_PROC_TX0
- GROUP = ALL:VCD:ENB:VCD_FUNCTION
- FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_RX0
- DESC = VCD function eNB_PROC_RX0
- GROUP = ALL:VCD:ENB:VCD_FUNCTION
- FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_TX1
- DESC = VCD function eNB_PROC_TX1
- GROUP = ALL:VCD:ENB:VCD_FUNCTION
- FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_RX1
- DESC = VCD function eNB_PROC_RX1
- GROUP = ALL:VCD:ENB:VCD_FUNCTION
- FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_TX2
- DESC = VCD function eNB_PROC_TX2
- GROUP = ALL:VCD:ENB:VCD_FUNCTION
- FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_RX2
- DESC = VCD function eNB_PROC_RX2
- GROUP = ALL:VCD:ENB:VCD_FUNCTION
- FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_TX3
- DESC = VCD function eNB_PROC_TX3
- GROUP = ALL:VCD:ENB:VCD_FUNCTION
- FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_RX3
- DESC = VCD function eNB_PROC_RX3
- GROUP = ALL:VCD:ENB:VCD_FUNCTION
- FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_TX4
- DESC = VCD function eNB_PROC_TX4
- GROUP = ALL:VCD:ENB:VCD_FUNCTION
- FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_RX4
- DESC = VCD function eNB_PROC_RX4
- GROUP = ALL:VCD:ENB:VCD_FUNCTION
- FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_TX5
- DESC = VCD function eNB_PROC_TX5
- GROUP = ALL:VCD:ENB:VCD_FUNCTION
- FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_RX5
- DESC = VCD function eNB_PROC_RX5
- GROUP = ALL:VCD:ENB:VCD_FUNCTION
- FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_TX6
- DESC = VCD function eNB_PROC_TX6
- GROUP = ALL:VCD:ENB:VCD_FUNCTION
- FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_RX6
- DESC = VCD function eNB_PROC_RX6
- GROUP = ALL:VCD:ENB:VCD_FUNCTION
- FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_TX7
- DESC = VCD function eNB_PROC_TX7
+ID = VCD_FUNCTION_TRX_READ_IF
+ DESC = VCD function TRX_READ_IF
GROUP = ALL:VCD:ENB:VCD_FUNCTION
FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_RX7
- DESC = VCD function eNB_PROC_RX7
+ID = VCD_FUNCTION_TRX_WRITE_IF
+ DESC = VCD function TRX_WRITE_IF
GROUP = ALL:VCD:ENB:VCD_FUNCTION
FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_TX8
- DESC = VCD function eNB_PROC_TX8
+ID = VCD_FUNCTION_eNB_PROC_RXTX0
+ DESC = VCD function eNB_PROC_RXTX0
GROUP = ALL:VCD:ENB:VCD_FUNCTION
FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_RX8
- DESC = VCD function eNB_PROC_RX8
+ID = VCD_FUNCTION_eNB_PROC_RXTX1
+ DESC = VCD function eNB_PROC_RXTX1
GROUP = ALL:VCD:ENB:VCD_FUNCTION
FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_TX9
- DESC = VCD function eNB_PROC_TX9
- GROUP = ALL:VCD:ENB:VCD_FUNCTION
- FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_RX9
- DESC = VCD function eNB_PROC_RX9
- GROUP = ALL:VCD:ENB:VCD_FUNCTION
+ID = VCD_FUNCTION_UE_THREAD_SYNCH
+ DESC = VCD function UE_THREAD_SYNCH
+ GROUP = ALL:VCD:UE:VCD_FUNCTION
FORMAT = int,value
-ID = VCD_FUNCTION_UE_THREAD_TX
- DESC = VCD function UE_THREAD_TX
+ID = VCD_FUNCTION_UE_THREAD_RXTX0
+ DESC = VCD function UE_THREAD_RXTX0
GROUP = ALL:VCD:UE:VCD_FUNCTION
FORMAT = int,value
-ID = VCD_FUNCTION_UE_THREAD_RX
- DESC = VCD function UE_THREAD_RX
+ID = VCD_FUNCTION_UE_THREAD_RXTX1
+ DESC = VCD function UE_THREAD_RXTX1
GROUP = ALL:VCD:UE:VCD_FUNCTION
FORMAT = int,value
ID = VCD_FUNCTION_eNB_TX
@@ -1377,8 +1349,28 @@ ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_TX
DESC = VCD function PHY_PROCEDURES_ENB_TX
GROUP = ALL:VCD:ENB:VCD_FUNCTION
FORMAT = int,value
-ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX
- DESC = VCD function PHY_PROCEDURES_ENB_RX
+ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_TX1
+ DESC = VCD function PHY_PROCEDURES_ENB_TX1
+ GROUP = ALL:VCD:ENB:VCD_FUNCTION
+ FORMAT = int,value
+ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX_COMMON
+ DESC = VCD function PHY_PROCEDURES_ENB_RX_COMMON
+ GROUP = ALL:VCD:ENB:VCD_FUNCTION
+ FORMAT = int,value
+ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX_COMMON1
+ DESC = VCD function PHY_PROCEDURES_ENB_RX_COMMON1
+ GROUP = ALL:VCD:ENB:VCD_FUNCTION
+ FORMAT = int,value
+ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX_UESPEC
+ DESC = VCD function PHY_PROCEDURES_ENB_RX_UESPEC
+ GROUP = ALL:VCD:ENB:VCD_FUNCTION
+ FORMAT = int,value
+ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX_UESPEC1
+ DESC = VCD function PHY_PROCEDURES_ENB_RX_UESPEC1
+ GROUP = ALL:VCD:ENB:VCD_FUNCTION
+ FORMAT = int,value
+ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_SLOT_FEP
+ DESC = VCD function PHY_PROCEDURES_ENB_SLOT_FEP
GROUP = ALL:VCD:ENB:VCD_FUNCTION
FORMAT = int,value
ID = VCD_FUNCTION_PHY_PROCEDURES_UE_TX
@@ -1573,6 +1565,10 @@ ID = VCD_FUNCTION_ENB_DLSCH_ENCODING
DESC = VCD function ENB_DLSCH_ENCODING
GROUP = ALL:VCD:ENB:VCD_FUNCTION
FORMAT = int,value
+ID = VCD_FUNCTION_ENB_DLSCH_ENCODING_W
+ DESC = VCD function ENB_DLSCH_ENCODING_W
+ GROUP = ALL:VCD:ENB:VCD_FUNCTION
+ FORMAT = int,value
ID = VCD_FUNCTION_ENB_DLSCH_SCRAMBLING
DESC = VCD function ENB_DLSCH_SCRAMBLING
GROUP = ALL:VCD:ENB:VCD_FUNCTION
@@ -1645,6 +1641,10 @@ ID = VCD_FUNCTION_UE_DECODE_SI
DESC = VCD function UE_DECODE_SI
GROUP = ALL:VCD:UE:VCD_FUNCTION
FORMAT = int,value
+ID = VCD_FUNCTION_UE_DECODE_PCCH
+ DESC = VCD function UE_DECODE_PCCH
+ GROUP = ALL:VCD:UE:VCD_FUNCTION
+ FORMAT = int,value
ID = VCD_FUNCTION_UE_DECODE_CCCH
DESC = VCD function UE_DECODE_CCCH
GROUP = ALL:VCD:UE:VCD_FUNCTION
@@ -1789,3 +1789,19 @@ ID = VCD_FUNCTION_TEST
DESC = VCD function TEST
GROUP = ALL:VCD:ENB:VCD_FUNCTION
FORMAT = int,value
+ID = VCD_FUNCTION_SEND_IF4
+ DESC = VCD function SEND_IF4
+ GROUP = ALL:VCD:ENB:VCD_FUNCTION
+ FORMAT = int,value
+ID = VCD_FUNCTION_RECV_IF4
+ DESC = VCD function RECV_IF4
+ GROUP = ALL:VCD:ENB:VCD_FUNCTION
+ FORMAT = int,value
+ID = VCD_FUNCTION_SEND_IF5
+ DESC = VCD function SEND_IF5
+ GROUP = ALL:VCD:ENB:VCD_FUNCTION
+ FORMAT = int,value
+ID = VCD_FUNCTION_RECV_IF5
+ DESC = VCD function RECV_IF5
+ GROUP = ALL:VCD:ENB:VCD_FUNCTION
+ FORMAT = int,value