.

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

@@ -515,13 +515,50 @@
              },
            },
 {%        endif %}
+
+          prach: {
+{%-       if ru.ru_type == 'sunwave' %}
+            msg1_frequency_start: 0,
+{%-       endif %}
+            ra_response_window: {{ 20 if tdd else 10 }},
+          },
+
+          pdcch: {
+{%-       if ru.ru_type == 'sunwave' %}
+            n_rb_coreset0: 48,
+            n_symb_coreset0: 1,
+            dedicated_coreset: {
+              duration: 1,
+            },
+{%-       endif %}
+{%-       if tdd_config == 3 %}
+            uss: {
+              n_candidates: [ 0, 8, 1, 0, 0 ],
+              dci_0_1_and_1_1: true,
+            },
+{%-       else %}
+            uss: {
+              n_candidates: [ 0, 2, 1, 0, 0 ],
+              dci_0_1_and_1_1: true,
+            },
+{%-       endif %}
+          },
+
+          pdsch: {
+{%-       if ru.ru_type == 'sunwave' %}
+            k0: 0,
+            k1: [ 8, 7, 7, 6, 5, 4, 12, 11 ],
+{%-       elif tdd_config == 3 %}
+            k1: [4, 11],
+{%-       endif %}
+          },
+
         },
 
 {%-   endif %}
 {%- endfor %}
   ],
 
-{# XXX restore
   nr_cell_default: {
     ssb_period: 20,
 
@@ -602,35 +639,22 @@
       prach_config_index: 160,      // XXX TDD only & TDD_CONFIG != 4
       msg1_subcarrier_spacing: 30,
       msg1_fdm: 1,
-{% if ru.ru_type == 'sunwave' %}
-      msg1_frequency_start: 0,
-{% else %}
       msg1_frequency_start: -1,
-{% endif %}
       zero_correlation_zone_config: 15,
       preamble_received_target_power: -110,
       preamble_trans_max: 7,
       power_ramping_step: 4,
-      ra_response_window: {{ 20 if tdd else 10 }},
       restricted_set_config: "unrestricted_set",
       ra_contention_resolution_timer: 64,
       ssb_per_prach_occasion: 1,
       cb_preambles_per_ssb: 8,
     },
     pdcch: {
-{% if ru.ru_type == 'sunwave' %}
-      n_rb_coreset0: 48,
-      n_symb_coreset0: 1,
-{% endif %}
       search_space0_index: 0,
       dedicated_coreset: {
         rb_start: -1,
         l_crb: -1,
-{% if ru.ru_type == 'sunwave' %}
-        duration: 1,
-{% else %}
         duration: 0,
-{% endif %}
         precoder_granularity: "sameAsREG_bundle",
       },
       css: {
@@ -638,17 +662,6 @@
       },
       rar_al_index: 2,
       si_al_index: 2,
-{% if tdd_config == 3 %}
-      uss: {
-       n_candidates: [ 0, 8, 1, 0, 0 ],
-       dci_0_1_and_1_1: true,
-      },
-{% else %}
-      uss: {
-        n_candidates: [ 0, 2, 1, 0, 0 ],
-        dci_0_1_and_1_1: true,
-      },
-{% endif %}
       al_index: 1,
     },
     pdsch: {
@@ -656,12 +669,6 @@
       dmrs_add_pos: 1,
       dmrs_type: 1,
       dmrs_max_len: 1,
-{% if ru.ru_type == 'sunwave' %}
-      k0: 0,
-      k1: [ 8, 7, 7, 6, 5, 4, 12, 11 ],
-{% elif tdd_config == 3 %}
-      k1: [4, 11],
-{% endif %}
       mcs_table: "qam256",
       rar_mcs: 2,
       si_mcs: 6,
@@ -950,5 +957,4 @@
       pattern_id: 0
     },
   },
-#}
 }