.

software/ors-amarisoft/amari/lte.jinja2

@@ -30,10 +30,9 @@
   {%- set ru_cpri_dict = {} %}  {#- dev -> ru  for ru with link_kind = cpri   #}
   {%- set tx_gainv = [] %}      {#- tx_gain by tx channel                     #}
   {%- set rx_gainv = [] %}      {#- rx_gain by tx channel                     #}
-  {%- for rf_port, (ru_ref, iru) in enumerate(iru_dict|dictsort)              %}  XXX adjust
+  {%- for (ru_ref, iru) in iru_dict.items() | sort(attribute="1._._rf_port")  %}
   {%-   set ru = iru['_']                                                     %}
       // {{ ru_ref }} {{ ru.n_antenna_dl }}T{{ ru.n_antenna_ul }}R  ({{ ru.ru_type }})
-  {%-   do ru.update({'_rf_port': rf_port})                                   %}
   {%-   if ru.ru_type == 'sdr'                                                %}
   {%-     do ru_sdr_dict.update({len(dev_argv): ru})                          %}
       {#- XXX move to ru/sdr ?  #}

software/ors-amarisoft/amari/slap.jinja2

@@ -168,15 +168,15 @@
 {%-     endif                                                         %}
 {%-   endfor                                                          %}
 
-{#-   assign rf_port and rf tx/rx indices to RUs                      #}
-{%-   set rf_idx = namespace(tx=0, rx=0)                              %}
+{#-   assign RUs rf_port and tx/rx channel indices                    #}
+{%-   set rf_chan = namespace(tx=0, rx=0)                             %}
 {%-   for rf_port, (ru_ref, iru) in enumerate(iru_dict|dictsort)      %}
 {%-     set ru = iru['_']                                             %}
-{%-     do ru.update({'_rf_port':   rf_port,
-                      '_rf_idx_tx': rf_idx.tx,
-                      '_rf_idx_rx': rf_idx.rx})                       %}
-{%-     set rf_idx.tx = rf_idx.tx + ru.n_antenna_dl                   %}
-{%-     set rf_idx.rx = rf_idx.rx + ru.n_antenna_ul                   %}
+{%-     do ru.update({'_rf_port':    rf_port,
+                      '_rf_chan_tx': rf_chan.tx,
+                      '_rf_chan_rx': rf_chan.rx})                     %}
+{%-     set rf_chan.tx = rf_chan.tx + ru.n_antenna_dl                 %}
+{%-     set rf_chan.rx = rf_chan.rx + ru.n_antenna_ul                 %}
 {%-   endfor                                                          %}
 
 {%- endmacro                                                          %}

software/ors-amarisoft/config/enb.cfg

@@ -7,7 +7,7 @@
   // Radio Units
   rf_driver: {
       name: "sdr",
-      // _CELL1_a_ru 4T2R
+      // _CELL1_a_ru 4T2R  (sdr)
       args: "dev0=/dev/sdr0,dev1=/dev/sdr1",
       rx_antenna:"tx_rx",
       tdd_tx_mod: 1,
@@ -43,7 +43,7 @@
   // LTE cells
   cell_list: [
 
-        // CELL1_a
+        // CELL1_a  (_CELL1_a_ru)
         {
           rf_port:      0,
           n_antenna_dl: 4,
@@ -628,7 +628,7 @@
   ]
         },
 
-        // CELL1_b
+        // CELL1_b  (_CELL1_a_ru)
         {
           rf_port:      0,
           n_antenna_dl: 4,

software/ors-amarisoft/config/ue.cfg

@@ -10,8 +10,8 @@
   // Radio Units
   rf_driver: {
       name: "sdr",
-      // _UCELL1_ru 2T1R
-      // _UCELL2_ru 2T2R
+      // _UCELL1_ru 2T1R  (sdr)
+      // _UCELL2_ru 2T2R  (sdr)
       args: "dev0=/dev/sdr0,dev1=/dev/sdr2",
       rx_antenna:"tx_rx",
       tdd_tx_mod: 1,