Merge branch 'nr_pdcch' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr_pdcch

cmake_targets/CMakeLists.txt

@@ -2323,6 +2323,7 @@ add_executable(nr-softmodem-nos1
   ${OPENAIR_TARGETS}/RT/USER/nr-softmodem.c
   ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
   ${OPENAIR_TARGETS}/COMMON/create_tasks.c
+  ${OPENAIR_TARGETS}/COMMON/create_nr_tasks.c
   ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
   ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
   ${OPENAIR2_DIR}/RRC/NAS/rb_config.c

openair1/PHY/INIT/nr_init_ue.c

@@ -658,7 +658,7 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
   printf("Initializing UE vars (abstraction %"PRIu8") for eNB TXant %"PRIu8", UE RXant %"PRIu8"\n",abstraction_flag,fp->nb_antennas_tx,fp->nb_antennas_rx);
   //LOG_D(PHY,"[MSC_NEW][FRAME 00000][PHY_UE][MOD %02u][]\n", ue->Mod_id+NB_eNB_INST);
   
-  //phy_init_nr_top(&ue->frame_parms);
+  phy_init_nr_top(ue);
   //nr_init_frame_parms_ue(&ue->frame_parms);
 
   // many memory allocation sizes are hard coded

openair1/PHY/NR_TRANSPORT/nr_dci.c

@@ -35,6 +35,7 @@
 //#define DEBUG_PDCCH_DMRS
 //#define DEBUG_DCI
 //#define DEBUG_POLAR_PARAMS
+#define PDCCH_TEST_POLAR_TEMP_FIX
 
 extern short nr_mod_table[NR_MOD_TABLE_SIZE_SHORT];
 
@@ -205,15 +206,21 @@ uint8_t nr_generate_dci_top(NR_gNB_PDCCH pdcch_vars,
   // CRC attachment + Scrambling + Channel coding + Rate matching
   uint32_t encoder_output[NR_MAX_DCI_SIZE_DWORD];
   uint16_t n_RNTI = (pdcch_params.search_space_type == NFAPI_NR_SEARCH_SPACE_TYPE_UE_SPECIFIC)? pdcch_params.rnti : 0;
+#ifdef PDCCH_TEST_POLAR_TEMP_FIX
+  t_nrPolar_paramsPtr currentPtr = NULL;//, polarParams = NULL;
+  nr_polar_init(&currentPtr, NR_POLAR_DCI_MESSAGE_TYPE, dci_alloc.size, dci_alloc.L);
+//  t_nrPolar_paramsPtr currentPtr = nr_polar_params(*nrPolar_params, NR_POLAR_DCI_MESSAGE_TYPE, dci_alloc.size, dci_alloc.L);
+#else 
   nr_polar_init(nrPolar_params, NR_POLAR_DCI_MESSAGE_TYPE, dci_alloc.size, dci_alloc.L);
   t_nrPolar_paramsPtr currentPtr = nr_polar_params(*nrPolar_params, NR_POLAR_DCI_MESSAGE_TYPE, dci_alloc.size, dci_alloc.L);
+#endif
   polar_encoder_dci(dci_alloc.dci_pdu, encoder_output, currentPtr, n_RNTI);
 
 #ifdef DEBUG_POLAR_PARAMS
-  /*printf("DCI PDU: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
+  printf("DCI PDU: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
     		  dci_alloc.dci_pdu[0], dci_alloc.dci_pdu[1], dci_alloc.dci_pdu[2], dci_alloc.dci_pdu[3]);
   printf("Encoded Payload: [0]->0x%08x \t [1]->0x%08x \t [2]->0x%08x \t [3]->0x%08x\n",
-		  encoder_output[0], encoder_output[1], encoder_output[2], encoder_output[3]);*/
+		  encoder_output[0], encoder_output[1], encoder_output[2], encoder_output[3]);
 #endif
 
     // QPSK modulation

targets/RT/USER/nr-uesoftmodem.c

@@ -1001,7 +1001,7 @@ int main( int argc, char **argv ) {
     nr_init_frame_parms_ue(frame_parms[CC_id]);
     printf("after init frame_parms %d\n",frame_parms[CC_id]->ofdm_symbol_size);
     //   phy_init_top(frame_parms[CC_id]);
-    phy_init_nr_top(frame_parms[CC_id]);
+    //phy_init_nr_top(frame_parms[CC_id]);
   }