Conflicts:
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	executables/nr-ue.c
	openair1/PHY/INIT/nr_init.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch.h
	openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
	openair1/PHY/defs_gNB.h
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SCHED_NR_UE/defs.h
	openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair1/SIMULATION/NR_PHY/pucchsim.c
	openair1/SIMULATION/NR_PHY/ulschsim.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Integration develop nr 2019w28

See merge request oai/openairinterface5g!633

adding support 3/4 sampling for 40MHz (in that case OFDM symbols are not necessarily aligned on 32byte -> segfault on AVX2 architectures)

* To run gNB : sudo ./nr-softmodem -E -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpb210.conf
* To run UE : sudo ./nr-uesoftmodem -E --numerology 1 -r 106 --phy-test -C 3510000000 --ue-rxgain 90 -d
* We had done a wired test with 40dB attenuator in between gNB and nrUE.

Nr ue fapi improvements

See merge request oai/openairinterface5g!618

added PRACH UE Procedures into prachsim

See merge request oai/openairinterface5g!616

however, I had to hardcode the parameters for the PUSCH in nr_ulsim as the fapi interface still has bugs.

This reverts commit 3574481b.

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Integration develop nr 2019w24

See merge request oai/openairinterface5g!615