From 9eb1af6dc21413c8c8dacf7c135c4f2ecae038d8 Mon Sep 17 00:00:00 2001
From: francescomani <email@francescomani.it>
Date: Fri, 24 Feb 2023 11:18:12 +0100
Subject: [PATCH] addressing review

---
 cmake_targets/autotests/test_case_list.xml | 2 +-
 openair2/RRC/NR/nr_rrc_config.c            | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cmake_targets/autotests/test_case_list.xml b/cmake_targets/autotests/test_case_list.xml
index 21317f0f2a..e1449e6f66 100755
--- a/cmake_targets/autotests/test_case_list.xml
+++ b/cmake_targets/autotests/test_case_list.xml
@@ -378,7 +378,7 @@
                       -n100 -u0 -m0 -R25 -r25 -i 1,0
                       -n100 -m0 -S -0.6 -i 1,0
                       -n100 -m 28 -R106 -r106 -t90 -s24 -S24 -d 8</main_exec_args>
-      <tags>test1 test2 test3 test4 test5 test6 test7 test8 test9 test10 test11 test12 test 13</tags>
+      <tags>test1 test2 test3 test4 test5 test6 test7 test8 test9 test10 test11 test12 test13</tags>
       <search_expr_true>PUSCH test OK</search_expr_true>
       <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
       <nruns>3</nruns>
diff --git a/openair2/RRC/NR/nr_rrc_config.c b/openair2/RRC/NR/nr_rrc_config.c
index 6f9a42f7ac..26f115e030 100644
--- a/openair2/RRC/NR/nr_rrc_config.c
+++ b/openair2/RRC/NR/nr_rrc_config.c
@@ -983,7 +983,7 @@ static void set_ul_mcs_table(const NR_UE_NR_Capability_t *cap,
        *pusch_Config->transformPrecoder == NR_PUSCH_Config__transformPrecoder_disabled) {
       if(pusch_Config->mcs_Table == NULL)
         pusch_Config->mcs_Table = calloc(1, sizeof(*pusch_Config->mcs_Table));
-      *pusch_Config->mcs_Table = NR_PDSCH_Config__mcs_Table_qam256;
+      *pusch_Config->mcs_Table = NR_PUSCH_Config__mcs_Table_qam256;
     }
     else {
       if(pusch_Config->mcs_TableTransformPrecoder == NULL)
@@ -1311,7 +1311,7 @@ static void config_uplinkBWP(NR_BWP_Uplink_t *ubwp,
      bwp_loop < servingcellconfigdedicated->uplinkConfig->uplinkBWP_ToAddModList->list.count) {
     pusch_Config = servingcellconfigdedicated->uplinkConfig->uplinkBWP_ToAddModList->list.array[bwp_loop]->bwp_Dedicated->pusch_Config->choice.setup;
   }
-  ubwp->bwp_Dedicated->pusch_Config = config_pusch(pusch_Config, scc, uecap);
+  ubwp->bwp_Dedicated->pusch_Config = config_pusch(pusch_Config, scc, configuration->force_256qam_off ? NULL : uecap);
 
   long maxMIMO_Layers = servingcellconfigdedicated &&
                                 servingcellconfigdedicated->uplinkConfig
@@ -2445,12 +2445,13 @@ void update_cellGroupConfig(NR_CellGroupConfig_t *cellGroupConfig,
       set_dl_mcs_table(scs, configuration->force_256qam_off ? NULL : uecap, bwp->bwp_Dedicated, scc);
     }
   }
-  if (configuration->do_SRS && UL_BWP_list) {
+  if (UL_BWP_list) {
     for (int i = 0; i < UL_BWP_list->list.count; i++) {
       NR_BWP_Uplink_t *ul_bwp = UL_BWP_list->list.array[i];
       int bwp_size = NRRIV2BW(ul_bwp->bwp_Common->genericParameters.locationAndBandwidth, MAX_BWP_SIZE);
       if (ul_bwp->bwp_Dedicated->pusch_Config) {
         NR_PUSCH_Config_t *pusch_Config = ul_bwp->bwp_Dedicated->pusch_Config->choice.setup;
+        set_ul_mcs_table(configuration->force_256qam_off ? NULL : uecap, scc, pusch_Config);
         if (pusch_Config->maxRank == NULL) {
           pusch_Config->maxRank = calloc(1, sizeof(*pusch_Config->maxRank));
         }