Commit 33994c2e authored by Robert Schmidt's avatar Robert Schmidt

Increase oai0_config maximum antennas to 8

Certain FH 7.2 use cases require 8 antennas, so make room to propagate
this down.
parent fcdacf3b
...@@ -898,6 +898,9 @@ static void fill_rf_config(RU_t *ru, char *rf_config_file) ...@@ -898,6 +898,9 @@ static void fill_rf_config(RU_t *ru, char *rf_config_file)
cfg->configFilename = rf_config_file; cfg->configFilename = rf_config_file;
AssertFatal(ru->nb_tx > 0 && ru->nb_tx <= 8, "openair0 does not support more than 8 antennas\n");
AssertFatal(ru->nb_rx > 0 && ru->nb_rx <= 8, "openair0 does not support more than 8 antennas\n");
cfg->Mod_id = 0; cfg->Mod_id = 0;
cfg->num_rb_dl=N_RB; cfg->num_rb_dl=N_RB;
cfg->tx_num_channels=ru->nb_tx; cfg->tx_num_channels=ru->nb_tx;
......
...@@ -226,31 +226,31 @@ typedef struct openair0_config { ...@@ -226,31 +226,31 @@ typedef struct openair0_config {
//! tx daughter card //! tx daughter card
char* tx_subdev; char* tx_subdev;
//! \brief RX base addresses for mmapped_dma //! \brief RX base addresses for mmapped_dma
int32_t *rxbase[4]; int32_t *rxbase[8];
//! \brief RX buffer size for direct access //! \brief RX buffer size for direct access
int rxsize; int rxsize;
//! \brief TX base addresses for mmapped_dma or direct access //! \brief TX base addresses for mmapped_dma or direct access
int32_t *txbase[4]; int32_t *txbase[8];
//! \brief Center frequency in Hz for RX. //! \brief Center frequency in Hz for RX.
//! index: [0..rx_num_channels[ //! index: [0..rx_num_channels[
double rx_freq[4]; double rx_freq[8];
//! \brief Center frequency in Hz for TX. //! \brief Center frequency in Hz for TX.
//! index: [0..rx_num_channels[ !!! see lte-ue.c:427 FIXME iterates over rx_num_channels //! index: [0..rx_num_channels[ !!! see lte-ue.c:427 FIXME iterates over rx_num_channels
double tx_freq[4]; double tx_freq[8];
double tune_offset; double tune_offset;
//! \brief memory //! \brief memory
//! \brief Pointer to Calibration table for RX gains //! \brief Pointer to Calibration table for RX gains
rx_gain_calib_table_t *rx_gain_calib_table; rx_gain_calib_table_t *rx_gain_calib_table;
//! mode for rxgain (ExpressMIMO2) //! mode for rxgain (ExpressMIMO2)
rx_gain_t rxg_mode[4]; rx_gain_t rxg_mode[8];
//! \brief Gain for RX in dB. //! \brief Gain for RX in dB.
//! index: [0..rx_num_channels] //! index: [0..rx_num_channels]
double rx_gain[4]; double rx_gain[8];
//! \brief Gain offset (for calibration) in dB //! \brief Gain offset (for calibration) in dB
//! index: [0..rx_num_channels] //! index: [0..rx_num_channels]
double rx_gain_offset[4]; double rx_gain_offset[8];
//! gain for TX in dB //! gain for TX in dB
double tx_gain[4]; double tx_gain[8];
//! RX bandwidth in Hz //! RX bandwidth in Hz
double rx_bw; double rx_bw;
//! TX bandwidth in Hz //! TX bandwidth in Hz
...@@ -262,7 +262,7 @@ typedef struct openair0_config { ...@@ -262,7 +262,7 @@ typedef struct openair0_config {
//! Manual SDR IP address //! Manual SDR IP address
char *sdr_addrs; char *sdr_addrs;
//! Auto calibration flag //! Auto calibration flag
int autocal[4]; int autocal[8];
//! rf devices work with x bits iqs when oai have its own iq format //! rf devices work with x bits iqs when oai have its own iq format
//! the two following parameters are used to convert iqs //! the two following parameters are used to convert iqs
int iq_txshift; int iq_txshift;
...@@ -295,9 +295,9 @@ typedef struct openair0_config { ...@@ -295,9 +295,9 @@ typedef struct openair0_config {
//! NR scs for raster //! NR scs for raster
int nr_scs_for_raster; int nr_scs_for_raster;
//! Core IDs for RX FH //! Core IDs for RX FH
int rxfh_cores[4]; int rxfh_cores[8];
//! Core IDs for TX FH //! Core IDs for TX FH
int txfh_cores[4]; int txfh_cores[8];
//! select the GPIO control method //! select the GPIO control method
gpio_control_t gpio_controller; gpio_control_t gpio_controller;
//! this interface is reused for split 7, so split 7 options provided below //! this interface is reused for split 7, so split 7 options provided below
......
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