maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for TDD L2 FAPI simulator.

Browse Source
This commit is contained in:
Y_Tomita
2018-10-25 22:10:57 +09:00
parent b60e861b14
commit dcfe6b32e2
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/RT/USER/lte-ue.c
+7 -5
View File
@@ -94,7 +94,7 @@ extern int oai_nfapi_rx_ind(nfapi_rx_indication_t *ind);
extern int multicast_link_write_sock(int groupP, char *dataP, uint32_t sizeP); extern int multicast_link_write_sock(int groupP, char *dataP, uint32_t sizeP);
extern int simL1flag; extern int simL1flag;
extern uint16_t sf_ahead;
//extern int tx_req_UE_MAC1(); //extern int tx_req_UE_MAC1();
void ue_stub_rx_handler(unsigned int, char *); void ue_stub_rx_handler(unsigned int, char *);
@@ -379,7 +379,7 @@ void init_UE_stub_single_thread(int nb_inst,int eMBMS_active, int uecap_xer_in,
for (inst=0;inst<nb_inst;inst++) { for (inst=0;inst<nb_inst;inst++) {
LOG_I(PHY,"Initializing memory for UE instance %d (%p)\n",inst,PHY_vars_UE_g[inst]); LOG_I(PHY,"Initializing memory for UE instance %d (%p)\n",inst,PHY_vars_UE_g[inst]);
PHY_vars_UE_g[inst][0] = init_ue_vars(NULL,inst,0); // PHY_vars_UE_g[inst][0] = init_ue_vars(NULL,inst,0);
} }
init_timer_thread(); init_timer_thread();
init_UE_single_thread_stub(nb_inst); init_UE_single_thread_stub(nb_inst);
@@ -1021,12 +1021,14 @@ static void *UE_phy_stub_single_thread_rxn_txnp4(void *arg) {
proc->subframe_rx=timer_subframe; proc->subframe_rx=timer_subframe;
proc->frame_rx = timer_frame; proc->frame_rx = timer_frame;
proc->subframe_tx=(timer_subframe+4)%10;
proc->frame_tx = proc->frame_rx + (proc->subframe_rx>5?1:0); // FDD and TDD tx timing settings.
proc->subframe_tx=(timer_subframe+sf_ahead)%10;
proc->frame_tx = proc->frame_rx + (proc->subframe_rx>(9-sf_ahead)?1:0);
//oai_subframe_ind(proc->frame_rx, proc->subframe_rx); //oai_subframe_ind(proc->frame_rx, proc->subframe_rx);
oai_subframe_ind(timer_frame, timer_subframe); oai_subframe_ind(proc->frame_tx,proc->subframe_tx);
//Guessing that the next 4 lines are not needed for the phy_stub mode. //Guessing that the next 4 lines are not needed for the phy_stub mode.
/*initRefTimes(t2); /*initRefTimes(t2);
targets/RT/USER/lte-uesoftmodem.c
+6 -4
View File
@@ -117,7 +117,7 @@ int nfapi_sync_var=-1; //!< protected by mutex \ref nfapi_sync_mutex
uint8_t nfapi_mode = 0; uint8_t nfapi_mode = 0;
uint16_t sf_ahead=2; uint16_t sf_ahead=2;
int tddflag;
char *emul_iface; char *emul_iface;
@@ -498,7 +498,7 @@ extern int16_t dlsch_demod_shift;
static void get_options(unsigned int *start_msc) { static void get_options(unsigned int *start_msc) {
int CC_id; int CC_id;
int tddflag, nonbiotflag; int nonbiotflag;
char *loopfile=NULL; char *loopfile=NULL;
int dumpframe; int dumpframe;
uint32_t online_log_messages; uint32_t online_log_messages;
@@ -565,8 +565,10 @@ static void get_options(unsigned int *start_msc) {
UE_scan=0; UE_scan=0;
if (tddflag > 0) { if (tddflag > 0) {
for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
frame_parms[CC_id]->frame_type = TDD; frame_parms[CC_id]->frame_type = TDD;
frame_parms[CC_id]->tdd_config = tddflag;
}
} }
if (frame_parms[0]->N_RB_DL !=0) { if (frame_parms[0]->N_RB_DL !=0) {