add vcd logging for send, recv if4 and delay for testing without recv
This commit is contained in:
@@ -1270,6 +1270,10 @@ void rx_prach(PHY_VARS_eNB *eNB,
|
|||||||
|
|
||||||
if (eNB->node_function == NGFI_RRU_IF4) {
|
if (eNB->node_function == NGFI_RRU_IF4) {
|
||||||
/// **** send_IF4 of prachF to RCC **** ///
|
/// **** send_IF4 of prachF to RCC **** ///
|
||||||
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_SEND_IF4, 1 );
|
||||||
|
// send_IF4();
|
||||||
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_SEND_IF4, 0 );
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1278,7 +1282,6 @@ void rx_prach(PHY_VARS_eNB *eNB,
|
|||||||
// wait for prachF from RRU and continue with PRACH processing
|
// wait for prachF from RRU and continue with PRACH processing
|
||||||
//}
|
//}
|
||||||
|
|
||||||
|
|
||||||
// here onwards is for eNodeB_3GPP or NGFI_RCC_IF4
|
// here onwards is for eNodeB_3GPP or NGFI_RCC_IF4
|
||||||
|
|
||||||
preamble_offset_old = 99;
|
preamble_offset_old = 99;
|
||||||
|
|||||||
@@ -61,6 +61,8 @@
|
|||||||
#include "assertions.h"
|
#include "assertions.h"
|
||||||
#include "msc.h"
|
#include "msc.h"
|
||||||
|
|
||||||
|
#include <time.h>
|
||||||
|
|
||||||
#if defined(ENABLE_ITTI)
|
#if defined(ENABLE_ITTI)
|
||||||
# include "intertask_interface.h"
|
# include "intertask_interface.h"
|
||||||
#endif
|
#endif
|
||||||
@@ -2489,6 +2491,10 @@ void phy_procedures_eNB_common_RX(PHY_VARS_eNB *eNB,const uint8_t abstraction_fl
|
|||||||
uint32_t symbol_number;
|
uint32_t symbol_number;
|
||||||
uint32_t symbol_mask, symbol_mask_full;
|
uint32_t symbol_mask, symbol_mask_full;
|
||||||
|
|
||||||
|
struct timespec time_req, time_rem;
|
||||||
|
time_req.tv_sec = 0;
|
||||||
|
time_req.tv_nsec = 300000;
|
||||||
|
|
||||||
if (subframe==9) {
|
if (subframe==9) {
|
||||||
subframe=0;
|
subframe=0;
|
||||||
frame++;
|
frame++;
|
||||||
@@ -2564,6 +2570,11 @@ void phy_procedures_eNB_common_RX(PHY_VARS_eNB *eNB,const uint8_t abstraction_fl
|
|||||||
if (eNB->node_function == NGFI_RRU_IF4 && is_prach_subframe(fp, frame, subframe)<=0) {
|
if (eNB->node_function == NGFI_RRU_IF4 && is_prach_subframe(fp, frame, subframe)<=0) {
|
||||||
|
|
||||||
/// **** send_IF4 of rxdataF to RCC (no prach now) **** ///
|
/// **** send_IF4 of rxdataF to RCC (no prach now) **** ///
|
||||||
|
|
||||||
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_SEND_IF4, 1 );
|
||||||
|
// send_IF4();
|
||||||
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_SEND_IF4, 0 );
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// **** send_IF4 of prach to RCC **** /// done in prach thread (below)
|
/// **** send_IF4 of prach to RCC **** /// done in prach thread (below)
|
||||||
@@ -2609,8 +2620,12 @@ void phy_procedures_eNB_common_RX(PHY_VARS_eNB *eNB,const uint8_t abstraction_fl
|
|||||||
|
|
||||||
// Block from loop while testing
|
// Block from loop while testing
|
||||||
symbol_mask = symbol_mask_full;
|
symbol_mask = symbol_mask_full;
|
||||||
|
nanosleep(&time_req, &time_rem);
|
||||||
|
|
||||||
do {
|
do {
|
||||||
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_RECV_IF4, 1 );
|
||||||
//recv_IF4(eNB, proc, &packet_type, &symbol_number);
|
//recv_IF4(eNB, proc, &packet_type, &symbol_number);
|
||||||
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_RECV_IF4, 0 );
|
||||||
|
|
||||||
if (packet_type == IF4_PULFFT) {
|
if (packet_type == IF4_PULFFT) {
|
||||||
symbol_mask = symbol_mask | (1<<symbol_number);
|
symbol_mask = symbol_mask | (1<<symbol_number);
|
||||||
|
|||||||
@@ -329,7 +329,11 @@ const char* eurecomFunctionsNames[] = {
|
|||||||
"itti_dump_enqueue_message",
|
"itti_dump_enqueue_message",
|
||||||
"itti_dump_enqueue_message_malloc",
|
"itti_dump_enqueue_message_malloc",
|
||||||
"itti_relay_thread",
|
"itti_relay_thread",
|
||||||
"test"
|
"test",
|
||||||
|
|
||||||
|
/* IF4 signals */
|
||||||
|
"send_if4",
|
||||||
|
"recv_if4"
|
||||||
};
|
};
|
||||||
|
|
||||||
struct vcd_module_s vcd_modules[VCD_SIGNAL_DUMPER_MODULE_END] = {
|
struct vcd_module_s vcd_modules[VCD_SIGNAL_DUMPER_MODULE_END] = {
|
||||||
|
|||||||
@@ -307,6 +307,11 @@ typedef enum {
|
|||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_ITTI_DUMP_ENQUEUE_MESSAGE_MALLOC,
|
VCD_SIGNAL_DUMPER_FUNCTIONS_ITTI_DUMP_ENQUEUE_MESSAGE_MALLOC,
|
||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_ITTI_RELAY_THREAD,
|
VCD_SIGNAL_DUMPER_FUNCTIONS_ITTI_RELAY_THREAD,
|
||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_TEST,
|
VCD_SIGNAL_DUMPER_FUNCTIONS_TEST,
|
||||||
|
|
||||||
|
/* IF4 signals */
|
||||||
|
VCD_SIGNAL_DUMPER_FUNCTIONS_SEND_IF4,
|
||||||
|
VCD_SIGNAL_DUMPER_FUNCTIONS_RECV_IF4,
|
||||||
|
|
||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_LAST,
|
VCD_SIGNAL_DUMPER_FUNCTIONS_LAST,
|
||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_END = VCD_SIGNAL_DUMPER_FUNCTIONS_LAST,
|
VCD_SIGNAL_DUMPER_FUNCTIONS_END = VCD_SIGNAL_DUMPER_FUNCTIONS_LAST,
|
||||||
} vcd_signal_dump_functions;
|
} vcd_signal_dump_functions;
|
||||||
|
|||||||
@@ -483,7 +483,10 @@ static void* eNB_thread_rxtx( void* param ) {
|
|||||||
} else {
|
} else {
|
||||||
|
|
||||||
/// **** recv_IF4 of txdataF from RCC **** ///
|
/// **** recv_IF4 of txdataF from RCC **** ///
|
||||||
|
|
||||||
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_RECV_IF4, 1 );
|
||||||
//recv_IF4(eNB, proc, packet_type, symbol_number);
|
//recv_IF4(eNB, proc, packet_type, symbol_number);
|
||||||
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_RECV_IF4, 0 );
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -530,7 +533,10 @@ static void* eNB_thread_rxtx( void* param ) {
|
|||||||
} else {
|
} else {
|
||||||
|
|
||||||
/// **** send_IF4 of txdataF to RRU **** ///
|
/// **** send_IF4 of txdataF to RRU **** ///
|
||||||
//send_IF4(PHY_vars_eNB_g[0][proc->CC_id], proc);
|
|
||||||
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_SEND_IF4, 1 );
|
||||||
|
//send_IF4(PHY_vars_eNB_g[0][proc->CC_id], proc, 0);
|
||||||
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_SEND_IF4, 0 );
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user