integration_2022_wk19b

• MR !1357 (merged): Bupt UL-MIMO
• MR !1516 (merged): NR handling 2-port PMI report
• MR !1454 (merged): Implementation of multiple dedicated BWPs
• MR !1556 (merged): Fix RAN-gNB-nrUE-MONO-TDD-Band78-N300 pipeline

openair1/SCHED_NR_UE/pucch_uci_ue_nr.c

@@ -420,7 +420,7 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
   NR_UE_MAC_INST_t *mac = get_mac_inst(0);
   NR_PUCCH_Resource_t *pucch_resource = NULL;
   uint16_t crnti = mac->crnti;
-  NR_BWP_Id_t bwp_id = get_softmodem_params()->sa ? 0 :  mac->UL_BWP_Id ;//SA uses initial BWP
+  NR_BWP_Id_t bwp_id = mac->UL_BWP_Id;//SA uses initial BWP
 
   /* update current context */
 
@@ -619,10 +619,11 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
           mac->ULbwp[bwp_id] &&
           mac->ULbwp[bwp_id]->bwp_Dedicated &&
           mac->ULbwp[bwp_id]->bwp_Dedicated->pucch_Config &&
-          mac->ULbwp[bwp_id]->bwp_Dedicated->pucch_Config->choice.setup)
+          mac->ULbwp[bwp_id]->bwp_Dedicated->pucch_Config->choice.setup) {
         pucch_Config =  mac->ULbwp[bwp_id]->bwp_Dedicated->pucch_Config->choice.setup;
         BWPsize  =  NRRIV2BW(mac->ULbwp[bwp_id]->bwp_Common->genericParameters.locationAndBandwidth,MAX_BWP_SIZE);
         BWPstart =  NRRIV2PRBOFFSET(mac->ULbwp[bwp_id]->bwp_Common->genericParameters.locationAndBandwidth,MAX_BWP_SIZE);
+      }
       else if (bwp_id==0 &&
                mac->cg &&
                mac->cg->spCellConfig &&
@@ -990,7 +991,7 @@ uint8_t get_downlink_ack(PHY_VARS_NR_UE *ue, uint8_t gNB_id,  UE_nr_rxtx_proc_t
   int N_m_c_rx = 0;
   int V_DAI_m_DL = 0;
   NR_UE_MAC_INST_t *mac = get_mac_inst(0);
-  NR_BWP_Id_t dl_bwp_id = get_softmodem_params()->sa ? 0 :  mac->DL_BWP_Id ; //SA uses initial BWP
+  NR_BWP_Id_t dl_bwp_id = mac->DL_BWP_Id; //SA uses initial BWP
 
 
   if (mac->DLbwp[dl_bwp_id] &&
@@ -1182,7 +1183,7 @@ boolean_t select_pucch_resource(PHY_VARS_NR_UE *ue, NR_UE_MAC_INST_t *mac, uint8
   pucch_format_nr_t format_pucch;
   int ready_pucch_resource_id = FALSE; /* in the case that it is already given */
   NR_PUCCH_Resource_t *pucch_resource = NULL;
-  NR_BWP_Id_t bwp_id = get_softmodem_params()->sa ? 0 :  mac->UL_BWP_Id ;//SA uses initial BWP
+  NR_BWP_Id_t bwp_id = mac->UL_BWP_Id;//SA uses initial BWP
 
   /* ini values to unset */
   *initial_pucch_id = NB_INITIAL_PUCCH_RESOURCE;
@@ -1377,7 +1378,7 @@ boolean_t select_pucch_resource(PHY_VARS_NR_UE *ue, NR_UE_MAC_INST_t *mac, uint8
 int find_pucch_resource_set(NR_UE_MAC_INST_t *mac, uint8_t gNB_id, int uci_size)
 {
   int pucch_resource_set_id = 0;
-  NR_BWP_Id_t bwp_id = get_softmodem_params()->sa ? 0 :  mac->DL_BWP_Id ; //SA uses initial BWP
+  NR_BWP_Id_t bwp_id = mac->DL_BWP_Id; //SA uses initial BWP
 
   //long *pucch_max_pl_bits = NULL;