Rewrite nr_generate_dci_top() without msgTx and shorter

doc/SW_archi.md

@@ -177,7 +177,7 @@ it would be better to call **NR_UL_indication()** now instead of before (on prev
 * nr_common_signal_procedures()  
 generate common signals
 {: .func4}
-* nr_generate_dci_top()
+* nr_generate_dci()
 generate DCI: the scheduling informtion for each UE in both DL and UL
 {: .func4}
 * nr_generate_pdsch()  

openair1/PHY/NR_TRANSPORT/nr_dci.c

@@ -51,7 +51,7 @@ static void nr_pdcch_scrambling(uint32_t *in, uint32_t size, uint32_t Nid, uint3
     out[i] = in[i] ^ seq[i];
 }
 
-static void nr_generate_dci(PHY_VARS_gNB *gNB,
+void nr_generate_dci(PHY_VARS_gNB *gNB,
                      const nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu_rel15,
                      int txdataF_offset,
                      NR_DL_FRAME_PARMS *frame_parms,
@@ -237,16 +237,3 @@ static void nr_generate_dci(PHY_VARS_gNB *gNB,
           *(unsigned long long *)dci_pdu->Payload);
   } // for (int d=0;d<pdcch_pdu_rel15->numDlDci;d++)
 }
-
-void nr_generate_dci_top(processingData_L1tx_t *msgTx, int slot, int txdataF_offset)
-{
-  PHY_VARS_gNB *gNB = msgTx->gNB;
-  NR_DL_FRAME_PARMS *frame_parms = &gNB->frame_parms;
-  start_meas(&gNB->dci_generation_stats);
-  for (int i = 0; i < msgTx->num_ul_pdcch; i++)
-    nr_generate_dci(msgTx->gNB, &msgTx->ul_pdcch_pdu[i].pdcch_pdu_rel15, txdataF_offset, frame_parms, slot);
-  for (int i = 0; i < msgTx->num_dl_pdcch; i++)
-    nr_generate_dci(msgTx->gNB, &msgTx->pdcch_pdu[i].pdcch_pdu_rel15, txdataF_offset, frame_parms, slot);
-  stop_meas(&gNB->dci_generation_stats);
-}
-

openair1/PHY/NR_TRANSPORT/nr_dci.h

@@ -26,7 +26,11 @@
 #include "PHY/NR_REFSIG/nr_refsig.h"
 #include "nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h"
 
-void nr_generate_dci_top(processingData_L1tx_t *msgTx, int slot, int txdataF_offset);
+void nr_generate_dci(PHY_VARS_gNB *gNB,
+                     const nfapi_nr_dl_tti_pdcch_pdu_rel15_t *pdcch_pdu_rel15,
+                     int txdataF_offset,
+                     NR_DL_FRAME_PARMS *frame_parms,
+                     int slot);
 
 int16_t find_nr_pdcch(int frame,int slot, PHY_VARS_gNB *gNB,find_type_t type);
 

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -255,12 +255,17 @@ void phy_procedures_gNB_TX(processingData_L1tx_t *msgTx,
   int num_pdcch_pdus = msgTx->num_ul_pdcch + msgTx->num_dl_pdcch;
 
   if (num_pdcch_pdus > 0) {
-    LOG_D(PHY, "[gNB %d] Frame %d slot %d Calling nr_generate_dci_top (number of UL/DL PDCCH PDUs %d/%d)\n",
+    LOG_D(PHY, "[gNB %d] Frame %d slot %d Calling nr_generate_dci() (number of UL/DL PDCCH PDUs %d/%d)\n",
 	  gNB->Mod_id, frame, slot, msgTx->num_ul_pdcch, msgTx->num_dl_pdcch);
   
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_gNB_PDCCH_TX,1);
 
-    nr_generate_dci_top(msgTx, slot, txdataF_offset);
+    start_meas(&gNB->dci_generation_stats);
+    for (int i = 0; i < msgTx->num_dl_pdcch; ++i)
+      nr_generate_dci(gNB, &msgTx->pdcch_pdu[i].pdcch_pdu_rel15, txdataF_offset, &gNB->frame_parms, slot);
+    for (int i = 0; i < msgTx->num_ul_pdcch; ++i)
+      nr_generate_dci(gNB, &msgTx->ul_pdcch_pdu[i].pdcch_pdu_rel15, txdataF_offset, &gNB->frame_parms, slot);
+    stop_meas(&gNB->dci_generation_stats);
 
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_gNB_PDCCH_TX,0);
   }