Commit 7af01ea5 authored by Florian Kaltenberger's avatar Florian Kaltenberger

Merge branch 'NRPPA_Procedures' into NRPPA_Procedures_SRS

parents 38ce8f7b 4bd63ff8
...@@ -188,6 +188,7 @@ int ngap_gNB_UplinkNonUEAssociatedNRPPaTransport(instance_t instance, ngap_Uplin ...@@ -188,6 +188,7 @@ int ngap_gNB_UplinkNonUEAssociatedNRPPaTransport(instance_t instance, ngap_Uplin
} }
/* Non UE-Associated signalling -> stream = 0 */ /* Non UE-Associated signalling -> stream = 0 */
LOG_I(NGAP, "Sending sctp_data_req for ngap_gNB_UplinkNonUEAssociatedNRPPaTransport (assoc_id %d)\n",amf_desc_p->assoc_id);
ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance, amf_desc_p->assoc_id, buffer, length, 0); ngap_gNB_itti_send_sctp_data_req(ngap_gNB_instance_p->instance, amf_desc_p->assoc_id, buffer, length, 0);
return 0; return 0;
} }
......
...@@ -166,7 +166,7 @@ int nrppa_gNB_handle_Measurement(nrppa_gnb_ue_info_t *nrppa_msg_info, NRPPA_NRPP ...@@ -166,7 +166,7 @@ int nrppa_gNB_handle_Measurement(nrppa_gnb_ue_info_t *nrppa_msg_info, NRPPA_NRPP
for (int i = 0; i < maxnoSRScarrier; i++) { for (int i = 0; i < maxnoSRScarrier; i++) {
NRPPA_SRSCarrier_List_Item_t *CarrItem= srs_config.sRSCarrier_List.list.array[i]; NRPPA_SRSCarrier_List_Item_t *CarrItem= srs_config.sRSCarrier_List.list.array[i];
srs_carrier_list_item->pointA = CarrItem->pointA; // (M) srs_carrier_list_item->pointA = CarrItem->pointA; // (M)
srs_carrier_list_item->pci = CarrItem->pCI; // Optional Physical cell ID of the cell that contians the SRS carrier srs_carrier_list_item->pci = CarrItem->pCI ? *CarrItem->pCI : 0; // Optional Physical cell ID of the cell that contians the SRS carrier
// Preparing Active UL BWP information IE of SRSCarrier_List f1ap_active_ul_bwp_ active_ul_bwp; //(M) // Preparing Active UL BWP information IE of SRSCarrier_List f1ap_active_ul_bwp_ active_ul_bwp; //(M)
f1ap_active_ul_bwp_t *f1_ul_bwp= &srs_carrier_list_item->active_ul_bwp; f1ap_active_ul_bwp_t *f1_ul_bwp= &srs_carrier_list_item->active_ul_bwp;
NRPPA_ActiveULBWP_t *Nrppa_ULBWP =&CarrItem->activeULBWP; NRPPA_ActiveULBWP_t *Nrppa_ULBWP =&CarrItem->activeULBWP;
...@@ -174,7 +174,7 @@ int nrppa_gNB_handle_Measurement(nrppa_gnb_ue_info_t *nrppa_msg_info, NRPPA_NRPP ...@@ -174,7 +174,7 @@ int nrppa_gNB_handle_Measurement(nrppa_gnb_ue_info_t *nrppa_msg_info, NRPPA_NRPP
f1_ul_bwp->subcarrierSpacing = Nrppa_ULBWP->subcarrierSpacing; f1_ul_bwp->subcarrierSpacing = Nrppa_ULBWP->subcarrierSpacing;
f1_ul_bwp->cyclicPrefix = Nrppa_ULBWP->cyclicPrefix; f1_ul_bwp->cyclicPrefix = Nrppa_ULBWP->cyclicPrefix;
f1_ul_bwp->txDirectCurrentLocation = Nrppa_ULBWP->txDirectCurrentLocation; f1_ul_bwp->txDirectCurrentLocation = Nrppa_ULBWP->txDirectCurrentLocation;
f1_ul_bwp->shift7dot5kHz = Nrppa_ULBWP->shift7dot5kHz; f1_ul_bwp->shift7dot5kHz = Nrppa_ULBWP->shift7dot5kHz ? *Nrppa_ULBWP->shift7dot5kHz : 0;
f1ap_srs_config_t *f1_srsConf= &f1_ul_bwp->sRSConfig; f1ap_srs_config_t *f1_srsConf= &f1_ul_bwp->sRSConfig;
// Preparing sRSResource_List IE of SRSConfig (IE of activeULBWP) // Preparing sRSResource_List IE of SRSConfig (IE of activeULBWP)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment