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

fixing build errors

Browse Source
This commit is contained in:
Sakthivel Velumani
2021-03-05 16:51:09 +01:00
parent b7dddf0849
commit 3fe2628df0
6 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake_targets/phy_simulators/CMakeLists.txt
+1 -1
View File
@@ -16,5 +16,5 @@ set ( UE_DEBUG_TRACE False )
set ( UE_TIMING_TRACE False ) set ( UE_TIMING_TRACE False )
set ( USRP_REC_PLAY False ) set ( USRP_REC_PLAY False )
set ( SKIP_SHARED_LIB_FLAG False ) set ( SKIP_SHARED_LIB_FLAG False )
set ( PHYSIM True) set ( ITTI_SIM False )
include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt) include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)
executables/nr-gnb.c
+2
View File
@@ -85,6 +85,7 @@
#include "T.h" #include "T.h"
#include "nfapi/oai_integration/vendor_ext.h" #include "nfapi/oai_integration/vendor_ext.h"
#include "executables/softmodem-common.h"
//#define DEBUG_THREADS 1 //#define DEBUG_THREADS 1
//#define USRP_DEBUG 1 //#define USRP_DEBUG 1
@@ -1070,6 +1071,7 @@ void init_gNB(int single_thread_flag,int wait_for_sync) {
gNB->UL_INFO.cqi_ind.cqi_raw_pdu_list = gNB->cqi_raw_pdu_list;*/ gNB->UL_INFO.cqi_ind.cqi_raw_pdu_list = gNB->cqi_raw_pdu_list;*/
gNB->prach_energy_counter = 0; gNB->prach_energy_counter = 0;
gNB->fd_interpolation = get_softmodem_params()->fd_interpolation;
} }
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
+2 -2
View File
@@ -176,7 +176,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
#endif #endif
//if ((gNB->frame_parms.N_RB_UL&1)==0) { //if ((gNB->frame_parms.N_RB_UL&1)==0) {
if (pusch_pdu->dmrs_config_type == pusch_dmrs_type1 && get_softmodem_params()->fd_interpolation == 1){ if (pusch_pdu->dmrs_config_type == pusch_dmrs_type1 && gNB->fd_interpolation == 1){
// Treat first 2 pilots specially (left edge) // Treat first 2 pilots specially (left edge)
ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15); ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
@@ -384,7 +384,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
} }
#endif #endif
} }
else if (pusch_pdu->dmrs_config_type == pusch_dmrs_type2 && get_softmodem_params()->fd_interpolation == 1) { //pusch_dmrs_type2 |p_r,p_l,d,d,d,d,p_r,p_l,d,d,d,d| else if (pusch_pdu->dmrs_config_type == pusch_dmrs_type2 && gNB->fd_interpolation == 1) { //pusch_dmrs_type2 |p_r,p_l,d,d,d,d,p_r,p_l,d,d,d,d|
// Treat first DMRS specially (left edge) // Treat first DMRS specially (left edge)
openair1/PHY/defs_gNB.h
+2
View File
@@ -785,6 +785,8 @@ typedef struct PHY_VARS_gNB_s {
int **dl_precoder_SgNB[3]; int **dl_precoder_SgNB[3];
char log2_maxp; /// holds the maximum channel/precoder coefficient char log2_maxp; /// holds the maximum channel/precoder coefficient
int fd_interpolation;
/// if ==0 enables phy only test mode /// if ==0 enables phy only test mode
int mac_enabled; int mac_enabled;
/// counter to average prach energh over first 100 prach opportunities /// counter to average prach energh over first 100 prach opportunities
openair1/SIMULATION/NR_PHY/ulschsim.c
+1 -1
View File
@@ -504,7 +504,7 @@ int main(int argc, char **argv)
unsigned int G = nr_get_G(nb_rb, nb_symb_sch, nb_re_dmrs, length_dmrs, mod_order, Nl); unsigned int G = nr_get_G(nb_rb, nb_symb_sch, nb_re_dmrs, length_dmrs, mod_order, Nl);
if (input_fd == NULL) { if (input_fd == NULL) {
nr_ulsch_encoding(ue, ulsch_ue, frame_parms, harq_pid, G); nr_ulsch_encoding(UE, ulsch_ue, frame_parms, harq_pid, G);
} }
printf("\n"); printf("\n");
openair1/SIMULATION/NR_PHY/ulsim.c
-1
View File
@@ -921,7 +921,6 @@ int main(int argc, char **argv)
crc_status = 1; crc_status = 1;
errors_decoding = 0; errors_decoding = 0;
memset((void*)roundStats,0,50*sizeof(roundStats[0])); memset((void*)roundStats,0,50*sizeof(roundStats[0]));
ulsch_ue[0]->harq_processes[harq_pid]->ndi = 1;
while (round<max_rounds && crc_status) { while (round<max_rounds && crc_status) {
round_trials[round]++; round_trials[round]++;
ulsch_ue[0]->harq_processes[harq_pid]->round = round; ulsch_ue[0]->harq_processes[harq_pid]->round = round;