Commit Graph
5 Commits
Author SHA1 Message Date
Elena_Lukashova b98bb25fba Merge branch 'feature-60-tm4-fork' into feature-59-tm4
1. TM4 works on dlsim_tm4.c with full HARQ support for both PIA and SIC.
2017-01-27 10:36:10 +01:00
Elena_Lukashova e88561e90d copying dlsim.c to dlsim_tm4.c 2017-01-26 10:51:29 +01:00
Elena_Lukashova 60eddd2c8f Fixing write_output arguments in dlsim_tm4.c 2017-01-25 17:42:04 +01:00
Elena_Lukashova a33a3ead22 1.Fixing the bug in lte_ue_measuments.c for rank indicator.
2. Fixing the arguments in the dump_dlsch2.
2017-01-25 17:21:56 +01:00
Florian Kaltenberger 3e81e8c86b Merge remote-tracking branch 'origin/develop' into feature-59-tm4
Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/PHY/LTE_TRANSPORT/proto.h
	openair1/PHY/MODULATION/slot_fep.c
	openair1/PHY/TOOLS/lte_phy_scope.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SIMULATION/LTE_PHY/dlsim.c
2016-10-06 21:56:06 +02:00