.

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

@@ -198,6 +198,14 @@
           pdcch_format: {{ 1  if n_rb_dl == 6  else 2 }},
           prach_config_index: {{ 15  if n_rb_dl == 6  else 4 }},
 
+          pucch_dedicated: {
+            n1_pucch_sr_count: 11,
+            cqi_pucch_n_rb: 1,
+{%- if tdd %}
+            tdd_ack_nack_feedback_mode: "multiplexing", /* TDD only */
+{%- endif %}
+          },
+
         },
 {%-   endif %}
 {%- endfor %}
@@ -247,13 +255,6 @@
 
     prach_freq_offset: -1,
 
-    pucch_dedicated: {
-      n1_pucch_sr_count: 11,
-      cqi_pucch_n_rb: 1,
-#if TDD == 1                            # XXX -> cell
-      tdd_ack_nack_feedback_mode: "multiplexing", /* TDD only */
-#endif
-    },
 
     pusch_dedicated: {
       beta_offset_ack_index: 9,