Commit Graph
56 Commits
Author SHA1 Message Date
Melissa Elkadi 82ba5a3531 Code clean up part one.
This commit includes about 1/3 of the code clean up
in preparation for the merge to the OAI develop
branch. Several of the changes are white space changes,
removing of logs, comment removals, and updating any
changed code for our use-case to be clear for NSA mode.
2021-09-23 12:53:38 -07:00
Melissa Elkadi 1b49e7e2ef Additions to get UE connected to EPC 2021-08-25 12:10:12 -07:00
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
Mahesh 49fc03a65e Cleanup and some minor bugfixes 2021-08-11 13:16:32 +05:30
Rahul Gottipati 4ec3434128 Rebase to latest develop 2021-08-04 14:57:52 +05:30
Mahesh 02f3fecfef future_ul_tti hardcoding solved, other hardcodings commented out 2021-07-05 22:55:35 +05:30
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
Laurent THOMAS aef67d0310 fix merge NR_SA_F1AP_5GRECORDS and fix warnings, a regression in UE (LCID lopp) 2021-06-21 21:01:59 +02:00
Raymond Knopp 1198ef18dc Add missing function calls for proper gtp-u initialization in NSA scenario 2021-06-15 15:35:53 +02:00
Masayuki Harada 1b69c2a00d Remove pdcp_layer_init_for_CU function and merge to pdcp_layer_init. 2021-06-08 15:32:12 +09:00
rmagueta e72a6798c1 Change some LOG levels 2021-06-05 14:20:39 +01:00
rmagueta 0ef6ef2b28 Code format improvements in differences for develop 2021-05-12 19:29:10 +01:00
Raymond Knopp e2b68a99a9 CU/DU support for most recent changes. UE continues as far as in monolithic mode. Still to apply masterCellGroupConfig in DU from RRCReconfiguration. This has to be detected in DU and applied after decoding the RRC message intended for UE. 2021-05-09 12:44:55 +02:00
rmagueta 0c6762f148 Remove duplicated itti msg for NRRRC_CONFIGURATION_REQ 2021-04-24 19:17:15 +01:00
rmagueta 131cef2b6b Fix build warnings 2021-04-15 22:59:35 +01:00
matzakos 45b2b61d1f Trigger gNB registration with AMF for monolithic mode 2021-04-09 18:01:51 +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
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 a1f1d53cb5 another tentative fix for gnb initialization crashes 2021-03-18 13:09:36 +01:00
Raymond Knopp 35fe7569a2 removed some debugging assertions in DU, added sending and handling of GNB-CU-Configuration-Update-Acknowledge. Note: Still need to do GNB-CU-Configuration-Update-Failure. 2021-03-09 23:32:24 +01:00
matzakos 906fd2b68f Merge branch NR_SA_F1AP_RFSIMULATOR3 into NR_SA_F1AP_5GRECORDS 2021-03-09 15:24:11 +01:00
Raymond Knopp 666aee7fc2 addition of GNB-CU-Configuration-Update/Update-Acknowledge/Update-Failure 2021-03-08 10:57:00 +01:00
wf 44d40219f2 modify fro comments, no warning now 2021-03-04 16:42:20 +08: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
Xue Song 01a87a1fba split gNB into CU and DU 2021-01-15 19:57:26 +09:00
Xue Song b0a76fd662 add du handle f1ap setup response 2020-12-24 02:58:29 +00:00
Laurent 42a110338c itti dynamic queue creation, and 64 bits instance id 2020-12-23 13:56:01 +01:00
Xue Song cb0d7c3dd5 modify F1 Setup Request 2020-12-23 01:58:17 +00:00
Xue Song f09c6fbd0d Add RCconfig_NR_DU_F1
Initialize F1AP
2020-12-22 01:29:23 +00:00
yaojie a5343618cf Added the judgment of the NGAP field in the configuration file 2020-10-27 07:40:09 +00: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 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
Francesco Mani f4ccaf0dc0 Merge remote-tracking branch 'origin/develop' into NR_RRC_harq_hacks 2020-06-29 19:27:33 +02:00
Raphael Defosseux 1ff1f3dda9 fix a bunch of compilation warnings 2020-06-19 11:41:36 +02:00
Francesco Mani 2b976aa711 Merge branch 'NR_RRC_PRACH_procedures' into NR_RRC_harq_hacks 2020-06-12 19:14:25 +02:00
Francesco Mani bedb295dfd Merge branch 'develop' into NR_RRC_harq_hacks 2020-06-09 20:32:35 +02:00
Thomas Schlichter 614083f03f Merge branch 'develop' into NR_RRC_PRACH_procedures
Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/GNB_APP/gnb_app.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/RRC/NR/rrc_gNB_nsa.c
2020-06-09 13:03:28 +02:00
laurent d1e8c23529 cleanup 2020-06-04 10:48:29 +02:00
matzakos 07a2a095d3 ENDC path switch S1-U: Integrated S1AP E-RAB-Modification indication message at eNB, interfacing with RRC and X2AP to get proper configuration of E-RABs to be modified and GTP-U configuration at gNB 2020-03-11 10:37:48 +01:00
cig 7344d87567 Merge branch 'fhg-ta' into fhg-ra 2020-02-03 10:45:29 +01:00
frtabu 61f6af80ad build improvements: allow build mode selection (-g -G options) allow all exec build in one pass, remove remaining USE_MME macros in nr code 2020-01-20 19:06:15 +01:00
Raphael Defosseux c409da3bb8 Patch provided by Gabriel Arrobo.
Mainly comestics and integer type management

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2020-01-09 14:10:04 +01:00
matzakos 7916e17666 ENDC: Add X2AP initial configuration and X2AP task in nr-softmodem. Small issue with parsing NRCCPARAMS_DESC from RCconfig_NR_X2() needs to be resolved 2019-10-08 18:48:39 +02:00
Florian Kaltenberger 83e9908adb merging develop with develop-nr 2018-10-25 03:15:09 -07:00
WEI-TAI CHEN 754c92d4e2 signature 2018-07-13 02:02:08 -07:00
WEI-TAI CHEN c360601735 fix error and warning 2018-07-12 02:10:56 -07:00
WEI-TAI CHEN e8e8c877b1 Fix warning in upper layer 2018-07-12 01:12:20 -07:00
WEI-TAI CHEN 2070c982e7 Adding the NR MIB scheduler in eNB_ulsch_dlsch_scheduler, re-use LTE MAC 2018-07-09 04:27:26 -07:00