Merge branch 'eurecom-episys-merge-nsa' into origin-episys-merge-nsa

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

@@ -3301,8 +3301,9 @@ static uint8_t pack_nr_uci_indication(void *msg, uint8_t **ppWritePackedMsg, uin
 
 	for(int i=0; i<pNfapiMsg->num_ucis;i++)	
 	{
-		if(!pack_nr_uci_indication_body(pNfapiMsg->uci_list,ppWritePackedMsg,end))
-		return 0;
+		if (!pack_nr_uci_indication_body(&pNfapiMsg->uci_list[i], ppWritePackedMsg, end))
+		        return 0;
+
 	}
 
 return 1;

openair1/SCHED_NR_UE/fapi_nr_ue_l1.c

@@ -184,7 +184,7 @@ int8_t nr_ue_scheduled_response_stub(nr_scheduled_response_t *scheduled_response
               uci_ind->uci_list[j].pdu_size = sizeof(nfapi_nr_uci_pucch_pdu_format_0_1_t);
               pdu_0_1->pduBitmap = 2; // (value->pduBitmap >> 1) & 0x01) == HARQ and (value->pduBitmap) & 0x01) == SR
               pdu_0_1->handle = 0;
-              pdu_0_1->rnti = dl_config->dl_config_list[0].dlsch_config_pdu.rnti;
+              pdu_0_1->rnti = dl_config->dl_config_list[i].dlsch_config_pdu.rnti;
               pdu_0_1->pucch_format = 1;
               pdu_0_1->ul_cqi = 27;
               pdu_0_1->timing_advance = 0;

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -905,7 +905,6 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info, NR_UL_TIME_ALIGNMENT_
         dci_pdu_rel15_t *def_dci_pdu_rel15 = &mac->def_dci_pdu_rel15[dci_index->dci_format];
         g_harq_pid = def_dci_pdu_rel15->harq_pid;
         LOG_D(NR_MAC, "Setting harq_pid = %d and dci_index = %d (based on format)\n", g_harq_pid, dci_index->dci_format);
-        memset(def_dci_pdu_rel15, 0, sizeof(*def_dci_pdu_rel15));
 
         ret_mask |= (ret << FAPI_NR_DCI_IND);
         if (ret >= 0) {