fixed bug in lte-softmodem (messup with CC_id), fixed phy_scope, added support for multiple bandwidth in openair0_lib, minor log updates

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5721 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Florian Kaltenberger
2014-08-14 13:44:28 +00:00
parent 263571b096
commit 7e6b4ccdad
6 changed files with 33 additions and 20 deletions
@@ -255,7 +255,7 @@ int openair0_device_init(openair0_device *device, openair0_config_t *openair0_cf
// Initialize card
int ret;
int ant;
int resampling_factor=2;
ret = openair0_open();
@@ -292,11 +292,23 @@ int openair0_device_init(openair0_device *device, openair0_config_t *openair0_cf
p_exmimo_config->framing.eNB_flag = 1;//!UE_flag;
p_exmimo_config->framing.tdd_config = DUPLEXMODE_FDD + TXRXSWITCH_LSB;
if (openair0_cfg->sample_rate==30.72e6)
resampling_factor = 0;
else if (openair0_cfg->sample_rate==15.36e6)
resampling_factor = 1;
else if (openair0_cfg->sample_rate==7.68e6)
resampling_factor = 2;
else {
printf("Sampling rate not supported, using default 7.68MHz");
resampling_factor = 2;
}
#if (BOARD_SWREV_CNTL2>=0x0A)
for (ant=0; ant<4; ant++)
p_exmimo_config->framing.resampling_factor[ant] = 2;
p_exmimo_config->framing.resampling_factor[ant] = resampling_factor;
#else
p_exmimo_config->framing.resampling_factor = 2;
p_exmimo_config->framing.resampling_factor = resampling_factor;
#endif
if (!openair0_cfg) {
@@ -84,6 +84,6 @@ int openair0_stop(int card);
int openair0_stop_without_reset(int card);
// return the DAQ block counter
unsigned int *openair0_daq_cnt();
unsigned int *openair0_daq_cnt(void);
#endif