Commit 8dc51127 authored by Xiwen JIANG's avatar Xiwen JIANG

card can be initialized in octave

parent b28ae819
...@@ -797,7 +797,16 @@ int openair0_config(openair0_config_t *openair0_cfg, int UE_flag) ...@@ -797,7 +797,16 @@ int openair0_config(openair0_config_t *openair0_cfg, int UE_flag)
if (!openair0_cfg) { if (!openair0_cfg) {
printf("Error, openair0_cfg is null!!\n"); printf("Error, openair0_cfg is null!!\n");
return(-1); return(-1);
} else if (openair0_cfg[0].tdd_recip_calib == 1) { }
/* device specific */
for (card=0; card<openair0_num_detected_cards; card++) {
openair0_cfg[card].iq_txshift = 4;//shift
openair0_cfg[card].iq_rxrescale = 15;//rescale iqs
}
if (openair0_cfg[0].tdd_recip_calib == 1) {
printf("Warning, doing TDD reciprocity calibration, configuration has been done in Octave!!\n"); printf("Warning, doing TDD reciprocity calibration, configuration has been done in Octave!!\n");
return(-1); return(-1);
} }
...@@ -820,10 +829,6 @@ int openair0_config(openair0_config_t *openair0_cfg, int UE_flag) ...@@ -820,10 +829,6 @@ int openair0_config(openair0_config_t *openair0_cfg, int UE_flag)
else else
p_exmimo_config->framing.multicard_syncmode=SYNCMODE_SLAVE; p_exmimo_config->framing.multicard_syncmode=SYNCMODE_SLAVE;
/* device specific */
openair0_cfg[card].iq_txshift = 4;//shift
openair0_cfg[card].iq_rxrescale = 15;//rescale iqs
if (openair0_cfg[card].sample_rate==30.72e6) { if (openair0_cfg[card].sample_rate==30.72e6) {
resampling_factor = 0; resampling_factor = 0;
......
...@@ -573,10 +573,9 @@ static inline int rxtx(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc, char *thread_nam ...@@ -573,10 +573,9 @@ static inline int rxtx(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc, char *thread_nam
start_meas(&softmodem_stats_rxtx_sf); start_meas(&softmodem_stats_rxtx_sf);
// **************************************** // ****************************************
// TDD workaround // TDD workaround for EXMIMO card
//if ((eNB->rfdevice.type == EXMIMO_DEV) && (eNB->frame_parms.frame_type == TDD) && subframe_select(&eNB->frame_parms,proc->subframe_rx)==SF_UL) {
if ((eNB->rfdevice.openair0_cfg->duplex_mode == duplex_mode_TDD_workaround) && (eNB->frame_parms.frame_type == TDD) && subframe_select(&eNB->frame_parms,proc->subframe_rx)==SF_UL) { if ((eNB->rfdevice.openair0_cfg->duplex_mode == duplex_mode_TDD_workaround) && (eNB->frame_parms.frame_type == TDD) && subframe_select(&eNB->frame_parms,proc->subframe_rx)==SF_UL) {
remove_1_4_fs(eNB,proc->subframe_rx<<1); // TDD workaround for EXMIMO2 card remove_1_4_fs(eNB,proc->subframe_rx<<1);
remove_1_4_fs(eNB,1+(proc->subframe_rx<<1)); remove_1_4_fs(eNB,1+(proc->subframe_rx<<1));
} }
......
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