.

software/ors-amarisoft/cell-input-schema.json

@@ -2,8 +2,6 @@ NOTE: lte_cell -> forces enb_id to be defined
 NOTE: nr cell  -> ----//---- gnb_id + gnb_id_bits
 
 XXX link to rrh
-"n_antenna_dl XXX -> rrh ?"
-"n_antenna_ul XXX -> rrh ?"
 
 "tx_gain" -> per rrh  (docs says it is "per channel")
 "rx_gain" -> per rrh  ----//----

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

@@ -16,10 +16,6 @@
 
 
 
-# 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']) }}
-
 {
 {% if slapparameter_dict.get('log_phy_debug', False) %}
   log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=debug,file.rotate=1G,file.path=/dev/null",
@@ -139,10 +135,11 @@
   cell_list: [
 {%- for i, cell in enumerate(cell_list) %}
 {%-   if cell['cell_type'] == 'lte' %}
+        XXX set rrh = cell.rrh  + dereference if needed
         {
           rf_port: XXX get from rrh,
-          n_antenna_dl: N_ANTENNA_DL,         # XXX from rrh
-          n_antenna_ul: N_ANTENNA_UL,         # XXX from rrh
+          n_antenna_dl: {{ rrh['n_antenna_dl' }},
+          n_antenna_ul: {{ rrh['n_antenna_ul' }},
 
           cell_id:    {{ cell['cell_id'] }},
           tac:        {{ cell['tac'] }},