Commit 0cd250bc authored by Elena Lukashova's avatar Elena Lukashova

1. Fixing remaining bugs form merge. Both simulators pass all the test.

2. Adding dlsch_encoding_SIC, where the fisrt argument is UE structure.
3. Adding general test cases for dlsim_tm4 simulator. 015110.
parent d1d4bb9f
This diff is collapsed.
......@@ -121,6 +121,18 @@ int32_t dlsch_encoding(PHY_VARS_eNB *eNB,
time_stats_t *te_stats,
time_stats_t *i_stats);
int32_t dlsch_encoding_SIC(PHY_VARS_UE *ue,
uint8_t *a,
uint8_t num_pdcch_symbols,
LTE_eNB_DLSCH_t *dlsch,
int frame,
uint8_t subframe,
time_stats_t *rm_stats,
time_stats_t *te_stats,
time_stats_t *i_stats);
/** \fn dlsch_encoding_2threads(PHY_VARS_eNB *eNB,
uint8_t *input_buffer,
uint8_t num_pdcch_symbols,
......
......@@ -3089,11 +3089,12 @@ int main(int argc, char **argv)
}
start_meas(&eNB->dlsch_encoding_stats);
if (dlsch_encoding(((TB==0) ? input_buffer0[k] : input_buffer1[k]),
&eNB->frame_parms,
if (dlsch_encoding(eNB,
(TB==0) ? input_buffer0[k] : input_buffer1[k],
num_pdcch_symbols,
eNB->dlsch[k][TB],
0,subframe,
0,
subframe,
&eNB->dlsch_rate_matching_stats,
&eNB->dlsch_turbo_encoding_stats,
&eNB->dlsch_interleaving_stats)<0)
......@@ -4058,8 +4059,8 @@ int main(int argc, char **argv)
UE->dlsch_eNB[eNB_id]->rnti = UE->dlsch[eNB_id][0]->rnti;
UE->dlsch_eNB[eNB_id]->current_harq_pid = UE->dlsch[eNB_id][0]->current_harq_pid;
dlsch_encoding(input_buffer0[0], //UE->dlsch[eNB_id][0]->harq_processes[PHY_vars_UE->dlsch_ue[eNB_id][0]->current_harq_pid]->b,
&UE->frame_parms,
dlsch_encoding_SIC(UE,
input_buffer0[0], //UE->dlsch[eNB_id][0]->harq_processes[PHY_vars_UE->dlsch_ue[eNB_id][0]->current_harq_pid]->b,,
num_pdcch_symbols,
UE->dlsch_eNB[eNB_id],
0,
......
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