Conflicts:
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	executables/nr-ru.c
	executables/nr-softmodem.c
	nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
	openair1/PHY/INIT/nr_init.c
	openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
	openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
	openair1/PHY/TOOLS/Makefile
	openair1/PHY/TOOLS/lte_dfts.c
	openair1/PHY/TOOLS/nr_phy_scope.c
	openair1/SCHED_NR/phy_procedures_nr_common.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair1/SIMULATION/NR_PHY/dlschsim.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair1/SIMULATION/NR_PHY/pbchsim.c
	openair1/SIMULATION/NR_PHY/pucchsim.c
	openair1/SIMULATION/NR_PHY/ulschsim.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	openair2/COMMON/rrc_messages_types.h
	openair2/GNB_APP/RRC_nr_paramsvalues.h
	openair2/GNB_APP/gnb_config.c
	openair2/GNB_APP/gnb_paramdef.h
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
	openair2/NR_PHY_INTERFACE/NR_IF_Module.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/MESSAGES/asn1_msg.h

fixing a bug in the allocation of the UE HARQ structures that was causing a segfault. Fixing some compiler warnings

Resolve "Problems transmitting data via NR-PDSCH"

See merge request oai/openairinterface5g!658

hotfix: replacing msg with printf in unitary simulators (msg(...) was replaced with LOG_D(PHY,...) but it was used before log was initialized)

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

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>

- changed Mdlharq to Mlimit when comparing with the round number
- Not incrementing the HARQ round in case of err_flag = 1, until HARQ is implemented
- Changed MAX_LDPC_ITERATIONS to 5 from 4 (provided better performance)

- Setting the payload to random data instead of all zeros at the Tx side

- Handling "nb_symb_sch" equal to 0 in "phy_procedures_nrUE_RX" which prevents
  entering "nr_ue_pdsch_procedures"

- Handling symbol loop problem in "nr_ue_pdsch_procedures"

- Handling resource block loop problem in "nr_rx_pdsch"

Develop nr merge

See merge request oai/openairinterface5g!588

Merge branch 'develop-nr-merge' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr-merge

Usrp ref locked

See merge request oai/openairinterface5g!657

Merge branch 'develop-nr-merge' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr-merge

For whatever reason, ru->frame_parms was NULL and the RRU crashed.
Let's allocated memory.

Also, don't do fp = ru->frame_parms in ru_thread, it seems that it
takes the value before allocation (so: NULL) and the code crashes
later on.

Maybe it's not the correct solution. To be refined at some point.

1. NR RU was using wrong config file descriptor. It should be the same as for the LTE RU and we should remove the NR RU config file descriptor (todo)
2. NR RU was calling feptx_prec from LTE RU procedures, which it should not. In the older versions this function didn't do anything anyway as there was a check on num_eNB, which is 0 for gNB. Now NR RU is not calling this function at all, but we have to write such a function for NR RU (todo)

Merge branch 'develop-nr-merge' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nr-merge

Integration develop nr 2019w32

See merge request oai/openairinterface5g!656

Merge remote-tracking branch 'origin/update-to-2019-march-june-release' into integration_develop-nr_2019w32