Commit Graph
913 Commits
Author SHA1 Message Date
Melissa Elkadi 2a979f4e2f Merge branch 'eurecom-nfapi-nr-arch-mod' into episys/merge_nsa_w_develop 2021-08-13 10:27:30 -07:00
Melissa Elkadi 9b16c1d860 Merge branch 'eurecom-develop' into episys/merge_nsa_w_develop
At this point we are successfully able to build.
Additionally, we can run the scenario,
however, it does not pass. It seems that the gNB
is not connecting to the proxy correctly. Just
wanted to push the progress so far. FYI, the items
that had to be changed to correct the linking issues
were the following:

 - mac_rrc_data_ind_ue vs. nr_mac_rrc_data_ind_ue
 - rrc_data_req vs. nr_rrc_data_req
 - mac_rrc_data_req_ue vs. nr_mac_rrc_data_req_ue
 - rrc_data_req_ue vs. rrc_data_req_nr_ue
 - rrc_data_req vs. nr_rrc_data_req

The listed functions should be declard in the LTE/NR
UE directory depending on the functionality. Several
were mixed. i.e.: LTE functions being called in NR UE.

Also, removing siWindowLength, siWindowLength_int,
SIBType, SIBPeriod, and siPeriod_int from the NR UE RRC.
These variable were not used in the NR UE and are defined
for LTE only.

Lastly, in the NR_IF_Module.c of the NR UE, the global
variable def_dci_pdu_rel15 is not accessible. Need to
revisit this. For not it is commented out.
2021-08-11 10:23:42 -07:00
Raphael Defosseux 597f2b3e8f Merge remote-tracking branch 'origin/NR_new_ul_antennaports' into integration_2021_w32 2021-08-06 10:39:34 +02:00
francescomani 5c70aa96c4 Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures 2021-07-26 07:39:57 +02:00
francescomani de4676dde1 reworking UL antenna port definitions at gNB 2021-07-24 16:09:18 +02:00
francescomani bd816e5175 Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures 2021-07-23 13:51:41 +02:00
hardy 0b472dd9f9 Merge remote-tracking branch 'origin/nr_ue_remove_high_speed_flag' into integration_2021_wk30 2021-07-23 09:18:52 +02:00
hardy fad5fbda34 Merge remote-tracking branch 'origin/NR_CSIRS_tomerge' into integration_2021_wk30 2021-07-23 09:18:33 +02:00
francescomani 227529c129 Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures 2021-07-21 17:49:33 +02:00
francescomani bff2251242 Merge remote-tracking branch 'origin/develop' into NR_CSIRS_tomerge 2021-07-20 07:03:24 +02:00
rmagueta 6b028522bd Fix warning after merge 2021-07-19 14:22:00 +01:00
rmagueta 3ea6d6f878 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS-abs
# Conflicts:
#	openair1/PHY/INIT/nr_init_ru.c
2021-07-19 13:51:38 +01:00
Parminder Singh bb9c3ca173 ue->high_speed_flag is removed from UE channel estimation
- This flag is always set to 1, furthermore with multiple DMRS symbols
  configuration very recent DMRS containing symbol shall be for channel
  estimation.
2021-07-16 09:36:36 +02:00
Thomas Schlichter c3482e376d Merge remote-tracking branch 'origin/develop' into nr-dl-mimo-2layer 2021-07-05 16:25:26 +02:00
francescomani a49ebe249b Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures 2021-07-01 16:38:41 +02:00
francescomani 38ad4bbfbc Merge remote-tracking branch 'origin/develop' into NR_CSIRS_tomerge 2021-07-01 15:23:28 +02:00
rmagueta 160cb0b930 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS-lts2
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	cmake_targets/build_oai
#	cmake_targets/tools/build_helper
#	executables/nr-gnb.c
#	openair1/PHY/INIT/nr_init_ru.c
#	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
#	openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
#	openair2/F1AP/f1ap_du_rrc_message_transfer.c
#	openair2/F1AP/f1ap_du_rrc_message_transfer.h
#	openair2/F1AP/f1ap_du_task.c
#	openair2/GNB_APP/gnb_app.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
#	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
#	openair2/RRC/LTE/rrc_eNB_GTPV1U.c
#	openair2/RRC/NR/L2_nr_interface.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR/rrc_gNB_NGAP.c
#	openair2/RRC/NR_UE/rrc_UE.c
#	openair3/NAS/NR_UE/nr_nas_msg_sim.c
#	openair3/ocp-gtpu/gtp_itf.cpp
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-06-30 17:00:30 +01:00
sfn 3613927bc8 Extend rfsimulator to support 2 layers for DL transmission from cm line with option --l 1 or 2 2021-06-24 11:08:05 +02:00
rmagueta e72a6798c1 Change some LOG levels 2021-06-05 14:20:39 +01:00
Eurecom d249c1ef80 testing with 2x2 and 4x4 with N310, small modifications in nr_ru_procedures and usrp_lib.cpp for multiple antennas 2021-06-01 09:48:20 +02:00
Eurecom ac4670990c handling for UL failure. added do_precoding flag to nr-ru procedures. testing with 2x2 N310. 2021-05-30 23:14:12 +02:00
francescomani a1e3b5476b Merge remote-tracking branch 'origin/develop' into NR_CSIRS_tomerge 2021-05-27 11:52:12 +02:00
Thomas Schlichter 71a5ae2454 NR_UE: further cleanup of DMRS configuration 2021-05-20 16:24:11 +02:00
Thomas Schlichter ff5eb3e657 Merge remote-tracking branch 'origin/develop' into nr-dl-mimo-2layer 2021-05-19 11:42:04 +00:00
francescomani cd9a8f963f moving pucch functions for harq at MAC (version still to be tested) 2021-05-18 11:04:10 +02:00
rmagueta cf605f4c77 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	cmake_targets/build_oai
#	openair1/PHY/INIT/nr_init_ru.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/COMMON/platform_constants.h
#	openair2/ENB_APP/enb_config.c
#	openair2/F1AP/f1ap_cu_interface_management.c
#	openair2/F1AP/f1ap_cu_rrc_message_transfer.c
#	openair2/F1AP/f1ap_cu_ue_context_management.c
#	openair2/F1AP/f1ap_du_interface_management.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/RRC/LTE/rrc_eNB.c
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR_UE/rrc_UE.c
2021-05-17 01:36:39 +01:00
Thomas Schlichter 4db9c78450 fix PDSCH DMRS configuration type 2 2021-05-06 20:27:56 +02:00
rmagueta f59dcb9b1a Change LOG levels 2021-05-05 14:25:46 +01:00
Laurent THOMAS 04b28b4518 fixes from testing 2021-04-30 16:47:40 +02:00
francescomani 773ebbb63b Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS 2021-04-22 14:36:32 +02:00
rmagueta 131cef2b6b Fix build warnings 2021-04-15 22:59:35 +01:00
Raymond Knopp 0b59ce4faf Merge remote-tracking branch 'origin/develop' into oairu 2021-04-07 15:50:46 +02:00
Raymond Knopp 2473a25ca1 Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
2021-04-06 16:38:37 +02:00
francescomani 5498e2b84a Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS 2021-04-01 09:18:23 +02:00
Raymond Knopp 2913757461 Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
	executables/nr-softmodem.c
	executables/nr-ue.c
	openair2/GNB_APP/gnb_app.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2021-03-31 03:14:48 +02:00
francescomani 579f0290f6 Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB 2021-03-30 15:10:28 +02:00
francescomani d65af6d8ca Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB 2021-03-30 09:35:18 +02:00
Raymond Knopp df05672a4c Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
	openair2/GNB_APP/gnb_config.c
	openair2/GNB_APP/gnb_paramdef.h
	openair2/LAYER2/NR_MAC_UE/config_ue.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_nsa.c
2021-03-30 04:48:51 +02:00
Raymond Knopp 707c20dd74 changes in UE to start configuration from Initial/MIB/SIB1/RRCSetup 2021-03-30 03:44:58 +02:00
hardy ddf3f9e88c Merge remote-tracking branch 'origin/NR_FAPI_beamindex_SSB_RO' into integration_2021_wk13_a 2021-03-29 10:02:51 +02:00
Raymond Knopp 08b781ebfe Merge remote-tracking branch 'origin/develop' into oairu 2021-03-25 06:44:11 +01:00
francescomani 70a1556c51 Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS 2021-03-19 18:50:59 +01:00
Thomas Schlichter dade64ea43 Merge remote-tracking branch 'develop' into NR_DL_MIMO 2021-03-19 11:18:02 +01:00
francescomani f659a76f43 Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO 2021-03-19 10:06:20 +01:00
Thomas Schlichter 5d6863ddd2 NR_UE: fix memory allocations in phy_init_nr_ue__PDSCH() 2021-03-17 17:01:42 +01:00
Thomas Schlichter b7ef903cb4 Merge remote-tracking branch 'develop' into NR_10MHz 2021-03-16 16:13:17 +01:00
Thomas Schlichter 3152df445e Merge remote-tracking branch 'develop' into NR_DL_MIMO 2021-03-16 13:37:07 +01:00
hardy ee398c7610 solved merge conflicts related to CI scripts 2021-03-16 11:55:23 +01:00
Raymond Knopp 94085a41cd Merge remote-tracking branch 'origin/develop' into oairu 2021-03-16 08:07:16 +01:00
francescomani 13a561104b Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB 2021-03-15 10:23:06 +01:00