maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverting changes to lte_phy_scope.c + commenting out call to phy_scope_eNB in nr-softmodem. The function phy_scope_gNB does not exist yet.

Browse Source
This commit is contained in:
Florian Kaltenberger
2019-02-21 09:54:08 +01:00
parent 4c9c6f68fa
commit c06a639065
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/TOOLS/lte_phy_scope.c
+3 -3
View File
@@ -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, 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 UE_id)
{ {
int eNB_id = 0; int eNB_id = 0;
int i,i2,arx,atx,ind,k; 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; 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_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 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 time[FRAME_LENGTH_COMPLEX_SAMPLES];
float time2[2048]; float time2[2048];
float freq[nsymb_ce*nb_antennas_rx*nb_antennas_tx]; 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; uint32_t total_dlsch_bitrate = phy_vars_enb->total_dlsch_bitrate;
int coded_bits_per_codeword = 0; 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 uint8_t harq_pid; // in TDD config 3 it is sf-2, i.e., can be 0,1,2
openair1/PHY/TOOLS/lte_phy_scope.h
+2 -2
View File
@@ -25,7 +25,7 @@
#define FD_lte_scope_h_ #define FD_lte_scope_h_
#include <forms.h> #include <forms.h>
#include "PHY/defs_gNB.h" #include "PHY/defs_eNB.h"
#include "PHY/defs_UE.h" #include "PHY/defs_UE.h"
#include "PHY/impl_defs_top.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 ); FD_lte_phy_scope_ue * create_lte_phy_scope_ue( void );
void phy_scope_eNB(FD_lte_phy_scope_enb *form, 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); int UE_id);
void phy_scope_UE(FD_lte_phy_scope_ue *form, void phy_scope_UE(FD_lte_phy_scope_ue *form,
targets/RT/USER/nr-softmodem.c
+4 -1
View File
@@ -429,9 +429,12 @@ 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 ((ue_cnt<scope_enb_num_ue)) { if ((ue_cnt<scope_enb_num_ue)) {
phy_scope_eNB(form_enb[CC_id][ue_cnt], /*
//this function needs to be written
phy_scope_gNB(form_enb[CC_id][ue_cnt],
RC.gNB[0][CC_id], RC.gNB[0][CC_id],
UE_id); UE_id);
*/
ue_cnt++; ue_cnt++;
} }
} }
targets/RT/USER/nr-ue.c
+1 -1
View File
@@ -980,7 +980,7 @@ void *UE_thread(void *arg) {
if ( getenv("RFSIMULATOR") != 0) { if ( getenv("RFSIMULATOR") != 0) {
LOG_E(PHY,"AbsSubframe %d.%d TTI SET rx_off_diff to %d rx_offset %d \n", LOG_E(PHY,"AbsSubframe %d.%d TTI SET rx_off_diff to %d rx_offset %d \n",
proc->frame_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; //UE->rx_offset_diff=0;
} }
readBlockSize=UE->frame_parms.samples_per_slot - readBlockSize=UE->frame_parms.samples_per_slot -