unitary simulation compilation errors resolved

openair1/PHY/INIT/nr_init.c

@@ -285,9 +285,8 @@ void phy_free_nr_gNB(PHY_VARS_gNB *gNB) {
   LTE_eNB_SRS *const srs_vars        = gNB->srs_vars;
   LTE_eNB_PRACH *const prach_vars    = &gNB->prach_vars;*/
   uint32_t ***pdcch_dmrs             = gNB->nr_gold_pdcch_dmrs;
-  int i, UE_id;
 
-  for (i = 0; i < 15; i++) {
+  for (int i = 0; i < 15; i++) {
     free_and_zero(common_vars->txdataF[i]);
     /* rxdataF[i] is not allocated -> don't free */
   }

openair1/SCHED_NR/fapi_nr_l1.c

@@ -150,7 +150,7 @@ void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO){
         uint16_t invalid_pdu = pdu_index == -1;
         uint8_t *sdu = invalid_pdu ? NULL : pdu_index >= tx_pdus ? NULL : TX_req->tx_request_body.tx_pdu_list[pdu_index].segments[0].segment_data;
 
-        AssertFatal(sdu!=NULL,"sdu is null, pdu_index %d, tx_pdus %d\n");
+        AssertFatal(sdu!=NULL,"sdu is null, pdu_index %d, tx_pdus %d\n",pdu_index,tx_pdus);
         handle_nr_nfapi_dlsch_pdu(gNB,frame,slot,&dl_config_pdu->dlsch_pdu, sdu);
         do_oai=1;
       }

openair1/SIMULATION/NR_PHY/dlschsim.c

@@ -149,7 +149,7 @@ int main(int argc, char **argv) {
 	uint16_t N_RB_DL = 106, mu = 1;
 	//unsigned char frame_type = 0;
 	unsigned char pbch_phase = 0;
-	int frame = 0, subframe = 0;
+	int frame = 0, slot = 0;
 	int frame_length_complex_samples;
 	//int frame_length_complex_samples_no_prefix;
 	NR_DL_FRAME_PARMS *frame_parms;
@@ -528,7 +528,7 @@ int main(int argc, char **argv) {
 	//printf("crc32: [0]->0x%08x\n",crc24c(test_input, 32));
 	// generate signal
 	if (input_fd == NULL) {
-		nr_dlsch_encoding(test_input, subframe, dlsch, frame_parms);
+		nr_dlsch_encoding(test_input, frame, slot, dlsch, frame_parms);
 	}
 
 	for (SNR = snr0; SNR < snr1; SNR += snr_step) {
@@ -583,7 +583,7 @@ int main(int argc, char **argv) {
 #endif
 			ret = nr_dlsch_decoding(UE, channel_output_fixed, &UE->frame_parms,
 					dlsch0_ue, dlsch0_ue->harq_processes[0], frame, nb_symb_sch,
-					subframe, harq_pid, is_crnti, llr8_flag);
+					slot,harq_pid, is_crnti, llr8_flag);
 
 			if (ret > dlsch0_ue->max_ldpc_iterations)
 				n_errors++;

openair1/SIMULATION/NR_PHY/dlsim.c

@@ -177,7 +177,6 @@ int main(int argc, char **argv)
   int slot_length_complex_samples_no_prefix;
   NR_DL_FRAME_PARMS *frame_parms;
   nfapi_nr_config_request_t *gNB_config;
-  gNB_L1_rxtx_proc_t gNB_proc;
   UE_nr_rxtx_proc_t UE_proc;
   NR_Sched_Rsp_t Sched_INFO;
   gNB_MAC_INST *gNB_mac;
@@ -554,9 +553,7 @@ int main(int argc, char **argv)
     Sched_INFO.TX_req    = &gNB_mac->TX_req[0];
     nr_schedule_response(&Sched_INFO);
 
-    gNB_proc.frame_tx = frame;
-    gNB_proc.slot_tx  = slot;
-    phy_procedures_gNB_TX(gNB,&gNB_proc,0);
+    phy_procedures_gNB_TX(gNB,frame,slot,0);
     
     //nr_common_signal_procedures (gNB,frame,subframe);
 

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c

@@ -163,7 +163,7 @@ void nr_schedule_css_dlsch_phytest(module_id_t   module_idP,
   TX_req->pdu_index = nr_mac->pdu_index[CC_id]++;
   TX_req->num_segments = 1;
   TX_req->segments[0].segment_length = 8;
-  TX_req->segments[0].segment_data   = cc[CC_id].RAR_pdu.payload[0];
+  TX_req->segments[0].segment_data   = &cc[CC_id].RAR_pdu.payload[0];
   nr_mac->TX_req[CC_id].tx_request_body.number_of_pdus++;
   nr_mac->TX_req[CC_id].sfn_sf = sfn_sf;
   nr_mac->TX_req[CC_id].tx_request_body.tl.tag = NFAPI_TX_REQUEST_BODY_TAG;
@@ -296,7 +296,7 @@ void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
   TX_req->pdu_length = dlsch_pdu_rel15->transport_block_size;
   TX_req->pdu_index = nr_mac->pdu_index[CC_id]++;
   TX_req->num_segments = 1;
-  TX_req->segments[0].segment_data   = nr_mac->UE_list.DLSCH_pdu[CC_id][0][0].payload;
+  TX_req->segments[0].segment_data   = nr_mac->UE_list.DLSCH_pdu[CC_id][0][0].payload[0];
 
   TX_req->segments[0].segment_length = dlsch_pdu_rel15->transport_block_size+2;
   nr_mac->TX_req[CC_id].tx_request_body.number_of_pdus++;