X pick up nexedi/slapos!1519

+ adapt it to generic.

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

@@ -313,8 +313,15 @@
         pucch_dedicated: {
           n1_pucch_sr_count: 11,
           cqi_pucch_n_rb: 1,
-          n1_pucch_an_cs_count: 8,  {# XXX else "n1_pucch_an_cs_count must be > 0 for the CA Primary cell" #}
-          n3_pucch_an_n_rb: 3,      {# XXX else "n3_pucch_an_n_rb must be > 0 for the CA Primary cell" #}
+{#-       for CA with 2 cells it is possible to use PUCCH 1b CS ack/nack #}
+{%-       if len(icell_dict_lte) == 2  %}
+            ack_nack_feedback_mode_ca: "cs",
+            n1_pucch_an_cs_count: 8,
+{#-       starting from 3 cells it is always PUCCH 3 for ack/nack in CA #}
+{%-       elif len(icell_dict_lte) >= 3  %}
+            ack_nack_feedback_mode_ca: "pucch3",
+            n3_pucch_an_n_rb: 3,
+{%-       endif %}
 {%-       if tdd  %}
           tdd_ack_nack_feedback_mode: "multiplexing", /* TDD only */
 {%-       endif %}

software/ors-amarisoft/config/out/enb/iRU1_SDR1_fLTE2/enb.cfg

@@ -113,8 +113,8 @@
         pucch_dedicated: {
           n1_pucch_sr_count: 11,
           cqi_pucch_n_rb: 1,
+            ack_nack_feedback_mode_ca: "cs",
             n1_pucch_an_cs_count: 8,
-          n3_pucch_an_n_rb: 3,      
         },
 
         srs_dedicated: {
@@ -215,8 +215,8 @@
         pucch_dedicated: {
           n1_pucch_sr_count: 11,
           cqi_pucch_n_rb: 1,
+            ack_nack_feedback_mode_ca: "cs",
             n1_pucch_an_cs_count: 8,
-          n3_pucch_an_n_rb: 3,      
         },
 
         srs_dedicated: {

software/ors-amarisoft/config/out/enb/iRU1_SDR_tLTE2_tNR/enb.cfg

@@ -134,8 +134,8 @@
         pucch_dedicated: {
           n1_pucch_sr_count: 11,
           cqi_pucch_n_rb: 1,
+            ack_nack_feedback_mode_ca: "cs",
             n1_pucch_an_cs_count: 8,
-          n3_pucch_an_n_rb: 3,      
           tdd_ack_nack_feedback_mode: "multiplexing", /* TDD only */
         },
         m_ri: 8,
@@ -251,8 +251,8 @@
         pucch_dedicated: {
           n1_pucch_sr_count: 11,
           cqi_pucch_n_rb: 1,
+            ack_nack_feedback_mode_ca: "cs",
             n1_pucch_an_cs_count: 8,
-          n3_pucch_an_n_rb: 3,      
           tdd_ack_nack_feedback_mode: "multiplexing", /* TDD only */
         },
         m_ri: 8,

software/ors-amarisoft/config/out/enb/iRU2_LOPCOMM_fLTE2/enb.cfg

@@ -118,8 +118,8 @@
         pucch_dedicated: {
           n1_pucch_sr_count: 11,
           cqi_pucch_n_rb: 1,
+            ack_nack_feedback_mode_ca: "cs",
             n1_pucch_an_cs_count: 8,
-          n3_pucch_an_n_rb: 3,      
         },
 
         srs_dedicated: {
@@ -220,8 +220,8 @@
         pucch_dedicated: {
           n1_pucch_sr_count: 11,
           cqi_pucch_n_rb: 1,
+            ack_nack_feedback_mode_ca: "cs",
             n1_pucch_an_cs_count: 8,
-          n3_pucch_an_n_rb: 3,      
         },
 
         srs_dedicated: {

software/ors-amarisoft/config/out/enb/iRU2_LOPCOMM_fLTE_fNR/enb.cfg

@@ -124,8 +124,6 @@
         pucch_dedicated: {
           n1_pucch_sr_count: 11,
           cqi_pucch_n_rb: 1,
-          n1_pucch_an_cs_count: 8,  
-          n3_pucch_an_n_rb: 3,      
         },
         m_ri: 8,
         transmission_mode: 3,

software/ors-amarisoft/config/out/enb/iRU2_SDR_tLTE_tNR/enb.cfg

@@ -122,8 +122,6 @@
         pucch_dedicated: {
           n1_pucch_sr_count: 11,
           cqi_pucch_n_rb: 1,
-          n1_pucch_an_cs_count: 8,  
-          n3_pucch_an_n_rb: 3,      
           tdd_ack_nack_feedback_mode: "multiplexing", /* TDD only */
         },
         m_ri: 8,