.

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

@@ -11,14 +11,14 @@
 
 {# XXX rrh_list ? #}
 
-{# lte_cell_tdd_config returns tdd_config of an LTE cell #}
+{# 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 %}
 
-{# lte_cell_n_rb_dl returns n_rb_dl of an LTE cell #}
+{# lte_cell_n_rb_dl returns n_rb_dl for an LTE cell #}
 {%- macro lte_cell_n_rb_dl(cell) %}
 {%-   set _ = {'1.4 MHz':  6,
                '3 MHz':   15,
@@ -35,6 +35,7 @@
 {%- set cell_count = cell_list|length %}
 
 
+# XXX <- from RRH
 #define N_ANTENNA_DL        {{ slapparameter_dict.get('n_antenna_dl', slap_configuration['configuration.default_n_antenna_dl']) }}
 #define N_ANTENNA_UL        {{ slapparameter_dict.get('n_antenna_ul', slap_configuration['configuration.default_n_antenna_ul']) }}
 
@@ -153,7 +154,7 @@
 
   enb_id: {{ slapparameter_dict.get('enb_id', '0x1A2D0') }},
 
-  # <- cell_list
+
   cell_list: [
 {%- for i, cell in enumerate(cell_list) %}
 {%-   if cell['cell_type'] == 'cell_lte' %}
@@ -167,6 +168,7 @@
           n_id_cell:  {{ cell['pci'] }},
           dl_earfcn:  {{ cell['dl_earfcn'] }},
           root_sequence_index: 204,
+
 {#-       CA in between all LTE cells #}
           scell_list: [
 {%-       for j, cell2 in enumerate(cell_list) %}
@@ -179,7 +181,7 @@
 {%-       endfor %}
           ],
 
-{#        cell radio tuning #}
+{#        tune LTE parameters for the cell #}
 {%-       set tdd = (cell['rf_mode'] == 'tdd') %}
 {%-       if tdd %}
             uldl_config: {{ lte_cell_tdd_config(cell} }},
@@ -195,37 +197,37 @@
             p_b: -1,
           },
 
-          pdcch_format: {{ 1  if n_rb_dl == 6  else 2 }},
+          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 }}
+          initial_cqi:        {{  5  if n_rb_dl == 6  else 3 }},
 
           pucch_dedicated: {
             n1_pucch_sr_count: 11,
             cqi_pucch_n_rb: 1,
-{%-         if tdd %}
+{%-         if tdd  %}
               tdd_ack_nack_feedback_mode: "multiplexing", /* TDD only */
 {%-         endif %}
           },
 
-{%-       if n_antenna_dl >= 2 %}
+{%-       if n_antenna_dl >= 2  %}
             m_ri: 8,
             transmission_mode: 3,
 {%-       endif %}
 
           srs_dedicated: {
-{%-       if N_RB_DL == 6  %}
+{%-       if n_rb_dl == 6  %}
             srs_bandwidth_config: 7,
             srs_bandwidth: 1,
-{%-       elif N_RB_DL == 15  %}
+{%-       elif n_rb_dl == 15  %}
             srs_bandwidth_config: 6,
             srs_bandwidth: 1,
-{%-       elif N_RB_DL == 25  %}
+{%-       elif n_rb_dl == 25  %}
             srs_bandwidth_config: 3,
             srs_bandwidth: 1,
-{%-       elif N_RB_DL == 50  %}
+{%-       elif n_rb_dl == 50  %}
             srs_bandwidth_config: 2,
             srs_bandwidth: 2,
-{%-       elif N_RB_DL == 75  %}
+{%-       elif n_rb_dl == 75  %}
             srs_bandwidth_config: 2,
             srs_bandwidth: 2,
 {%-       else  %}
@@ -237,6 +239,7 @@
             srs_hopping_bandwidth: 0,
           },
 
+          # XXX +drb_config
         },
 {%-   endif %}
 {%- endfor %}