Commit Graph
4713 Commits
Author SHA1 Message Date
francescomani 2daa9144c4 Merge remote-tracking branch 'origin/NR_SA_tempfix_coreset' into NR_UE_SA 2021-08-06 09:26:17 +02:00
Melissa Elkadi 745241bd63 Merge branch 'episys/nsa_epc_gnb_updates' into episys/david/multiUE_with_crnti_checking
Also, lots of debugging logs added
2021-08-04 16:24:27 -07:00
Laurent THOMAS 7fcd5e3e29 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_F1C_F1U_extensions 2021-08-04 13:49:43 +02:00
Eurecom 969a7a08fe Merge remote-tracking branch 'origin/develop' into bandwidth-testing
Conflicts:
	openair2/GNB_APP/MACRLC_nr_paramdef.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-08-04 12:09:42 +02:00
Sakthivel Velumani 6050776f55 Merge branch 'develop' into prb_based_dl_channel_estimation 2021-08-02 12:17:03 +02:00
Laurent OpenCells d649434be9 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into code-cleanup-20210716 2021-07-29 22:29:52 +02:00
Melissa Elkadi 97a648e35f IP Traffic not working, tun if established by NRUE
Updated the configuration files. Added a sleep to
ensure that the LTE UE gets attached to the EPC
before the bearer is modified to be gNB. Updated
the ifconfig tunnel up command to be brought up
by the NR UE socket when in NSA mode. Lastly,
started the gNB PDCP layer in S1 mode.
2021-07-28 15:36:11 -07:00
francescomani 3c7796adaa Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2021-07-27 11:00:29 +02:00
Laurent OpenCells 0f1d787a90 fix obsolete system call 2021-07-26 15:47:57 +02:00
Laurent OpenCells a03ee3548f merge latest develop 2021-07-26 15:03:47 +02:00
francescomani 5c70aa96c4 Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures 2021-07-26 07:39:57 +02:00
hardy c93a9497db Merge remote-tracking branch 'origin/develop-NSA_SA_fixes' into integration_2021_wk30_b 2021-07-24 17:56:38 +02:00
francescomani ef84130e7c Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-07-23 16:01:43 +02:00
magounaki d1dec5ed0e for testing with another machine. 2021-07-23 15:53:49 +02:00
francescomani bd816e5175 Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures 2021-07-23 13:51:41 +02:00
Shruthi 6fa460dd2d Merge remote-tracking branch 'origin/develop' into scs_60_iisc 2021-07-23 13:06:12 +05:30
hardy fad5fbda34 Merge remote-tracking branch 'origin/NR_CSIRS_tomerge' into integration_2021_wk30 2021-07-23 09:18:33 +02:00
Laurent OpenCells f62b7e1f9e nfapi work around (missing malloc) 2021-07-22 15:32:09 +02:00
Laurent OpenCells 39c63eb158 move function declaration in not duplicated files (.h instead of .c) 2021-07-22 13:19:37 +02:00
luis_pereira87 7c61f6d969 Fix pusch_TargetSNRx10 and pucch_TargetSNRx10 in configuration files 2021-07-22 11:13:14 +01:00
francescomani 227529c129 Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures 2021-07-21 17:49:33 +02:00
Laurent OpenCells 3f436e3e2f merge develop (was in conflict) 2021-07-20 17:26:15 +02:00
francescomani bff2251242 Merge remote-tracking branch 'origin/develop' into NR_CSIRS_tomerge 2021-07-20 07:03:24 +02:00
David Kim 4f23fa2f61 added queues between VNF and MAC to handle indications. 2021-07-19 18:55:02 -07: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
Laurent OpenCells 78da843624 code-cleanup-20210716 2021-07-16 17:16:15 +02:00
luis_pereira87 ff7cc7ec1b Add ulsch_max_slots_inactivity to SA config files 2021-07-15 12:59:15 +01:00
Raymond Knopp 72751870cf Merge remote-tracking branch 'origin/develop' into develop-aw2sori 2021-07-14 12:02:29 +02:00
francescomani 2fe8dd7657 Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS-abs' into NR_UE_SA 2021-07-14 10:35:09 +02:00
francescomani 58063acf54 rx_gain = 0 in rfsimulator 2021-07-12 16:30:29 +02:00
luispereira87 8743f58d23 Improve schedule msg3 and fix tda for mixed slots 2021-07-07 18:25:31 +01:00
Laurent THOMAS afcbf7b6cc remove most of globale variables, remain data model inconsistency and race conditions 2021-07-06 09:49:47 +02:00
Thomas Schlichter c3482e376d Merge remote-tracking branch 'origin/develop' into nr-dl-mimo-2layer 2021-07-05 16:25:26 +02:00
Abhijith 1f94285040 Rebased to develop after SA merge 2021-07-02 17:03:20 +05:30
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
Michael Cook e54896591b Sync more NFAPI changes from multi-ue-proxy.git
Most notably, nfapi_rx_indication_pdu_t.data type is changed from
`uint8_t*` to `uint8_t[]`.  Also, renamed from `data` to
`rx_ind_data` to make it easier to find.
2021-06-26 10:20:48 -07:00
Abhijith c623d90453 Review comments incorporated 2021-06-25 13:38:40 +05:30
Shruthi 6602bdeed8 PTRS paramaters removed 2021-06-25 13:38:40 +05:30
Abhijith ea1b995a75 Fixed error with BWP_Id 4 2021-06-25 13:38:40 +05:30
Abhijith 24acc0e8b0 scs and bwp location error fixed 2021-06-25 13:38:40 +05:30
Abhijith 4f9aaa927e Access SCD parameters from config file 2021-06-25 13:38:40 +05:30
Abhijith af6807d30b pucch errors fixed 2021-06-25 13:38:40 +05:30
Abhijith 91765a2c4d Initial commit for addition of dedicated BWPs 2021-06-25 13:38:40 +05:30
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
Laurent THOMAS b9268222a3 revert wrong commit on targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp 2021-06-17 16:59:20 +02:00
Laurent THOMAS 6fb9f92b84 replace itti message GTPV1U_DELETE_TUNNEL_REQ by direct call to gtpv1u_delete_s1u_tunnel() 2021-06-17 16:40:34 +02:00
Deokseong "David" Kim 591e0e1f36 Adjusted UDP port ids for multiple UE connection with proxy 2021-06-16 16:06:38 -07:00
Eurecom 0cdff39806 Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS' into NR_2port_CSIRS 2021-06-15 17:54:37 +02:00
rmagueta 12f7f82391 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
2021-06-09 11:10:07 +01:00