Commit Graph
875 Commits
Author SHA1 Message Date
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
frtabu 98c354fedd Set path for libconfig include directive, so that all config files could be located in the same directory. minor fixes in softmodem-common 2021-03-15 23:26:09 +01:00
luis_pereira87 fd9f2b8fe7 Build errors resolved 2021-03-15 17:44:23 +00:00
luis_pereira87 5ab73a228f Merge remote-tracking branch 'origin/NR_SA_F1AP_RFSIMULATOR_w5GCN' into develop-SA-CBRA-CUDU
# Conflicts:
#	executables/nr-softmodem.c
#	executables/nr-uesoftmodem.c
#	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/NR_MAC_gNB/main.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
#	openair2/RRC/NR_UE/rrc_UE.c
2021-03-15 12:44:16 +00:00
frtabu d118e7e60b Merge branch 'sim-channels' of https://gitlab.eurecom.fr/oai/openairinterface5g into sim-channels 2021-03-15 12:53:36 +01:00
frtabu 8ad4895f55 Add common option telnetclt 2021-03-15 12:51:49 +01:00
francescomani dd1b8b64cf tentative fix for RC.gNB[inst] allocation 2021-03-12 13:15:48 +01:00
He Shanyun 8965dd782b Merge remote-tracking branch 'remotes/origin/develop_SA_CUDU_rfsim_with_5gc' into integration_w5GC
Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2021-03-11 14:39:36 +09:00
Remi Hardy 51c55f6f6a Merge remote-tracking branch 'origin/gnb-threadpool' into integration_2021_wk10 2021-03-09 16:13:09 +01:00
matzakos 906fd2b68f Merge branch NR_SA_F1AP_RFSIMULATOR3 into NR_SA_F1AP_5GRECORDS 2021-03-09 15:24:11 +01:00
Florian Kaltenberger deb19f19fa Revert "temporarily enabling beamforming also for FR1 + some logs (revert this commit before MR)"
This reverts commit 87a8a94ae9.
2021-03-05 21:09:38 +01:00
Thomas Schlichter 2266d4611a NR_UE: move OFDM symbol cut position handling to nr_slot_fep()
this slightly cleans up nr_initial_sync() and UE_thread()
2021-03-05 15:02:18 +01:00
Xue Song 834d6f1055 Merge branch 'master' into NR_SA_F1AP_RFSIMULATOR3_Lo
Conflicts:
	cmake_targets/CMakeLists.txt
	executables/nr-softmodem.c
	executables/nr-uesoftmodem.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
2021-03-05 19:07:43 +09:00
Laurent THOMAS a0922cef2f merge develop 2021-03-04 14:49:38 +01:00
Laurent THOMAS 6c7dc65981 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into gnb-threadpool 2021-03-04 12:05:01 +01:00
Thomas Schlichter 7a6f789aed Merge remote-tracking branch 'develop' into NR_FDD_FIX 2021-03-03 17:59:17 +01:00
cig f2bc1012be Minor cleanup UE
- removed commented out code
- improved logging in UL channel estimation
- minor fixes according to OAI coding guidelines
- moving fetching TDD configuration parameters in nr-ue.c only in TDD case
2021-03-03 17:58:07 +01:00
luis_pereira87 d0b9146cd0 Msg4 transmitted from MAC to RRC through ITTI (TASK_RRC_NRUE created) 2021-03-03 01:27:50 +00:00
francescomani 97ed2dfe5b Merge remote-tracking branch 'origin/develop' into NR_10MHz 2021-03-02 14:31:12 +01:00
rmagueta ce5b59c938 Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-03-02 12:58:32 +00:00
Laurent Thomas 9ce7f94518 record/replay for 5G, nrscope bug fix 2021-02-28 21:39:53 +01:00
hardy 8d05695722 Merge remote-tracking branch 'origin/benetel_driver_update' into integration_2021_wk09_b 2021-02-26 16:09:05 +01:00
Sakthivel Velumani 0e2ecd7bce Merge branch 'develop' into gnb-threadpool 2021-02-25 13:48:13 +01:00
francescomani 9afb19858a Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO 2021-02-25 12:04:24 +01:00
Xue Song b6febe214f add GTPV1U_GNB_TUNNEL_DATA_REQ and UDP_DATA_IND
if the UE is running with noS1, u-plane for rfsim with Free5GC + CU/DU is OK
2021-02-25 14:00:14 +09:00
Raymond Knopp 4d9ebf0ac0 Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_RFSIMULATOR2
Conflicts:
	cmake_targets/CMakeLists.txt
	executables/nr-softmodem.c
	executables/nr-uesoftmodem.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NGAP/ngap_gNB.c
	openair3/NGAP/ngap_gNB_nas_procedures.c
2021-02-24 23:00:04 +01:00
rmagueta 48811d0f34 Merge branch 'develop' into develop-SA-CBRA
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
2021-02-23 13:29:53 +00:00
hardy 3199b81584 Merge remote-tracking branch 'origin/enhance-rfsim' into integration_2021_wk08 2021-02-23 09:30:42 +01:00
Florian Kaltenberger 670c807a56 Merge remote-tracking branch 'origin/develop' into benetel_driver_update 2021-02-19 11:46:41 +01:00
Mahesh 7ea8211b85 Code fixes for NSA test 2021-02-18 16:19:12 +05:30
cig e023f67ed8 Compute and apply symbol rotation for DL and UL
- now done according to the proper DL/UL frequency
- this makes it compatible with FDD mode
2021-02-17 14:14:06 +01:00
Xue Song bd765c7505 C-plane for rfsim with Free5GC + CU/DU separation is OK 2021-02-16 14:14:55 +09:00
cig 94d956fa55 Fixed warning about use of wrong enum 2021-02-15 13:24:20 +01:00
Laurent Thomas abfa103247 fix re-reading and end marker code 2021-02-15 10:54:35 +01:00
Sakthivel Velumani 3776379eb1 Merge branch 'develop' into gnb-threadpool 2021-02-13 17:00:00 +01:00
Sakthivel Velumani 08ab234501 Removing sync_thread 2021-02-13 15:14:03 +01:00
cig 24fc20e2e2 Bugfix in USRP flags configuration for NR UE
- missing check on duplex mode before fetching the TDD period
- missing flags configuration for FDD mode
2021-02-12 17:02:20 +01:00
Thomas Schlichter d2f353acf6 Merge remote-tracking branch 'develop' into NR_DL_MIMO 2021-02-12 15:33:51 +01:00
Mahesh 7f4ffe29c8 Fix whitespaces 2021-02-12 01:25:09 +05:30
Mahesh eb19e02cf3 Merging MR978 with develop 2021-02-11 22:50:25 +05:30
francescomani cb296fa050 Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO 2021-02-11 18:15:12 +01:00
Laurent Thomas c93482c4c6 trivial merge with develop" 2021-02-11 13:27:00 +01:00
Sakthivel Velumani 7854133bc2 Removing some of the old pthreads
Leaving ru_thread and L1 stats thread
2021-02-10 22:00:09 +01:00
Laurent Thomas 2c5bd9fa8c improve rfsim 2021-02-10 17:49:14 +01:00
Sakthivel Velumani 31fb7f3120 Merge branch 'develop' into gnb-threadpool 2021-02-10 14:56:09 +01:00
Sakthivel Velumani 2e0ed038d3 Using only one threadPool for nr-softmodem 2021-02-10 15:45:40 +01:00
Xue Song e1a92eadba Merge branch 'master' into develop_SA_rfsim_for_F1
Conflicts:
	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NGAP/ngap_gNB.c
	openair3/NGAP/ngap_gNB_nas_procedures.c
2021-02-10 15:56:50 +09:00
He Shanyun 01999cfcc7 fix build error of enb and ittisim 2021-02-10 01:07:02 +00:00
Florian Kaltenberger 04a4a6f451 Merge remote-tracking branch 'origin/develop' into benetel_driver_update 2021-02-09 11:13:01 +01:00