Commit Graph
144 Commits
Author SHA1 Message Date
Raymond Knopp 9be7c35f68 changing config file for SA to connect to AMF
also enabling connection to AMF only when --sa option is used.
2021-03-31 11:44:56 +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
rmagueta b55b11b125 Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
2021-03-30 11:51:56 +01:00
Raymond Knopp 4d0d4fcb29 Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/LAYER2/NR_MAC_gNB/gNB_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_ulsch.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h
	openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_sdu.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR_UE/rrc_UE.c
2021-03-27 15:31:22 +01:00
rmagueta d37552db4c Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts:
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-03-19 15:07:08 +00:00
francescomani f659a76f43 Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO 2021-03-19 10:06:20 +01:00
francescomani f0d6298475 new attempt at improving call to RC L1 config 2021-03-19 09:55:18 +01:00
francescomani a1f1d53cb5 another tentative fix for gnb initialization crashes 2021-03-18 13:09:36 +01:00
Raymond Knopp 9dd6e3bb82 Merge remote-tracking branch 'origin/develop-SA-CBRA-CUDU' into NR_SA_F1AP_5GRECORDS
Conflicts:
	executables/nr-uesoftmodem.c
	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
	openair2/RRC/NR/L2_nr_interface.c
2021-03-18 07:50:08 +01: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
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
matzakos 906fd2b68f Merge branch NR_SA_F1AP_RFSIMULATOR3 into NR_SA_F1AP_5GRECORDS 2021-03-09 15:24:11 +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
francescomani 97ed2dfe5b Merge remote-tracking branch 'origin/develop' into NR_10MHz 2021-03-02 14:31:12 +01:00
Laurent Thomas 9ce7f94518 record/replay for 5G, nrscope bug fix 2021-02-28 21:39:53 +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
Mahesh 7ea8211b85 Code fixes for NSA test 2021-02-18 16:19:12 +05:30
Xue Song bd765c7505 C-plane for rfsim with Free5GC + CU/DU separation is OK 2021-02-16 14:14:55 +09:00
Mahesh 7f4ffe29c8 Fix whitespaces 2021-02-12 01:25:09 +05:30
Thomas Schlichter 3eb2b4d7b2 Generalize some frame parameter calculations
Enabling more numerology combinations and 100 MHz support with 3/4 sampling for USRP X300/X310, too.
2021-02-08 14:21:30 +01:00
Xue Song 52edf0c123 Merge branch 'master' into develop_SA_rfsim_for_F1
Conflicts:
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
	openair2/F1AP/f1ap_cu_interface_management.c
	openair2/F1AP/f1ap_cu_rrc_message_transfer.c
	openair2/F1AP/f1ap_cu_task.c
	openair2/F1AP/f1ap_du_interface_management.c
	openair2/F1AP/f1ap_du_task.c
	openair2/GNB_APP/gnb_app.c
	openair2/GNB_APP/gnb_config.c
	openair2/LAYER2/NR_MAC_UE/main_ue_nr.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/L2_interface_ue.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NGAP/ngap_gNB.c
2021-02-04 18:16:37 +09:00
Mahesh ae422aca1f Merge conficts resolved 2021-02-02 09:36:49 +05:30
hardy 9c810b311d Merge remote-tracking branch 'origin/itti-enhancement' into integration_2021_wk04_b 2021-01-29 07:40:07 +01:00
Xue Song cf3694be28 modify the f1 establishment process 2021-01-28 16:35:10 +09:00
Laurent Thomas eddebae1e4 fix after code review 2021-01-21 13:47:18 +01:00
Xue Song 133ecd52fa msg1/2/3/4/5 is ok 2021-01-16 18:00:03 +09:00
Mahesh 185fcbf7fe Merged latest commit(MR957) 2021-01-15 18:53:02 +05:30
Xue Song 01a87a1fba split gNB into CU and DU 2021-01-15 19:57:26 +09:00
hardy 213c948d84 Merge remote-tracking branch 'origin/develop-sib1' into integration_2021_wk02_wMR988
Conflicts:
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
2021-01-14 13:17:19 +01:00
Mahesh d7ccdbe6b0 Resolved build warnings(25+) and 5G nFAPI downlink errors(future_ul_tti_request) 2021-01-14 12:28:45 +05:30
Laurent 42a110338c itti dynamic queue creation, and 64 bits instance id 2020-12-23 13:56:01 +01:00
Mahesh 79e792443f L2 nfapi test(noS1) working 2020-12-16 16:17:32 +05:30
Mahesh 7eb016675d Resolved errors in building phy-simulator 2020-12-08 12:28:16 +05:30
rmagueta 61a0e4f7b2 Fix creation of rbconfig.raw and reconfig.raw files in standalone mode 2020-12-02 17:28:02 +00:00
Mahesh e174ebdc30 Resolved merge conflicts with nfapi_nr_develop 2020-12-02 16:28:18 +05:30
frtabu 0dcf4ef8f8 remove L2L1 task, parallelisation as config option 2020-11-27 17:37:45 +01:00
Mahesh 56db8f4915 RESOLVED build errors 2020-11-24 18:49:41 +05:30
Mahesh 87105d77cf Merged latest develop to nfapi 2020-11-19 22:33:39 +05:30
matzakos 7772a51c07 Merge remote-tracking branch 'origin/develop' into NR_SA_NGAP_RRC_wk42
Conflicts:
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/nr_rrc_proto.h
	targets/COMMON/create_nr_tasks.c
2020-11-09 15:52:52 +01:00
yaojie a5343618cf Added the judgment of the NGAP field in the configuration file 2020-10-27 07:40:09 +00:00
Laurent c8111292e9 fix warnings from merge 2020-10-22 21:06:35 +02:00
Mahesh K 66a6d550a6 benetel: driver for Benetel's 4G and 5G RRUs
This commit contains work done by Eurecom and by Benetel.
2020-10-12 18:56:41 +02:00
zhenghuangkun 3efc7538ac Modify MME_MODE_ENABLED to AMF_MODE_ENABLED
Modify kenb to kgnb
Modify some warnings
2020-09-29 02:56:21 +00:00
He Shanyun c8b67cb1a1 compile NGAP_GNB lib 2020-09-10 11:34:02 +00:00
He Shanyun 8f3adc8bc8 fix gNB build error 2020-09-10 07:05:01 +00:00
zhenghuangkun 85fe26bd80 Modify NGAP Messages 2020-09-09 18:55:14 +09:00
Raphael Defosseux a8ea336cfd Merge remote-tracking branch 'origin/improve_nr_modulation' into develop_integration_2020_w34 2020-08-21 16:13:27 +02:00
Sakthivel Velumani f42291a4f7 Merge branch 'develop' into improve_nr_modulation 2020-08-18 17:20:46 +02:00
Raphael Defosseux 4c6c4954e2 Merge remote-tracking branch 'origin/fix-softmodem-restart' into develop_integration_2020_w33 2020-08-13 22:07:02 +02:00