diff --git a/openair1/PHY/TOOLS/lte_phy_scope.c b/openair1/PHY/TOOLS/lte_phy_scope.c index d6f18ef3df..9f2ec54744 100644 --- a/openair1/PHY/TOOLS/lte_phy_scope.c +++ b/openair1/PHY/TOOLS/lte_phy_scope.c @@ -151,12 +151,12 @@ FD_lte_phy_scope_enb *create_lte_phy_scope_enb( void ) } void phy_scope_eNB(FD_lte_phy_scope_enb *form, - PHY_VARS_gNB *phy_vars_enb, + PHY_VARS_eNB *phy_vars_enb, int UE_id) { int eNB_id = 0; int i,i2,arx,atx,ind,k; - NR_DL_FRAME_PARMS *frame_parms = &phy_vars_enb->frame_parms; + LTE_DL_FRAME_PARMS *frame_parms = &phy_vars_enb->frame_parms; int nsymb_ce = 12*frame_parms->N_RB_UL*frame_parms->symbols_per_tti; uint8_t nb_antennas_rx = frame_parms->nb_antennas_rx; uint8_t nb_antennas_tx = 1; // frame_parms->nb_antennas_tx; // in LTE Rel. 8 and 9 only a single transmit antenna is assumed at the UE @@ -178,7 +178,7 @@ void phy_scope_eNB(FD_lte_phy_scope_enb *form, float time[FRAME_LENGTH_COMPLEX_SAMPLES]; float time2[2048]; float freq[nsymb_ce*nb_antennas_rx*nb_antennas_tx]; - int frame = phy_vars_enb->proc.L1_proc_tx.frame_tx; + int frame = phy_vars_enb->proc.proc_rxtx[0].frame_tx; uint32_t total_dlsch_bitrate = phy_vars_enb->total_dlsch_bitrate; int coded_bits_per_codeword = 0; uint8_t harq_pid; // in TDD config 3 it is sf-2, i.e., can be 0,1,2 diff --git a/openair1/PHY/TOOLS/lte_phy_scope.h b/openair1/PHY/TOOLS/lte_phy_scope.h index d6990db8ae..af9858ebad 100644 --- a/openair1/PHY/TOOLS/lte_phy_scope.h +++ b/openair1/PHY/TOOLS/lte_phy_scope.h @@ -25,7 +25,7 @@ #define FD_lte_scope_h_ #include -#include "PHY/defs_gNB.h" +#include "PHY/defs_eNB.h" #include "PHY/defs_UE.h" #include "PHY/impl_defs_top.h" @@ -66,7 +66,7 @@ FD_lte_phy_scope_enb * create_lte_phy_scope_enb( void ); FD_lte_phy_scope_ue * create_lte_phy_scope_ue( void ); void phy_scope_eNB(FD_lte_phy_scope_enb *form, - PHY_VARS_gNB *phy_vars_gnb, + PHY_VARS_eNB *phy_vars_enb, int UE_id); void phy_scope_UE(FD_lte_phy_scope_ue *form, diff --git a/targets/RT/USER/nr-softmodem.c b/targets/RT/USER/nr-softmodem.c index 3bc9bf49d9..5561258694 100644 --- a/targets/RT/USER/nr-softmodem.c +++ b/targets/RT/USER/nr-softmodem.c @@ -429,9 +429,12 @@ static void *scope_thread(void *arg) { for(UE_id=0; UE_idframe_rx,subframe_nr,UE->rx_offset_diff,UE->rx_offset); + proc->frame_rx,slot_nr,UE->rx_offset_diff,UE->rx_offset); //UE->rx_offset_diff=0; } readBlockSize=UE->frame_parms.samples_per_slot -