Commit 47508cc2 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent e7a7ef78
NOTE: lte_cell -> forces enb_id to be defined NOTE: lte_cell -> forces enb_id to be defined
NOTE: nr cell -> ----//---- gnb_id + gnb_id_bits NOTE: nr cell -> ----//---- gnb_id + gnb_id_bits
XXX link to trx? XXX link to rrh
XXX link to rrh? (then it is rrh who links to trx, not cell)
"n_antenna_dl XXX -> rrh ?" "n_antenna_dl XXX -> rrh ?"
"n_antenna_ul XXX -> rrh ?" "n_antenna_ul XXX -> rrh ?"
"cpri_rx_delay"
"cpri_tx_delay" "tx_gain" -> per rrh (docs says it is "per channel")
"cpri_tx_dbm" "rx_gain" -> per rrh ----//----
"cpri_port_number"
"tx_gain"
"rx_gain"
{ {
"title": "Cell", "title": "Cell",
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
{% endif %} {% endif %}
log_filename: "{{ directory['log'] }}/enb.log", log_filename: "{{ directory['log'] }}/enb.log",
# XXX <- trx_X
{% if slapparameter_dict.get('rrh', 'ORS') == "Lopcomm ORAN" %} {% if slapparameter_dict.get('rrh', 'ORS') == "Lopcomm ORAN" %}
rf_driver: { rf_driver: {
{%- if slapparameter_dict.get('disable_sdr', False) %} {%- if slapparameter_dict.get('disable_sdr', False) %}
...@@ -140,6 +141,7 @@ ...@@ -140,6 +141,7 @@
enb_id: {{ slapparameter_dict.get('enb_id', '0x1A2D0') }}, enb_id: {{ slapparameter_dict.get('enb_id', '0x1A2D0') }},
# <- cell_list
cell_list: [ cell_list: [
{%- for i, k in enumerate(cell_list) %} {%- for i, k in enumerate(cell_list) %}
{%- if i == 0 -%} {%- if i == 0 -%}
...@@ -147,7 +149,7 @@ ...@@ -147,7 +149,7 @@
{%- else -%} {%- else -%}
, { , {
{%- endif %} {%- endif %}
rf_port: {{ i }}, rf_port: {{ i }}, # <-> rrh
cell_id: {{ cell_list[k].get('cell_id', slapparameter_dict.get('cell_id', '0x0' + i|string)) }}, 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')) }}, tac: {{ cell_list[k].get('tac', slapparameter_dict.get('tac', '0x0001')) }},
n_id_cell: {{ cell_list[k].get('pci', slapparameter_dict.get('pci', i)) }}, n_id_cell: {{ cell_list[k].get('pci', slapparameter_dict.get('pci', i)) }},
...@@ -193,12 +195,12 @@ ...@@ -193,12 +195,12 @@
"00101", "00101",
{% endif %} {% endif %}
], ],
n_antenna_dl: N_ANTENNA_DL, n_antenna_dl: N_ANTENNA_DL, # XXX -> cell
n_antenna_ul: N_ANTENNA_UL, n_antenna_ul: N_ANTENNA_UL, # XXX -> cell
{% if slapparameter_dict.get('rrh', 'ORS') == "ORS" %} {% if slapparameter_dict.get('rrh', 'ORS') == "ORS" %}
manual_ref_signal_power: true, manual_ref_signal_power: true,
{% endif %} {% endif %}
#if TDD == 1 #if TDD == 1 # XXX -> cell
uldl_config: {{ tdd_config }}, uldl_config: {{ tdd_config }},
sp_config: 7, sp_config: 7,
#endif #endif
...@@ -220,7 +222,7 @@ ...@@ -220,7 +222,7 @@
}, },
], ],
#if N_RB_DL == 6 #if N_RB_DL == 6 # XXX -> cell
si_coderate: 0.30, si_coderate: 0.30,
#else #else
si_coderate: 0.20, si_coderate: 0.20,
...@@ -229,7 +231,7 @@ ...@@ -229,7 +231,7 @@
n_symb_cch: 0, n_symb_cch: 0,
pdsch_dedicated: { pdsch_dedicated: { # XXX -> cell
#if N_ANTENNA_DL == 4 #if N_ANTENNA_DL == 4
p_a: -6, p_a: -6,
#elif N_ANTENNA_DL == 2 #elif N_ANTENNA_DL == 2
...@@ -240,13 +242,13 @@ ...@@ -240,13 +242,13 @@
p_b: -1, p_b: -1,
}, },
#if N_RB_DL == 6 #if N_RB_DL == 6 # XXX -> cell
pdcch_format: 1, pdcch_format: 1,
#else #else
pdcch_format: 2, pdcch_format: 2,
#endif #endif
#if N_RB_DL == 6 #if N_RB_DL == 6 # XXX -> cell
prach_config_index: 15, prach_config_index: 15,
#else #else
prach_config_index: 4, prach_config_index: 4,
...@@ -256,7 +258,7 @@ ...@@ -256,7 +258,7 @@
pucch_dedicated: { pucch_dedicated: {
n1_pucch_sr_count: 11, n1_pucch_sr_count: 11,
cqi_pucch_n_rb: 1, cqi_pucch_n_rb: 1,
#if TDD == 1 #if TDD == 1 # XXX -> cell
tdd_ack_nack_feedback_mode: "multiplexing", /* TDD only */ tdd_ack_nack_feedback_mode: "multiplexing", /* TDD only */
#endif #endif
}, },
...@@ -271,7 +273,7 @@ ...@@ -271,7 +273,7 @@
pusch_msg3_mcs: 0, pusch_msg3_mcs: 0,
#if N_RB_DL == 6 #if N_RB_DL == 6 # XXX -> cell
initial_cqi: 5, initial_cqi: 5,
#else #else
initial_cqi: 3, initial_cqi: 3,
...@@ -284,12 +286,12 @@ ...@@ -284,12 +286,12 @@
cqi_period: 40, cqi_period: 40,
#if N_ANTENNA_DL >= 2 #if N_ANTENNA_DL >= 2 # XXX -> cell
m_ri: 8, m_ri: 8,
transmission_mode: 3, transmission_mode: 3,
#endif #endif
srs_dedicated: { srs_dedicated: { # XXX -> cell
#if N_RB_DL == 6 #if N_RB_DL == 6
srs_bandwidth_config: 7, srs_bandwidth_config: 7,
srs_bandwidth: 1, srs_bandwidth: 1,
...@@ -345,7 +347,7 @@ ...@@ -345,7 +347,7 @@
} }
], ],
#if defined(TDD) && TDD == 1 #if defined(TDD) && TDD == 1 XXX -> cell
#define T_REORDERING 65 #define T_REORDERING 65
#else #else
#define T_REORDERING 35 #define T_REORDERING 35
......
args: "dev0=/dev/sdr1,dev1=/dev/sdr2,dev2=/dev/sdr0"
args: "dev0=/dev/sdr1@0"
sample_hw_fmt
rx_antenna: auto/tx_rx, rx
sync: none / internal / gps / external
clock: internal / external
cpri_mult: []int per card
cpri_mapping: [](standard|hw|spread) per card
fast_cm_pointer: []int per card
ifname: []ifname per card
vss_data []...
cpri_rx_delay: []int
cpri_tx_delay: []int
cpri_tx_dbm: []float
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment