From dcfec657df0e7abc2ff958441574abb94040e4d8 Mon Sep 17 00:00:00 2001
From: luispereira87 <lpereira@allbesmart.pt>
Date: Thu, 1 Jul 2021 15:02:59 +0100
Subject: [PATCH] Fix BWPstart and BWPsize for bwp_Dedicated

---
 openair1/SCHED_NR_UE/pucch_uci_ue_nr.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/openair1/SCHED_NR_UE/pucch_uci_ue_nr.c b/openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
index 5db6935f98..2067a0c63b 100644
--- a/openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
+++ b/openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
@@ -619,9 +619,11 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
           mac->ULbwp[bwp_id-1] &&
           mac->ULbwp[bwp_id-1]->bwp_Dedicated &&
           mac->ULbwp[bwp_id-1]->bwp_Dedicated->pucch_Config &&
-          mac->ULbwp[bwp_id-1]->bwp_Dedicated->pucch_Config->choice.setup)
-          pucch_Config =  mac->ULbwp[bwp_id-1]->bwp_Dedicated->pucch_Config->choice.setup;
-      else if (bwp_id==0 &&
+          mac->ULbwp[bwp_id-1]->bwp_Dedicated->pucch_Config->choice.setup) {
+        pucch_Config =  mac->ULbwp[bwp_id-1]->bwp_Dedicated->pucch_Config->choice.setup;
+        BWPsize  =  NRRIV2BW(mac->ULbwp[bwp_id-1]->bwp_Common->genericParameters.locationAndBandwidth,MAX_BWP_SIZE);
+        BWPstart =  NRRIV2PRBOFFSET(mac->ULbwp[bwp_id-1]->bwp_Common->genericParameters.locationAndBandwidth,MAX_BWP_SIZE);
+      } else if (bwp_id==0 &&
                mac->cg &&
                mac->cg->spCellConfig &&
                mac->cg->spCellConfig->spCellConfigDedicated &&
-- 
2.26.2