Merge remote-tracking branch 'origin/develop' into push_power_conformace_tests

nfapi/open-nFAPI/nfapi/src/nfapi_p7.c

@@ -328,8 +328,8 @@ static uint8_t pack_dl_tti_pdsch_pdu_rel15_value(void *tlv, uint8_t **ppWritePac
   }
   // TODO Add TX power info
   // Hardcoded values that represent 0db
-  if (!(push8(8, ppWritePackedMsg, end) && // powerControlOffset
-        push8(1, ppWritePackedMsg, end))) { // powerControlOffsetSS
+  if (!(push8(0, ppWritePackedMsg, end) && // powerControlOffset
+        push8(0, ppWritePackedMsg, end))) { // powerControlOffsetSS
     return 0;
   }
   // TODO Add CBG Fields

openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

@@ -2393,7 +2393,7 @@ void nr_schedule_csirs_reception(NR_UE_MAC_INST_t *mac, int frame, int slot)
     if (nzpcsi->powerControlOffsetSS)
       csirs_config_pdu->power_control_offset_ss = *nzpcsi->powerControlOffsetSS;
     else
-      csirs_config_pdu->power_control_offset_ss = 1; // 0 dB
+      csirs_config_pdu->power_control_offset_ss = 0; // -3 dB
     switch(resourceMapping.frequencyDomainAllocation.present){
       case NR_CSI_RS_ResourceMapping__frequencyDomainAllocation_PR_row1:
         csirs_config_pdu->row = 1;

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c

@@ -843,7 +843,7 @@ static void nr_generate_Msg3_retransmission(module_id_t module_idP,
     dci_pdu->AggregationLevel = aggregation_level;
     dci_pdu->CceIndex = CCEIndex;
     dci_pdu->beta_PDCCH_1_0 = 0;
-    dci_pdu->powerControlOffsetSS = 1;
+    dci_pdu->powerControlOffsetSS = 0;
 
     dci_pdu_rel15_t uldci_payload={0};
 
@@ -1362,7 +1362,7 @@ static void nr_generate_Msg2(module_id_t module_idP,
     dci_pdu->AggregationLevel = aggregation_level;
     dci_pdu->CceIndex = CCEIndex;
     dci_pdu->beta_PDCCH_1_0 = 0;
-    dci_pdu->powerControlOffsetSS = 1;
+    dci_pdu->powerControlOffsetSS = 0;
 
     dci_pdu_rel15_t dci_payload;
     dci_payload.frequency_domain_assignment.val = PRBalloc_to_locationandbandwidth0(pdsch_pdu_rel15->rbSize,
@@ -1584,7 +1584,7 @@ static void prepare_dl_pdus(gNB_MAC_INST *nr_mac,
   dci_pdu->AggregationLevel = aggregation_level;
   dci_pdu->CceIndex = CCEIndex;
   dci_pdu->beta_PDCCH_1_0 = 0;
-  dci_pdu->powerControlOffsetSS = 1;
+  dci_pdu->powerControlOffsetSS = 0;
 
   dci_pdu_rel15_t dci_payload;
   dci_payload.frequency_domain_assignment.val = PRBalloc_to_locationandbandwidth0(pdsch_pdu_rel15->rbSize,

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c

@@ -467,7 +467,7 @@ static void nr_fill_nfapi_dl_sib1_pdu(int Mod_idP,
   dci_pdu->AggregationLevel = gNB_mac->sched_ctrlCommon->aggregation_level;
   dci_pdu->CceIndex = gNB_mac->sched_ctrlCommon->cce_index;
   dci_pdu->beta_PDCCH_1_0 = 0;
-  dci_pdu->powerControlOffsetSS = 1;
+  dci_pdu->powerControlOffsetSS = 0;
 
   /* DCI payload */
   dci_pdu_rel15_t dci_payload;

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -2716,7 +2716,7 @@ void nr_csirs_scheduling(int Mod_idP, frame_t frame, sub_frame_t slot, int n_slo
           if (nzpcsi->powerControlOffsetSS)
             csirs_pdu_rel15->power_control_offset_ss = *nzpcsi->powerControlOffsetSS;
           else
-            csirs_pdu_rel15->power_control_offset_ss = 1; // 0 dB
+            csirs_pdu_rel15->power_control_offset_ss = 0; // -3 dB
           switch(resourceMapping.frequencyDomainAllocation.present){
             case NR_CSI_RS_ResourceMapping__frequencyDomainAllocation_PR_row1:
               csirs_pdu_rel15->row = 1;

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

@@ -2250,6 +2250,7 @@ void nr_schedule_ulsch(module_id_t module_id, frame_t frame, sub_frame_t slot, n
     const NR_DMRS_UplinkConfig_t *NR_DMRS_UplinkConfig = get_DMRS_UplinkConfig(current_BWP->pusch_Config, &sched_pusch->tda_info);
     if (pusch_pdu->transform_precoding) { // transform precoding disabled
       long *scramblingid=NULL;
+      pusch_pdu->pusch_identity = *scc->physCellId;
       if (NR_DMRS_UplinkConfig && pusch_pdu->scid == 0)
         scramblingid = NR_DMRS_UplinkConfig->transformPrecodingDisabled->scramblingID0;
       else if (NR_DMRS_UplinkConfig)
@@ -2380,7 +2381,7 @@ void nr_schedule_ulsch(module_id_t module_id, frame_t frame, sub_frame_t slot, n
     dci_pdu->AggregationLevel = sched_ctrl->aggregation_level;
     dci_pdu->CceIndex = sched_ctrl->cce_index;
     dci_pdu->beta_PDCCH_1_0 = 0;
-    dci_pdu->powerControlOffsetSS = 1;
+    dci_pdu->powerControlOffsetSS = 0;
 
     dci_pdu_rel15_t uldci_payload;
     memset(&uldci_payload, 0, sizeof(uldci_payload));

openair2/RRC/NR/nr_rrc_config.c

@@ -391,7 +391,7 @@ static void config_csirs(const NR_ServingCellConfigCommon_t *servingcellconfigco
     nzpcsi0->resourceMapping = resourceMapping;
     nzpcsi0->powerControlOffset = 0;
     nzpcsi0->powerControlOffsetSS = calloc(1,sizeof(*nzpcsi0->powerControlOffsetSS));
-    *nzpcsi0->powerControlOffsetSS = NR_NZP_CSI_RS_Resource__powerControlOffsetSS_db0;
+    *nzpcsi0->powerControlOffsetSS = NR_NZP_CSI_RS_Resource__powerControlOffsetSS_db_3;
     nzpcsi0->scramblingID = *servingcellconfigcommon->physCellId;
     set_csirs_periodicity(nzpcsi0, id, ideal_period, nb_slots_per_period, nb_dl_slots_period);
     nzpcsi0->qcl_InfoPeriodicCSI_RS = calloc(1,sizeof(*nzpcsi0->qcl_InfoPeriodicCSI_RS));