rnti from UE_list in pucch pdu

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c

@@ -351,6 +351,7 @@ void nr_schedule_pucch(int Mod_idP,
       nr_configure_pucch(pucch_pdu,
 			 scc,
 			 ubwp,
+                         UE_list->rnti[UE_id],
                          curr_pucch->resource_indicator,
                          O_uci,
                          O_ack,

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -543,6 +543,7 @@ int nr_configure_pdcch(gNB_MAC_INST *nr_mac,
 void nr_configure_pucch(nfapi_nr_pucch_pdu_t* pucch_pdu,
 			NR_ServingCellConfigCommon_t *scc,
 			NR_BWP_Uplink_t *bwp,
+                        uint16_t rnti,
                         uint8_t pucch_resource,
                         uint16_t O_uci,
                         uint16_t O_ack,
@@ -649,7 +650,7 @@ void nr_configure_pucch(nfapi_nr_pucch_pdu_t* pucch_pdu,
       if (pucchres->pucch_ResourceId == *resource_id) {
         res_found = 1;
         pucch_pdu->prb_start = pucchres->startingPRB;
-        pucch_pdu->rnti = 0x1234;  // temporarily set same value as oai ue
+        pucch_pdu->rnti = rnti;
         // FIXME why there is only one frequency hopping flag
         // what about inter slot frequency hopping?
         pucch_pdu->freq_hop_flag = pucchres->intraSlotFrequencyHopping!= NULL ?  1 : 0;

openair2/LAYER2/NR_MAC_gNB/mac_proto.h

@@ -210,6 +210,7 @@ int nr_is_dci_opportunity(nfapi_nr_search_space_t search_space,
 void nr_configure_pucch(nfapi_nr_pucch_pdu_t* pucch_pdu,
 			NR_ServingCellConfigCommon_t *scc,
 			NR_BWP_Uplink_t *bwp,
+                        uint16_t rnti,
                         uint8_t pucch_resource,
                         uint16_t O_uci,
                         uint16_t O_ack,