maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,827 Commits 5 Branches 0 Tags
4f58d66972799b9599d222a38ce95f689ff2d2aa
Commit Graph
150 Commits
Author SHA1 Message Date
Laurent THOMAS bc05bd882d cleaning after big merge 2022-01-10 11:44:45 +01: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
Michael Cook 092caec8ca Merge branch 'episys-merge' into episys/trial-merge-to-master 2021-03-14 10:58:46 -04:00
Raymond Knopp a446eb0ebc Merge branch 'episys/master' into episys-merge 
Conflicts:
	common/utils/LOG/log.h
	common/utils/ocp_itti/intertask_interface.cpp
	nfapi/oai_integration/nfapi_vnf.c
	nfapi/open-nFAPI/nfapi/src/nfapi.c
	openair2/LAYER2/MAC/main_ue.c
	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
	openair2/PHY_INTERFACE/phy_stub_UE.c
	openair2/RRC/LTE/rrc_UE.c
	openair2/RRC/LTE/rrc_eNB.c
	openair3/NAS/UE/ESM/esm_ebr_context.c
	targets/COMMON/openairinterface5g_limits.h
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c
 2021-02-13 22:52:33 +01:00
Raymond Knopp e82ef88e72 builds are succesful (eNB,UE,gNB,nrUE,physim) 2021-01-24 13:27:10 +01:00
Ricky S b2f85f7ac2 Episys/initial channel model 2021-01-14 15:53:06 -08:00
Deokseong "David" Kim b220ed29c4 Updating PDCP module for proxy 
Adding ue id parameter to pdcp_init
Updating tun interface functions for proxy
 2021-01-12 14:45:52 -08:00
Raymond Knopp 881ac5491c merge with develop 2020-12-25 16:18:24 +01:00
Melissa e3d34c8b01 Fixed multiple UE EPC integration by resetting user->ueid=0;. Lots of logs in this commit, will remove later 2020-12-01 13:39:05 -08:00
WANG Tsu-Han 702192148e fixes for PARALLEL_RU_L1_TRX_SPLIT from Laurent 2020-06-12 14:42:51 +02:00
Andrew Burger df2134026a OAI UE receive dl_config_request and call memcpy additions 2020-05-30 12:50:27 -07:00
Florian Kaltenberger 897ca561f5 adding time_source command line parameter and removing duplications of clock_source 
ignoring command line paramters clock_source and time_source in lte-softmodem and harmonizing it with nr-softmodem
time_source and clock_source handled separately in usrp_lib.cpp
 2020-03-23 17:45:48 +01:00
Florian Kaltenberger a01e93be0c Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration 2020-02-09 21:38:04 +01:00
frtabu 64e4826c81 add softmodem-common.c and common error handler 2020-02-04 17:39:36 +01:00
Francesco Mani 6a356e3b69 few warnings 2020-01-23 16:36:23 +01:00
Francesco Mani 0c6b51015f merge between FR2 and RRC branches 2020-01-16 17:20:56 +01:00
Florian Kaltenberger a78b5da529 fixes an issue with clock source 
- command line paramter --clock-source can only be set at UE (removed this option from gNB)
 - at gNB use clock_source from RU section in config file
 - in both cases if clock_source is present in usrp_args, it will override clock_source
 2019-12-06 08:54:17 +01:00
yilmazt 08eda57aca final minor changes before the merge 2019-10-08 18:32:02 +02:00
yilmazt 9aa3483235 executables compiling again 2019-10-03 16:00:46 +02:00
yilmazt 84af6103f8 another batch of cppcheck error corrections 2019-09-24 11:59:17 +02:00
yilmazt 54899a9be1 merge of develop&develop-nr 2019-09-12 16:02:36 +02:00
frtabu d3217ac30b fix phy simulators build Pb: move snr_dB global to simulation code, add a channel mode section in configuration for snr_dB ,add a parameter flag in the config module to allow omitting prefix when modifying a parameter (for compatibility of -s option) 2019-08-07 18:42:35 +02:00
Florian Kaltenberger 1927e34312 Merge remote-tracking branch 'origin/develop-nr' into develop-nr-merge 2019-08-11 18:03:31 +02:00
Florian Kaltenberger c4e43703ea removing superflous parameter usrp_clrsrc from command line 2019-08-07 17:23:16 +02:00
yilmazt 4967e1b1ac develop&-nr up-to-date as of 30.7.19 2019-07-30 22:01:48 +02:00
yilmazt f37a17e540 develop&-nr current as of 22.7.19 & OAI fully ready for testing 2019-07-22 21:56:44 +02:00
yilmazt 2b321fd1c7 Merging latest develop commits 2019-07-16 11:20:24 +02:00
luaihui 94af4d0eca Merge remote-tracking branch 'origin/OAI_develop' into oai_develop_nfapi 2019-07-09 12:45:45 +09:00
Wu Jing 4239dacd02 Merge branch 'OAI_develop' into oai_develop_nfapi 2019-07-02 22:23:35 +09:00
laurent 924e10f73a fix rfsim ue initial sync and legacy OAI C struct syntax 2019-07-01 15:17:07 +02:00
yilmazt 680a0c97c7 Operation of all of the physical simulators are tested and verified + various warning removals 2019-06-20 21:46:35 +02:00
yilmazt 420e6194d4 All 4 nr&lte-(ue)softmodems are compiling 2019-06-16 19:46:11 +02:00
Wu Jing 4cd5d80d98 add log-mem function to collect log 2019-06-08 13:32:12 +09:00
Wang Tsu-Han 6b2e064216 Merge branch 'develop' into ru_rau_enhancement_L1_renaming 
Conflicts:
	ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c
	targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.calisson.conf
	targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf
	targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.nord.conf
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c
 2019-05-23 18:29:01 +02:00
yilmazt 7719314983 Merge branch 'develop' into develop-nr 2019-05-17 17:11:31 +02:00
frtabu 00d9060711 remove XFORM macro, move XFORM code in optional library 2019-05-09 02:03:56 +02:00
Raymond Knopp 17eb5eedaf Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement_L1_renaming 
also:
removed XFORMS from lte-softmodem target and associated extra functions in lte-softmodem.c
Conflicts:
	common/utils/T/T_defs.h
	targets/RT/USER/lte-softmodem.c
 2019-04-28 10:30:56 +02:00
Raymond Knopp ed08f3ab1b Merge remote-tracking branch 'origin/signal-delay' into ru_rau_enhancement_L1_renaming 
Conflicts:
	openair1/PHY/defs_eNB.h
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/prach_procedures.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c
 2019-04-20 08:28:43 +02:00
Robert Schmidt 42713b95fc Configure complete PDCP in lte-(ue)softmodem 
* Instead of partly initializing in read_config_and_init(), everything of
  PDCP is initialized in main() of lte-softmodem
* Omit RC.rrc access in RRU through checking of RC.nb_inst > 0
* Includes FlexRAN, i.e. do not start FlexRAN in RRU
* Function pointers to PDCP functions have to be set explicitly (avoid
  confusion of multiply setting function pointers)
 2019-04-19 14:05:51 +02:00
Raymond Knopp ca111641d4 Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement_L1_renaming 
Conflicts:
	cmake_targets/build_oai
	cmake_targets/oaisim_build_oai/CMakeLists.template
	cmake_targets/oaisim_mme_build_oai/CMakeLists.template
	cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
	openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
	openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/if4_tools.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/pucch.c
	openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/impl_defs_lte.h
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SIMULATION/LTE_PHY/dlsim.c
	openair2/ENB_APP/enb_config.c
	openair2/ENB_APP/enb_paramdef.h
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-softmodem.h
 2019-04-14 20:34:03 +02:00
frtabu 30b7c973e0 merge nfapi_cleanup 2019-04-05 18:43:40 +02:00
frtabu 87a8cb28a5 basic and rf simulators as config option to allow noS1 datapath debug. 2019-03-04 22:07:32 +01:00
frtabu fb46545526 Fix corrupted LOGs in L1L2simulator, introducing two new components NFAPI_VNF and NFAPI_pnf. Integrate Fujitsu fix for up to 50 UEs. Apply astyle to all modified files in the branch 2019-02-25 16:50:03 +01:00
frtabu 38d772d8a2 nos1 et s1 execs identical, nos1 enforced based on exec name or --noS1 option 2019-02-17 23:46:45 +01:00
Raymond Knopp 96ee719330 minor changes for RRU 2019-01-30 10:51:55 +01:00
Raymond Knopp a13f70beee removal of warnings after merge 2019-01-29 17:09:49 +01:00
Raymond Knopp 72b5745abb Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement-external-timing 
Conflicts:
	openair1/PHY/LTE_TRANSPORT/if4_tools.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/defs_eNB.h
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair1/SIMULATION/LTE_PHY/dlsim.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-softmodem.h
	targets/RT/USER/lte-uesoftmodem.c
	targets/RT/USER/rfsim.c
 2019-01-26 11:54:10 +01:00
Raphael Defosseux 2d7c9734fd Fixing a few warnings (flexran) 
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
 2019-01-24 19:57:49 +01:00
Raphael Defosseux bb4a1f9a75 Manual merge conflict resolution was incorrect. 
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
 2019-01-24 16:58:14 +01:00
Raphael Defosseux 64144a8442 Merge remote-tracking branch 'origin/issue391-removeunusedcode_L2L1task' into develop_integration_2019_w04 
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
 2019-01-24 15:33:19 +01:00