Result of testing as eNodeB. modifications for .vcd logging, bugfix in eNB_thread_FH (subframe counter), update of .conf file for new threading parameters. Updates to gtkwave configuration file for new threading.
This commit is contained in:
@@ -1105,7 +1105,7 @@ void phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,
|
|||||||
uint8_t smbv_alloc_cnt = 1;
|
uint8_t smbv_alloc_cnt = 1;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX,1);
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX+(subframe&1),1);
|
||||||
start_meas(&eNB->phy_proc_tx);
|
start_meas(&eNB->phy_proc_tx);
|
||||||
|
|
||||||
for (i=0; i<NUMBER_OF_UE_MAX; i++) {
|
for (i=0; i<NUMBER_OF_UE_MAX; i++) {
|
||||||
@@ -1406,7 +1406,7 @@ void phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX,0);
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX+(subframe&1),0);
|
||||||
stop_meas(&eNB->phy_proc_tx);
|
stop_meas(&eNB->phy_proc_tx);
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -2515,7 +2515,7 @@ void phy_procedures_eNB_common_RX(PHY_VARS_eNB *eNB,const uint8_t abstraction_fl
|
|||||||
|
|
||||||
uint8_t seqno=0;
|
uint8_t seqno=0;
|
||||||
|
|
||||||
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_RX_COMMON, 1 );
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_RX_COMMON+(subframe&1), 1 );
|
||||||
|
|
||||||
start_meas(&eNB->phy_proc_rx);
|
start_meas(&eNB->phy_proc_rx);
|
||||||
|
|
||||||
@@ -2602,7 +2602,7 @@ void phy_procedures_eNB_common_RX(PHY_VARS_eNB *eNB,const uint8_t abstraction_fl
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_RX_COMMON, 0 );
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_RX_COMMON+(subframe&1), 0 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -2621,7 +2621,7 @@ void phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,const
|
|||||||
const int subframe = proc->subframe_rx;
|
const int subframe = proc->subframe_rx;
|
||||||
const int frame = proc->frame_rx;
|
const int frame = proc->frame_rx;
|
||||||
|
|
||||||
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_RX_UESPEC, 1 );
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_RX_UESPEC+(subframe&1), 1 );
|
||||||
start_meas(&eNB->phy_proc_rx);
|
start_meas(&eNB->phy_proc_rx);
|
||||||
#ifdef DEBUG_PHY_PROC
|
#ifdef DEBUG_PHY_PROC
|
||||||
LOG_D(PHY,"[eNB %d] Frame %d: Doing phy_procedures_eNB_uespec_RX(%d)\n",eNB->Mod_id,frame, subframe);
|
LOG_D(PHY,"[eNB %d] Frame %d: Doing phy_procedures_eNB_uespec_RX(%d)\n",eNB->Mod_id,frame, subframe);
|
||||||
@@ -3183,7 +3183,7 @@ void phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,const
|
|||||||
phy_procedures_emos_eNB_RX(subframe,eNB);
|
phy_procedures_emos_eNB_RX(subframe,eNB);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_RX_UESPEC, 0 );
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_RX_UESPEC+(subframe&1), 0 );
|
||||||
|
|
||||||
stop_meas(&eNB->phy_proc_rx);
|
stop_meas(&eNB->phy_proc_rx);
|
||||||
|
|
||||||
|
|||||||
@@ -75,10 +75,14 @@ struct vcd_module_s {
|
|||||||
} vcd_module_s;
|
} vcd_module_s;
|
||||||
|
|
||||||
const char* eurecomVariablesNames[] = {
|
const char* eurecomVariablesNames[] = {
|
||||||
"frame_number_TX_eNB",
|
"frame_number_TX0_eNB",
|
||||||
"frame_number_RX_eNB",
|
"frame_number_TX1_eNB",
|
||||||
"subframe_number_TX_eNB",
|
"frame_number_RX0_eNB",
|
||||||
"subframe_number_RX_eNB",
|
"frame_number_RX1_eNB",
|
||||||
|
"subframe_number_TX0_eNB",
|
||||||
|
"subframe_number_TX1_eNB",
|
||||||
|
"subframe_number_RX0_eNB",
|
||||||
|
"subframe_number_RX1_eNB",
|
||||||
"runtime_TX_eNB",
|
"runtime_TX_eNB",
|
||||||
"runtime_RX_eNB",
|
"runtime_RX_eNB",
|
||||||
"frame_number_TX0_UE",
|
"frame_number_TX0_UE",
|
||||||
@@ -187,8 +191,6 @@ const char* eurecomFunctionsNames[] = {
|
|||||||
"trx_write",
|
"trx_write",
|
||||||
"eNB_thread_rxtx0",
|
"eNB_thread_rxtx0",
|
||||||
"eNB_thread_rxtx1",
|
"eNB_thread_rxtx1",
|
||||||
"eNB_thread_rx",
|
|
||||||
"eNB_thread_prach",
|
|
||||||
"ue_thread_synch",
|
"ue_thread_synch",
|
||||||
"ue_thread_rxtx0",
|
"ue_thread_rxtx0",
|
||||||
"ue_thread_rxtx1",
|
"ue_thread_rxtx1",
|
||||||
@@ -213,10 +215,12 @@ const char* eurecomFunctionsNames[] = {
|
|||||||
"lte_ue_measurement_procedures",
|
"lte_ue_measurement_procedures",
|
||||||
"lte_ue_pdcch_procedures",
|
"lte_ue_pdcch_procedures",
|
||||||
"lte_ue_pbch_procedures",
|
"lte_ue_pbch_procedures",
|
||||||
"phy_procedures_eNb_tx",
|
"phy_procedures_eNb_tx0",
|
||||||
"phy_procedures_eNb_rx",
|
"phy_procedures_eNb_tx1",
|
||||||
"phy_procedures_eNb_rx_common",
|
"phy_procedures_eNb_rx_common0",
|
||||||
"phy_procedures_eNb_rx_uespec",
|
"phy_procedures_eNb_rx_common1",
|
||||||
|
"phy_procedures_eNb_rx_uespec0",
|
||||||
|
"phy_procedures_eNb_rx_uespec1",
|
||||||
"phy_eNB_slot_fep",
|
"phy_eNB_slot_fep",
|
||||||
"phy_procedures_ue_tx",
|
"phy_procedures_ue_tx",
|
||||||
"phy_procedures_ue_rx",
|
"phy_procedures_ue_rx",
|
||||||
|
|||||||
@@ -47,10 +47,14 @@
|
|||||||
|
|
||||||
/* WARNING: if you edit the enums below, update also string definitions in vcd_signal_dumper.c */
|
/* WARNING: if you edit the enums below, update also string definitions in vcd_signal_dumper.c */
|
||||||
typedef enum {
|
typedef enum {
|
||||||
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX_ENB = 0,
|
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX0_ENB = 0,
|
||||||
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX_ENB,
|
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX1_ENB,
|
||||||
VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_TX_ENB,
|
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX0_ENB,
|
||||||
VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_RX_ENB,
|
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX1_ENB,
|
||||||
|
VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_TX0_ENB,
|
||||||
|
VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_TX1_ENB,
|
||||||
|
VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_RX0_ENB,
|
||||||
|
VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_RX1_ENB,
|
||||||
VCD_SIGNAL_DUMPER_VARIABLES_RUNTIME_TX_ENB,
|
VCD_SIGNAL_DUMPER_VARIABLES_RUNTIME_TX_ENB,
|
||||||
VCD_SIGNAL_DUMPER_VARIABLES_RUNTIME_RX_ENB,
|
VCD_SIGNAL_DUMPER_VARIABLES_RUNTIME_RX_ENB,
|
||||||
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX0_UE,
|
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX0_UE,
|
||||||
@@ -161,8 +165,6 @@ typedef enum {
|
|||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE,
|
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE,
|
||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_eNB_PROC_RXTX0,
|
VCD_SIGNAL_DUMPER_FUNCTIONS_eNB_PROC_RXTX0,
|
||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_eNB_PROC_RXTX1,
|
VCD_SIGNAL_DUMPER_FUNCTIONS_eNB_PROC_RXTX1,
|
||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_eNB_PROC_RX,
|
|
||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_eNB_PROC_PRACH,
|
|
||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_THREAD_SYNCH,
|
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_THREAD_SYNCH,
|
||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_THREAD_RXTX0,
|
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_THREAD_RXTX0,
|
||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_THREAD_RXTX1,
|
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_THREAD_RXTX1,
|
||||||
@@ -188,9 +190,11 @@ typedef enum {
|
|||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_PDCCH_PROCEDURES,
|
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_PDCCH_PROCEDURES,
|
||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_PBCH_PROCEDURES,
|
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_PBCH_PROCEDURES,
|
||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX,
|
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX,
|
||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_RX,
|
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX1,
|
||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_RX_COMMON,
|
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_RX_COMMON,
|
||||||
|
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_RX_COMMON1,
|
||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_RX_UESPEC,
|
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_RX_UESPEC,
|
||||||
|
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_RX_UESPEC1,
|
||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_SLOT_FEP,
|
VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_SLOT_FEP,
|
||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX,
|
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX,
|
||||||
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_RX,
|
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_RX,
|
||||||
|
|||||||
@@ -23,6 +23,9 @@ eNBs =
|
|||||||
|
|
||||||
component_carriers = (
|
component_carriers = (
|
||||||
{
|
{
|
||||||
|
node_function = "eNodeB_3GPP";
|
||||||
|
node_timing = "synch_to_ext_device";
|
||||||
|
node_synch_ref = 0;
|
||||||
frame_type = "FDD";
|
frame_type = "FDD";
|
||||||
tdd_config = 3;
|
tdd_config = 3;
|
||||||
tdd_config_s = 0;
|
tdd_config_s = 0;
|
||||||
|
|||||||
@@ -1,17 +1,17 @@
|
|||||||
[*]
|
[*]
|
||||||
[*] GTKWave Analyzer v3.3.58 (w)1999-2014 BSI
|
[*] GTKWave Analyzer v3.3.58 (w)1999-2014 BSI
|
||||||
[*] Sun May 29 20:10:01 2016
|
[*] Sun Jul 24 14:21:37 2016
|
||||||
[*]
|
[*]
|
||||||
[dumpfile] "/tmp/openair_dump_eNB.vcd"
|
[dumpfile] "/tmp/openair_dump_eNB.vcd"
|
||||||
[dumpfile_mtime] "Sun May 29 20:07:25 2016"
|
[dumpfile_mtime] "Sun Jul 24 14:18:00 2016"
|
||||||
[dumpfile_size] 16398004
|
[dumpfile_size] 7104337
|
||||||
[savefile] "/home/papillon/openairinterface5g/targets/RT/USER/eNB_usrp.gtkw"
|
[savefile] "/home/papillon/openairinterface5g/targets/RT/USER/eNB_usrp.gtkw"
|
||||||
[timestart] 10806270000
|
[timestart] 10621768000
|
||||||
[size] 1535 724
|
[size] 1535 724
|
||||||
[pos] 309 0
|
[pos] 309 0
|
||||||
*-18.793451 10806918339 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
|
*-19.793451 29026062100 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
|
||||||
[sst_width] 284
|
[sst_width] 284
|
||||||
[signals_width] 254
|
[signals_width] 262
|
||||||
[sst_expanded] 1
|
[sst_expanded] 1
|
||||||
[sst_vpaned_height] 294
|
[sst_vpaned_height] 294
|
||||||
@28
|
@28
|
||||||
@@ -20,19 +20,24 @@ functions.trx_write
|
|||||||
@24
|
@24
|
||||||
variables.trx_ts[63:0]
|
variables.trx_ts[63:0]
|
||||||
variables.trx_tst[63:0]
|
variables.trx_tst[63:0]
|
||||||
variables.frame_number_TX_eNB[63:0]
|
|
||||||
variables.frame_number_RX_eNB[63:0]
|
|
||||||
variables.subframe_number_TX_eNB[63:0]
|
|
||||||
variables.subframe_number_RX_eNB[63:0]
|
|
||||||
@28
|
@28
|
||||||
functions.eNB_thread_rx0
|
functions.eNB_thread_rxtx0
|
||||||
functions.eNB_thread_tx0
|
@24
|
||||||
functions.phy_procedures_eNb_tx
|
variables.frame_number_RX0_eNB[63:0]
|
||||||
|
variables.subframe_number_RX0_eNB[63:0]
|
||||||
|
variables.frame_number_TX0_eNB[63:0]
|
||||||
|
variables.subframe_number_TX0_eNB[63:0]
|
||||||
|
@28
|
||||||
|
functions.eNB_thread_rxtx1
|
||||||
|
@24
|
||||||
|
variables.frame_number_RX1_eNB[63:0]
|
||||||
|
variables.subframe_number_RX1_eNB[63:0]
|
||||||
|
variables.frame_number_TX1_eNB[63:0]
|
||||||
|
@25
|
||||||
|
variables.subframe_number_TX1_eNB[63:0]
|
||||||
|
@28
|
||||||
functions.phy_enb_sfgen
|
functions.phy_enb_sfgen
|
||||||
@29
|
|
||||||
functions.phy_eNB_slot_fep
|
functions.phy_eNB_slot_fep
|
||||||
@28
|
|
||||||
functions.phy_procedures_eNb_rx
|
|
||||||
functions.phy_enb_prach_rx
|
functions.phy_enb_prach_rx
|
||||||
@24
|
@24
|
||||||
variables.dci_info[63:0]
|
variables.dci_info[63:0]
|
||||||
|
|||||||
+14
-15
@@ -435,6 +435,9 @@ static void* eNB_thread_rxtx( void* param ) {
|
|||||||
|
|
||||||
if (oai_exit) break;
|
if (oai_exit) break;
|
||||||
|
|
||||||
|
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX0_ENB+(proc->subframe_rx&1), proc->frame_rx );
|
||||||
|
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_RX0_ENB+(proc->subframe_rx&1), proc->subframe_rx );
|
||||||
|
|
||||||
// Common procedures
|
// Common procedures
|
||||||
phy_procedures_eNB_common_RX(PHY_vars_eNB_g[0][proc->CC_id], 0);
|
phy_procedures_eNB_common_RX(PHY_vars_eNB_g[0][proc->CC_id], 0);
|
||||||
|
|
||||||
@@ -473,8 +476,8 @@ static void* eNB_thread_rxtx( void* param ) {
|
|||||||
exit_fun("nothing to add");
|
exit_fun("nothing to add");
|
||||||
}
|
}
|
||||||
|
|
||||||
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX_ENB, proc->frame_tx );
|
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX0_ENB+(proc->subframe_tx&1), proc->frame_tx );
|
||||||
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_TX_ENB, proc->subframe_tx );
|
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_TX0_ENB+(proc->subframe_tx&1), proc->subframe_tx );
|
||||||
|
|
||||||
if (oai_exit) break;
|
if (oai_exit) break;
|
||||||
|
|
||||||
@@ -1004,6 +1007,14 @@ static void* eNB_thread_FH( void* param ) {
|
|||||||
|
|
||||||
if (oai_exit) break;
|
if (oai_exit) break;
|
||||||
|
|
||||||
|
if (subframe==9) {
|
||||||
|
subframe=0;
|
||||||
|
frame++;
|
||||||
|
frame&=1023;
|
||||||
|
} else {
|
||||||
|
subframe++;
|
||||||
|
}
|
||||||
|
|
||||||
// This case is for synchronization to another thread
|
// This case is for synchronization to another thread
|
||||||
if ((eNB->node_timing == synch_to_other) &&
|
if ((eNB->node_timing == synch_to_other) &&
|
||||||
((eNB->node_function == NGFI_RCC_IF4) ||
|
((eNB->node_function == NGFI_RCC_IF4) ||
|
||||||
@@ -1037,13 +1048,7 @@ static void* eNB_thread_FH( void* param ) {
|
|||||||
|
|
||||||
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 1 );
|
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 1 );
|
||||||
|
|
||||||
if (subframe==9) {
|
|
||||||
subframe=0;
|
|
||||||
frame++;
|
|
||||||
frame&=1023;
|
|
||||||
} else {
|
|
||||||
subframe++;
|
|
||||||
}
|
|
||||||
|
|
||||||
rxs = eNB->rfdevice.trx_read_func(&eNB->rfdevice,
|
rxs = eNB->rfdevice.trx_read_func(&eNB->rfdevice,
|
||||||
&proc->timestamp_rx,
|
&proc->timestamp_rx,
|
||||||
@@ -1073,8 +1078,6 @@ static void* eNB_thread_FH( void* param ) {
|
|||||||
//printf("timestamp_rx %lu, frame %d(%d), subframe %d(%d)\n",proc->timestamp_rx,proc->frame_rx,frame,proc->subframe_rx,subframe);
|
//printf("timestamp_rx %lu, frame %d(%d), subframe %d(%d)\n",proc->timestamp_rx,proc->frame_rx,frame,proc->subframe_rx,subframe);
|
||||||
|
|
||||||
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TS, proc->timestamp_rx&0xffffffff );
|
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TS, proc->timestamp_rx&0xffffffff );
|
||||||
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX_ENB, proc->frame_rx );
|
|
||||||
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_RX_ENB, proc->subframe_rx );
|
|
||||||
|
|
||||||
if (rxs != fp->samples_per_tti)
|
if (rxs != fp->samples_per_tti)
|
||||||
exit_fun( "problem receiving samples" );
|
exit_fun( "problem receiving samples" );
|
||||||
@@ -1107,8 +1110,6 @@ static void* eNB_thread_FH( void* param ) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TS, proc->timestamp_rx&0xffffffff );
|
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TS, proc->timestamp_rx&0xffffffff );
|
||||||
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX_ENB, proc->frame_rx );
|
|
||||||
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_RX_ENB, proc->subframe_rx );
|
|
||||||
|
|
||||||
} // eNodeB_3GPP_BBU && node_timing == synch_to_ext_device
|
} // eNodeB_3GPP_BBU && node_timing == synch_to_ext_device
|
||||||
else if ((eNB->node_timing == synch_to_ext_device) &&
|
else if ((eNB->node_timing == synch_to_ext_device) &&
|
||||||
@@ -1150,8 +1151,6 @@ static void* eNB_thread_FH( void* param ) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TS, proc->timestamp_rx&0xffffffff );
|
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TS, proc->timestamp_rx&0xffffffff );
|
||||||
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX_ENB, proc->frame_rx );
|
|
||||||
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_RX_ENB, proc->subframe_rx );
|
|
||||||
|
|
||||||
} // node_timing == synch_to_externs, node_function = NGFI_IF4
|
} // node_timing == synch_to_externs, node_function = NGFI_IF4
|
||||||
else { // should not get here
|
else { // should not get here
|
||||||
|
|||||||
@@ -526,6 +526,7 @@ static void *scope_thread(void *arg)
|
|||||||
for(UE_id=0; UE_id<NUMBER_OF_UE_MAX; UE_id++) {
|
for(UE_id=0; UE_id<NUMBER_OF_UE_MAX; UE_id++) {
|
||||||
for(CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
|
for(CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
|
||||||
if ((PHY_vars_eNB_g[0][CC_id]->dlsch[UE_id][0]->rnti>0) && (ue_cnt<scope_enb_num_ue)) {
|
if ((PHY_vars_eNB_g[0][CC_id]->dlsch[UE_id][0]->rnti>0) && (ue_cnt<scope_enb_num_ue)) {
|
||||||
|
//if ((ue_cnt<scope_enb_num_ue)) {
|
||||||
phy_scope_eNB(form_enb[CC_id][ue_cnt],
|
phy_scope_eNB(form_enb[CC_id][ue_cnt],
|
||||||
PHY_vars_eNB_g[0][CC_id],
|
PHY_vars_eNB_g[0][CC_id],
|
||||||
UE_id);
|
UE_id);
|
||||||
|
|||||||
Reference in New Issue
Block a user