Merge branch 'NR_MAC_TCI_UCI_GlobalEdge' of...

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

openair1/PHY/NR_TRANSPORT/nr_prach.c

@@ -184,8 +184,10 @@ void rx_nr_prach_ru(RU_t *ru,
   for (int aa=0; aa<ru->nb_rx; aa++){ 
     if (prach_sequence_length == 0) slot2=(slot/fp->slots_per_subframe)*fp->slots_per_subframe; 
     prach[aa] = (int16_t*)&ru->common.rxdata[aa][(slot2*fp->get_samples_per_slot(slot,fp))-ru->N_TA_offset];
+    LOG_I(PHY,"GES printing received signal %d\n",*prach[aa]);
   } 
 
+
   int dftlen=0;
   int mu = fp->numerology_index;
   int Ncp = 0;
@@ -286,7 +288,10 @@ void rx_nr_prach_ru(RU_t *ru,
   if (k<0) k+=(fp->ofdm_symbol_size);
   
   k*=K;
-  k+=kbar; 
+  k+=kbar;
+
+	LOG_I(PHY,"GES printing frequency domain k value %d fp->N_RB_UL %d n_ra_prb %d kbar %d\n",k,fp->N_RB_UL,n_ra_prb,kbar);
+	 
   int reps=1;
 
   for (int aa=0; aa<ru->nb_rx; aa++) {
@@ -355,6 +360,7 @@ void rx_nr_prach_ru(RU_t *ru,
       } else { // threequarter sampling
 	//	40 MHz @ 46.08 Ms/s
 	prach2 = prach[aa] + (3*Ncp); // 46.08 is 1.5 * 30.72, times 2 for I/Q
+	LOG_I(PHY,"GES printing prach2 %p prach[aa] %p Ncp %d\n",prach2,prach[aa],Ncp);
 	if (prach_sequence_length == 0) {
 	  AssertFatal(fp->N_RB_UL <= 107,"cannot do 108..136 PRBs with 3/4 sampling\n");
 	  if (prachFormat == 0 || prachFormat == 1 || prachFormat == 2) {
@@ -524,7 +530,7 @@ void rx_nr_prach_ru(RU_t *ru,
     }
 
     //Coherent combining of PRACH repetitions (assumes channel does not change, to be revisted for "long" PRACH)
-    LOG_I(PHY,"Doing PRACH combining of %d reptitions N_ZC %d\n",reps,N_ZC);
+    LOG_I(PHY,"Doing PRACH combining of %d reptitions N_ZC %d,mu %d prachFormat %d prach2 %p content %d\n",reps,N_ZC,mu,prachFormat,prach2,*prach2);
     int16_t rxsigF_tmp[N_ZC<<1];
     //    if (k+N_ZC > dftlen) { // PRACH signal is split around DC 
     int16_t *rxsigF2=rxsigF[aa];
@@ -534,6 +540,7 @@ void rx_nr_prach_ru(RU_t *ru,
       if (k2==(dftlen<<1)) k2=0;
       rxsigF_tmp[j] = rxsigF2[k2];
       for (int i=1;i<reps;i++) rxsigF_tmp[j] += rxsigF2[k2+(i*dftlen<<1)];
+			LOG_I(PHY,"GES printing %d rxsigF_tmp[j] %d\n",j,rxsigF_tmp[j]);
     }
     memcpy((void*)rxsigF2,(void *)rxsigF_tmp,N_ZC<<2);
 		LOG_I(PHY,"GES printing rxsigF2 %d\n",*rxsigF2);

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -1561,7 +1561,7 @@ void nr_update_pucch_scheduling(int Mod_idP,
     if (curr_pucch->dai_c<MAX_ACK_BITS) {
       curr_pucch->frame = frameP;
       curr_pucch->dai_c++;
-      curr_pucch->resource_indicator = 0; // in phytest with only 1 UE we are using just the 1st resource
+      curr_pucch->resource_indicator = 4;//0; // in phytest with only 1 UE we are using just the 1st resource
       // first pucch occasion in first UL or MIXED slot
       first_ul_slot_tdd = scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofDownlinkSlots;
       i = 0;

openair2/NR_PHY_INTERFACE/NR_IF_Module.c

@@ -125,11 +125,14 @@ void extract_pucch_csi_report ( NR_CSI_MeasConfig_t *csi_MeasConfig,
     if (csi_MeasConfig->csi_ReportConfigToAddModList->list.array[csi_report_id]->reportConfigType.present == NR_CSI_ReportConfig__reportConfigType_PR_periodic) {
       //considering 30khz scs and
       //Has to implement according to reportSlotConfig type
+      LOG_I(PHY,"SFN/SF:%d%d \n", frame,slot);
       if (((NR_SubcarrierSpacing_kHz30 == scs) && 
-		      (0 == ((frame*20) + slot) % csi_MeasConfig->csi_ReportConfigToAddModList->list.array[csi_report_id]->reportConfigType.choice.periodic->reportSlotConfig.choice.slots320))
+		      (0 == ((frame*20) + (slot+1)) % csi_MeasConfig->csi_ReportConfigToAddModList->list.array[csi_report_id]->reportConfigType.choice.periodic->reportSlotConfig.choice.slots320))
 		      ||((NR_SubcarrierSpacing_kHz120 == scs)&&
-			      (0 == ((frame*80) + slot) % csi_MeasConfig->csi_ReportConfigToAddModList->list.array[csi_report_id]->reportConfigType.choice.periodic->reportSlotConfig.choice.slots320))){
+			      (0 == ((frame*80) + (slot+1)) % csi_MeasConfig->csi_ReportConfigToAddModList->list.array[csi_report_id]->reportConfigType.choice.periodic->reportSlotConfig.choice.slots320))){
         reportQuantity_type = csi_MeasConfig->csi_ReportConfigToAddModList->list.array[csi_report_id]->reportQuantity.present;
+        LOG_I(PHY,"SFN/SF:%d%d reportQuantity type = %d\n",
+              frame,slot,reportQuantity_type);
       }
     }
   }
@@ -374,6 +377,9 @@ void handle_nr_uci(NR_UL_IND_t *UL_info, NR_UE_sched_ctrl_t *sched_ctrl) {
           int bwp_id =1;
           NR_BWP_Uplink_t *ubwp=RC.nrmac[Mod_idP]->UE_list.secondaryCellGroup[UE_id]->spCellConfig->spCellConfigDedicated->uplinkConfig->uplinkBWP_ToAddModList->list.array[bwp_id-1];
           NR_SubcarrierSpacing_t scs=ubwp->bwp_Common->genericParameters.subcarrierSpacing;
+          LOG_I(PHY,"SFN/SF:%d%d scs %d \n",
+            UL_info->frame,UL_info->slot,
+            scs);
           //API to parse the csi report and store it into sched_ctrl
           extract_pucch_csi_report (csi_MeasConfig, uci_pdu, sched_ctrl,UL_info->frame, UL_info->slot, scs);
         }

openair2/RRC/NR/rrc_gNB_reconfig.c

@@ -157,7 +157,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
   secondaryCellGroup->spCellConfig->reconfigurationWithSync->rach_ConfigDedicated->choice.uplink->cfra->resources.choice.ssb = calloc(1,sizeof(struct NR_CFRA__resources__ssb));
   secondaryCellGroup->spCellConfig->reconfigurationWithSync->rach_ConfigDedicated->choice.uplink->cfra->resources.choice.ssb->ra_ssb_OccasionMaskIndex = 0;
   struct NR_CFRA_SSB_Resource *ssbElem[8];
-  for(int i = 0; i < 1; i++) {
+  for(int i = 0; i < 8; i++) {
   ssbElem[i] = calloc(1,sizeof(struct NR_CFRA_SSB_Resource));
   ssbElem[i]->ssb = i;
   ssbElem[i]->ra_PreambleIndex = 63;