finalizing deltaMCS implementation

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

@@ -69,8 +69,6 @@ int compute_delta_tf(int tbs_bits,
   // if the PUSCH transmission is over more than one layer delta_tf = 0
   if(deltaMCS == NULL || n_layers>1)
     return 0;
-  else
-    AssertFatal(1==0,"Compute DeltaTF not yet fully supported\n");
 
   const int n_re = (NR_NB_SC_PER_RB * n_symbols - n_dmrs) * rb;
   const int BPRE = tbs_bits/n_re;  //TODO change for PUSCH with CSI
@@ -114,7 +112,6 @@ int nr_process_mac_pdu(instance_t module_idP,
 {
 
   uint8_t done = 0;
-
   int sdus = 0;
   NR_UE_UL_BWP_t *ul_bwp = &UE->current_UL_BWP;
   NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
@@ -250,9 +247,9 @@ int nr_process_mac_pdu(instance_t module_idP,
                          compute_bw_factor(sched_pusch->mu, sched_pusch->rbSize) +
                          compute_delta_tf(sched_pusch->tb_size<<3,
                                           sched_pusch->rbSize,
-                                          0, //n_layers
-                                          0, //n_symbols
-                                          0, //n_dmrs
+                                          sched_pusch->nrOfLayers,
+                                          sched_pusch->tda_info.nrOfSymbols, //n_symbols
+                                          sched_pusch->dmrs_info.num_dmrs_symb*sched_pusch->dmrs_info.N_PRB_DMRS, //n_dmrs
                                           deltaMCS);
         /* 38.133 Table10.1.18.1-1 */
         sched_ctrl->pcmax = PCMAX - 29;
@@ -910,7 +907,6 @@ void update_ul_ue_R_Qm(int mcs, int mcs_table, const NR_PUSCH_Config_t *pusch_Co
   }
 }
 
-
 void nr_ue_max_mcs_min_rb(int mu, int ph_limit, NR_sched_pusch_t *sched_pusch, NR_UE_UL_BWP_t *ul_bwp, uint16_t minRb, uint32_t tbs, uint16_t *Rb, uint8_t *mcs)
 {
   AssertFatal(*Rb >= minRb, "illegal Rb %d < minRb %d\n", *Rb, minRb);
@@ -1339,6 +1335,7 @@ void pf_ul(module_id_t module_id,
                        current_BWP,
                        tda_info,
                        sched_pusch->nrOfLayers);
+
     update_ul_ue_R_Qm(sched_pusch->mcs, current_BWP->mcs_table, current_BWP->pusch_Config, &sched_pusch->R, &sched_pusch->Qm);
 
     int rbStart = 0;

openair2/RRC/NR/MESSAGES/asn1_msg.c

@@ -983,7 +983,6 @@ uint8_t do_RRCReject(uint8_t Mod_id,
     return((enc_rval.encoded+7)/8);
 }
 
-
 void fill_initial_SpCellConfig(int uid,
                                NR_SpCellConfig_t *SpCellConfig,
                                const NR_ServingCellConfigCommon_t *scc,
@@ -1061,7 +1060,8 @@ void fill_initial_SpCellConfig(int uid,
   ASN_SEQUENCE_ADD(&pusch_Config->pusch_PowerControl->pathlossReferenceRSToAddModList->list,plrefRS);
   pusch_Config->pusch_PowerControl->pathlossReferenceRSToReleaseList = NULL;
   pusch_Config->pusch_PowerControl->twoPUSCH_PC_AdjustmentStates = NULL;
-  pusch_Config->pusch_PowerControl->deltaMCS = NULL;
+  pusch_Config->pusch_PowerControl->deltaMCS = calloc(1, sizeof(*pusch_Config->pusch_PowerControl->deltaMCS));
+  *pusch_Config->pusch_PowerControl->deltaMCS = NR_PUSCH_PowerControl__deltaMCS_enabled;
   pusch_Config->pusch_PowerControl->sri_PUSCH_MappingToAddModList = calloc(1,sizeof(*pusch_Config->pusch_PowerControl->sri_PUSCH_MappingToAddModList));
   NR_SRI_PUSCH_PowerControl_t *sriPUSCHPC=calloc(1,sizeof(*sriPUSCHPC));
   sriPUSCHPC->sri_PUSCH_PowerControlId=0;

openair2/RRC/NR/nr_rrc_config.c

@@ -1112,7 +1112,8 @@ void config_uplinkBWP(NR_BWP_Uplink_t *ubwp,
   pusch_Config->pusch_PowerControl->pathlossReferenceRSToAddModList = NULL;
   pusch_Config->pusch_PowerControl->pathlossReferenceRSToReleaseList = NULL;
   pusch_Config->pusch_PowerControl->twoPUSCH_PC_AdjustmentStates = NULL;
-  pusch_Config->pusch_PowerControl->deltaMCS = NULL;
+  pusch_Config->pusch_PowerControl->deltaMCS = calloc(1, sizeof(*pusch_Config->pusch_PowerControl->deltaMCS));
+  *pusch_Config->pusch_PowerControl->deltaMCS = NR_PUSCH_PowerControl__deltaMCS_enabled;
   pusch_Config->pusch_PowerControl->sri_PUSCH_MappingToAddModList = NULL;
   pusch_Config->pusch_PowerControl->sri_PUSCH_MappingToReleaseList = NULL;
   pusch_Config->frequencyHopping=NULL;

openair2/RRC/NR/rrc_gNB_reconfig.c

@@ -424,7 +424,8 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
   pusch_Config->pusch_PowerControl->pathlossReferenceRSToAddModList = NULL;
   pusch_Config->pusch_PowerControl->pathlossReferenceRSToReleaseList = NULL;
   pusch_Config->pusch_PowerControl->twoPUSCH_PC_AdjustmentStates = NULL;
-  pusch_Config->pusch_PowerControl->deltaMCS = NULL;
+  pusch_Config->pusch_PowerControl->deltaMCS = calloc(1, sizeof(*pusch_Config->pusch_PowerControl->deltaMCS));
+  *pusch_Config->pusch_PowerControl->deltaMCS = NR_PUSCH_PowerControl__deltaMCS_enabled;
   pusch_Config->pusch_PowerControl->sri_PUSCH_MappingToAddModList = NULL;
   pusch_Config->pusch_PowerControl->sri_PUSCH_MappingToReleaseList = NULL;
   pusch_Config->frequencyHopping=NULL;