.

software/ors-amarisoft/config/enb.jinja2.cfg

@@ -197,6 +197,7 @@
 
           pdcch_format: {{ 1  if n_rb_dl == 6  else 2 }},
           prach_config_index: {{ 15  if n_rb_dl == 6  else 4 }},
+          initial_cqi: {{ 5  if n_rb_dl == 6  else 3 }}
 
           pucch_dedicated: {
             n1_pucch_sr_count: 11,
@@ -206,6 +207,36 @@
 {%-         endif %}
           },
 
+{%-       if n_antenna_dl >= 2 %}
+            m_ri: 8,
+            transmission_mode: 3,
+{%-       endif %}
+
+    srs_dedicated: {                    # XXX -> cell
+#if N_RB_DL == 6
+      srs_bandwidth_config: 7,
+      srs_bandwidth: 1,
+#elif N_RB_DL == 15
+      srs_bandwidth_config: 6,
+      srs_bandwidth: 1,
+#elif N_RB_DL == 25
+      srs_bandwidth_config: 3,
+      srs_bandwidth: 1,
+#elif N_RB_DL == 50
+      srs_bandwidth_config: 2,
+      srs_bandwidth: 2,
+#elif N_RB_DL == 75
+      srs_bandwidth_config: 2,
+      srs_bandwidth: 2,
+#else
+      srs_bandwidth_config: 2,
+      srs_bandwidth: 3,
+#endif
+      srs_subframe_config: 3,
+      srs_period: 40,
+      srs_hopping_bandwidth: 0,
+    },
+
         },
 {%-   endif %}
 {%- endfor %}
@@ -266,11 +297,6 @@
 
     pusch_msg3_mcs: 0,
 
-#if N_RB_DL == 6                        # XXX -> cell
-    initial_cqi: 5,
-#else
-    initial_cqi: 3,
-#endif
 
     dl_256qam: true,
     ul_64qam: true,
@@ -279,35 +305,6 @@
 
     cqi_period: 40,
 
-#if N_ANTENNA_DL >= 2                   # XXX -> cell
-    m_ri: 8,
-    transmission_mode: 3,
-#endif
-
-    srs_dedicated: {                    # XXX -> cell
-#if N_RB_DL == 6
-      srs_bandwidth_config: 7,
-      srs_bandwidth: 1,
-#elif N_RB_DL == 15
-      srs_bandwidth_config: 6,
-      srs_bandwidth: 1,
-#elif N_RB_DL == 25
-      srs_bandwidth_config: 3,
-      srs_bandwidth: 1,
-#elif N_RB_DL == 50
-      srs_bandwidth_config: 2,
-      srs_bandwidth: 2,
-#elif N_RB_DL == 75
-      srs_bandwidth_config: 2,
-      srs_bandwidth: 2,
-#else
-      srs_bandwidth_config: 2,
-      srs_bandwidth: 3,
-#endif
-      srs_subframe_config: 3,
-      srs_period: 40,
-      srs_hopping_bandwidth: 0,
-    },
 
     mac_config: {
        ul_max_harq_tx: 5,