.

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

@@ -11,6 +11,12 @@
 
 {# XXX rrh_list ? #}
 
+{# lte_cell_tdd_config returns tdd_config for an lte cell #}
+{%- macro lte_cell_tdd_config(cell} %}
+{%-   set _ = {'[Configuration 2] 5ms 2UL 6DL (default)':        2,
+               '[Configuration 6] 5ms 5UL 3DL (maximum uplink)': 6} %}
+{{    _[cell.get('tdd_ul_dl_config', '[Configuration 2] 5ms 2UL 6DL (default)')]  }}
+{%- endmacro %}
 
 {%- set cell_count = cell_list|length %}
 
@@ -20,11 +26,6 @@
 {%- set tdd_config = 6 %}
 {%- endif %}
 
-{% if rf_mode == 'tdd' %}
-#define TDD                 1
-{% else %}
-#define TDD                 0
-{% endif %}
 {%- if   slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '1.4 MHz' %}
 #define N_RB_DL             6
 {%- elif slapparameter_dict.get('bandwidth', slap_configuration['configuration.default_lte_bandwidth']) == '3 MHz' %}
@@ -162,6 +163,9 @@
 {%-   if cell['cell_type'] == 'cell_lte' %}
         {
           rf_port: XXX get from rrh,
+          n_antenna_dl: N_ANTENNA_DL,         # XXX from rrh
+          n_antenna_ul: N_ANTENNA_UL,         # XXX from rrh
+
           cell_id:    {{ cell['cell_id'] }},
           tac:        {{ cell['tac'] }},
           n_id_cell:  {{ cell['pci'] }},
@@ -177,43 +181,18 @@
             },
 {%-         endif %}
 {%-       endfor %}
-          ]
+          ],
+
+{#      radio tuning #}
+{%-     set tdd = (cell['rf_mode'] == 'tdd') %}
+{%-     if tdd %}
+          uldl_config: {{ lte_cell_tdd_config(cell} }},
+          sp_config: 7,
+{%-     endif %}
+    n_rb_dl: N_RB_DL,
         },
 {%-   endif %}
 {%- endfor %}
-
-    {%- for i, k in enumerate(cell_list) %}
-    {%- if i == 0 -%}
-    {
-    {%- else -%}
-    , {
-    {%- endif %}
-      rf_port: {{ i }},           # <-> rrh
-      cell_id: {{ cell_list[k].get('cell_id', slapparameter_dict.get('cell_id', '0x0' + i|string)) }},
-      tac: {{ cell_list[k].get('tac', slapparameter_dict.get('tac', '0x0001')) }},
-      n_id_cell: {{ cell_list[k].get('pci', slapparameter_dict.get('pci', i)) }},
-      root_sequence_index: 204,
-      dl_earfcn: {{ cell_list[k].get('dl_earfcn', slapparameter_dict.get('dl_earfcn', earfcn)) }},
-      {%- set scell_list = [] %}
-      {%- for j, l in enumerate(cell_list) %}
-      {%-   if j != i %}
-      {%-     do scell_list.append([j, l]) %}
-      {%-   endif %}
-      {%- endfor %}
-      scell_list: [
-        {%- for j, l in enumerate(scell_list) %}
-        {%- if j == 0 -%}
-        {
-        {%- else -%}
-        , {
-        {%- endif %}
-          cell_id: {{ cell_list[l[1]].get('cell_id', '0x0' + l[0]|string) }},
-          cross_carrier_scheduling: false,
-        }
-        {%- endfor %}
-      ],
-    }
-    {%- endfor %}
   ],
 
   cell_default: {
@@ -234,16 +213,9 @@
       "00101",
 {% endif %}
     ],
-    n_antenna_dl: N_ANTENNA_DL,         # XXX -> cell
-    n_antenna_ul: N_ANTENNA_UL,         # XXX -> cell
 {% if slapparameter_dict.get('rrh', 'ORS') == "ORS" %}
     manual_ref_signal_power: true,
 {% endif %}
-#if TDD == 1                            # XXX -> cell
-    uldl_config: {{ tdd_config }},
-    sp_config: 7,
-#endif
-    n_rb_dl: N_RB_DL,
     cyclic_prefix: "normal",
 
     phich_duration: "normal",