Transport init

openair1/PHY/INIT/nr_init.c

@@ -38,6 +38,7 @@
 
 extern uint32_t from_earfcn(int eutra_bandP,uint32_t dl_earfcn);
 extern int32_t get_uldl_offset(int eutra_bandP);
+extern void init_nr_transport(PHY_VARS_gNB *gNB);
 
 int l1_north_init_gNB() {
 
@@ -152,6 +153,8 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
   }
    
    nr_init_pdsch_dmrs(gNB, cfg->sch_config.physical_cell_id.value);
+  /// Transport init necessary for NR synchro
+  init_nr_transport(gNB);
    
 /*
   lte_gold(fp,gNB->lte_gold_table,fp->Nid_cell);

openair1/PHY/NR_TRANSPORT/nr_dci_tools.c

@@ -533,6 +533,6 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
   LOG_I(PHY, "DCI type %d payload (size %d) generated on candidate %d\n", dci_alloc->pdcch_params.dci_format, dci_alloc->size, cand_idx);
 
   /// DLSCH struct
-  memcpy((void*)&dlsch->harq_processes[dci_alloc->harq_pid]->dlsch_pdu, (void*)dlsch_pdu, sizeof(nfapi_nr_dl_config_dlsch_pdu));
+  memcpy((void*)&harq[dci_alloc->harq_pid]->dlsch_pdu, (void*)dlsch_pdu, sizeof(nfapi_nr_dl_config_dlsch_pdu));
 
 }

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -196,7 +196,7 @@ void phy_procedures_gNB_TX(PHY_VARS_gNB *gNB,
                           AMP, *fp, *cfg);
       if (num_pdsch_rnti) {
         LOG_I(PHY, "PDSCH generation started (%d)\n", num_pdsch_rnti);
-        nr_generate_pdsch(*(gNB->dlsch[0][0]),
+        nr_generate_pdsch(*gNB->dlsch[0][0],
                           gNB->pdcch_vars,
                           gNB->nr_gold_pdsch_dmrs[slot_idx],
                           gNB->common_vars.txdataF,

targets/RT/USER/nr-gnb.c

@@ -883,8 +883,6 @@ void init_eNB_afterRU(void) {
       AssertFatal(gNB->gNB_config.rf_config.tx_antenna_ports.value >0,
 		  "inst %d, CC_id %d : nb_antennas_rx %d\n",inst,CC_id,gNB->gNB_config.rf_config.tx_antenna_ports.value);
       LOG_I(PHY,"inst %d, CC_id %d : nb_antennas_rx %d\n",inst,CC_id,gNB->gNB_config.rf_config.tx_antenna_ports.value);
-/// Transport init necessary for NR synchro
-      init_nr_transport(gNB);
       //init_precoding_weights(RC.gNB[inst][CC_id]);
     }
     init_gNB_proc(inst);