Commit Graph
114 Commits
Author SHA1 Message Date
Raphael Defosseux e7aa071e1b Merge remote-tracking branch 'origin/develop' into merging-2019-w51-to-develop-nr 2020-01-10 15:35:54 +01:00
Raphael Defosseux 67c7f97350 Merge remote-tracking branch 'origin/452-cdrx-better-support-cu-du-split' into develop_integration_2019_w51 2019-12-17 11:39:50 +01:00
LAD cd14e5d3dc Clean code for monolithic case. Remove support for CU/DU. 2019-11-13 00:53:34 -08:00
LAD a3c337cc9f [to test] Add MAC itti loop and DRX config support 2019-10-30 07:36:44 -07:00
Javier Morgade 334e3a57ef 1. Reference config file defined with basic MBMS configuration stuff
2. Dedicated MBMS tasks manager:
	   -If MBMS gets enabled through softmodem config file it will launch SCTP task (to check with S1 interface)
	3. "On the flight" dynamic RU configuration update mechanism implemented

	ACKNOWLEDGEMENT:
 	1. This commit was developed at Vicomtech (https://www.vicomtech.org) under UE project CDN-X-ALL: "CDN edge-cloud computing for efficient cache and reliable streaming aCROSS Aggregated unicast-multicast LinkS"
 	2. Project funded by Fed4FIRE+ OC5 (https://www.fed4fire.eu)

	Signed-off-by: Javier Morgade <javier.morgade@ieee.org>
2019-09-14 13:59:53 +02:00
Florian Kaltenberger 2f402b1055 reducing number of UEs to save memory 2019-09-06 18:11:54 +02:00
yilmazt 4967e1b1ac develop&-nr up-to-date as of 30.7.19 2019-07-30 22:01:48 +02:00
Wu Jing f8dc571bd9 fix assert issue when uci array is full if doing Attach/Detach 2019-06-13 11:34:08 +09:00
yilmazt a2cad44f0f Merging latest develop-nr commits 2019-06-06 21:44:15 +02:00
Florian Kaltenberger 7e57a8428e fixing some more bad merges 2019-06-01 04:08:00 +02:00
yilmazt ccd60195e0 Merging test-x310, ci-dev-nr-add-gnb-nr-ur-uspr-testing and nr-mimo-mode-clean branches 2019-05-20 21:32:34 +02:00
Raymond Knopp da9b879112 Merge remote-tracking branch 'origin/develop-nr' into develop-nr-less-logging
Conflicts:
	openair1/SCHED_NR/sched_nr.h
2019-05-18 15:49:13 +02:00
yilmazt 7719314983 Merge branch 'develop' into develop-nr 2019-05-17 17:11:31 +02:00
Laurent 7a5214c6b4 fix 4G merge issues 2019-05-14 16:16:57 +02:00
Raymond Knopp 069ce10a2e NR FAPI interface additions for DLSCH (SDU pointer now does down to L1) 2019-05-11 23:57:11 +02:00
Florian Kaltenberger 40b52195fc redefining max number of UEs for memory allocation. Using the PHYSIM macro, different allocations are used for phy_simulators and real-time modem. 2019-03-26 16:16:34 +01:00
Robert Schmidt 024007716a Check type of node using NODE_IS_CU/DU/MONOLITHIC macros 2019-03-26 13:15:02 +01:00
Robert Schmidt 1f590efe2b Merge branch 'develop' into feature-127-protocol-split 2019-03-19 14:49:07 +01:00
Cedric Roux 9456fe584a x2ap: timers, cleanup
This commit introduces X2AP timers (t_reloc_prep, tx2_reloc_overall).
You need to set the values in the configuration file.

X2AP can be enabled or disabled in the configuration file too (disabled
by default).

Some deadcode was removed.
2019-03-13 15:28:37 +01:00
Robert Schmidt f9c4c501e3 Merge branch 'develop' into feature-127-protocol-split 2019-03-05 14:17:38 +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
Robert Schmidt 030e11ba9a Merge branch 'develop' into feature-127-protocol-split 2019-02-21 20:18:35 +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
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
Raphael Defosseux 8260607ed6 CI: fix in L2-simulator VM build start script
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-22 21:37:40 +01:00
frtabu 9d0c70c9fe remove L1L2 task, also remove some call to send messages to UNKNOWN_TASK, removed in new itti. Align LOG in rlc sources with new LOG code (remove DEBUG_RLC...) 2019-01-21 19:43:19 +01:00
Raphael Defosseux d73685933c Merge remote-tracking branch 'origin/develop' into issue_345_l2_fapi_simulator_new
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-01-16 11:21:27 +01:00
Florian Kaltenberger 73178c8153 Nr cpu affinity2 2019-01-09 20:49:15 +01:00
Robert Schmidt 397d2f4815 Merge commit 'develop' into feature-127-protocol-split
* remove a lot of white spaces
* many conflicts in enb_config.c
2018-11-07 16:07:59 +01:00
frtabu df6030540a reduce compilation warnings in noS1 build to try to pass CI 2018-11-05 11:28:25 +01:00
frtabu 18ec5d8047 abort execution when an unknown option is passed via the command line: add config_check_cmdlineopt API to config module, create lte-softmodem-common.c source to remove duplicate code in lte-softmodem.c and lte-uesoftmodem.c, fix segfaults in exec_function of lte-uesoftmodem 2018-11-02 18:17:11 +01:00
Y_Tomita b60e861b14 Add --musim option for L2 FAPI simulator. 2018-10-25 22:09:33 +09:00
Florian Kaltenberger 83e9908adb merging develop with develop-nr 2018-10-25 03:15:09 -07:00
Y_Tomita 66dad294a5 Change define NUMBER_OF_UE_MAX to avoid unexpected access. 2018-10-24 18:26:24 +09:00
Bing-Kai Hong 7f70860c24 Fix tag typo of PROTO_AGENT 2018-09-24 17:48:57 +02:00
Bing-Kai Hong 0372c9b289 Generate the DCCH and send from pdcp 2018-09-20 19:12:05 +02:00
Bing-Kai Hong 9f098a3461 Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split 2018-09-10 15:33:03 +02:00
Bing-Kai Hong ab412cb39d Normalization of the file names for CU and DU 2018-09-10 13:39:48 +02:00
Robert Schmidt 5a74b790a2 Restructure code, CMakeLists fixes
- move the configuration reading code before task creation
- fix CMakeLists.txt so that lte-softmodem-nos1 compiles
2018-09-08 18:55:30 +02:00
Robert Schmidt a1439effe3 Revert "Restructure create_tasks(): start tasks depending on RAN type, is read in RCconfig_RRC()"
This reverts commit 87093e1b55.
2018-09-08 15:21:47 +02:00
Konstantinos Alexandris 938e0242e2 Merge remote-tracking branch 'origin/develop' into x2
Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/ENB_APP/enb_app.c
	openair2/X2AP/x2ap_common.h
2018-09-07 15:30:49 +02:00
Robert Schmidt 87093e1b55 Restructure create_tasks(): start tasks depending on RAN type, is read in RCconfig_RRC() 2018-09-06 18:12:47 +02:00
Konstantinos Alexandris 1729b3dc66 X2AP: init funcs (register/association) + handler/management functions
SCTP: one to many sockets implementation
2018-09-06 15:49:59 +02:00
Florian Kaltenberger cc002b823f Merge branch 'develop-nr-merge' into develop-nr
lte-softmodem, lte-uesoftmodem, nr-softmodem, nr-uesoftmodem, polartest, ldpctest, ulsim, dlsim all compile
functionality and performance to be tested by CI
2018-08-30 07:08:26 -07:00
Calvin HSU b58ef54608 Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split 2018-08-28 12:22:59 +02:00
Raymond Knopp b93b7073ca Merge remote-tracking branch 'origin/develop' into develop-nr
Conflicts:
	ci-scripts/Jenkinsfile-gitlab
	ci-scripts/buildOnVM.sh
	ci-scripts/checkCodingFormattingRules.sh
	ci-scripts/createVM.sh
	ci-scripts/destroyAllRunningVM.sh
	ci-scripts/reportBuildLocally.sh
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	cmake_targets/tools/build_helper
	common/utils/LOG/log.h
	openair1/PHY/LTE_ESTIMATION/lte_sync_timefreq.c
	openair1/PHY/TOOLS/file_output.c
	openair1/PHY/TOOLS/lte_dfts.c
	openair1/PHY/TOOLS/tools_defs.h
	openair1/PHY/defs_eNB.h
	openair1/PHY/impl_defs_lte.h
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/COMMON/platform_constants.h
	openair2/COMMON/platform_types.h
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/main.c
	openair2/RRC/LTE/L2_interface.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c
	openair2/RRC/LTE/rrc_UE.c
	openair2/RRC/LTE/rrc_eNB.c
	openair2/RRC/LTE/rrc_eNB_S1AP.c
	openair2/UTIL/LOG/log.c
	openair3/S1AP/s1ap_common.h
	openair3/S1AP/s1ap_eNB.c
	openair3/S1AP/s1ap_eNB_context_management_procedures.c
	openair3/S1AP/s1ap_eNB_decoder.c
	openair3/S1AP/s1ap_eNB_decoder.h
	openair3/S1AP/s1ap_eNB_handlers.c
	openair3/S1AP/s1ap_eNB_nas_procedures.c
	openair3/S1AP/s1ap_eNB_overload.c
	openair3/S1AP/s1ap_eNB_trace.c
	openair3/TEST/EPC_TEST/play_scenario_decode.c
	openair3/TEST/EPC_TEST/play_scenario_s1ap.c
	openair3/TEST/EPC_TEST/play_scenario_s1ap_compare_ie.c
	targets/COMMON/openairinterface5g_limits.h
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
	targets/RT/USER/lte-ran.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-ue.c
	targets/SIMU/USER/oaisim_functions.c
2018-08-25 18:20:44 +02:00
frtabu 51c86dd49e fix noS1 build failure 2018-08-24 20:06:02 +02:00
frtabu 24f8fcf346 Use common log mechanism in layer 3, mapping specific macros to common ones and extending common log utilities to support specific layer3 requirements 2018-08-24 17:43:14 +02:00
frtabu 79588a494e LOG_F replaced by LOG_DUMPMSG. Add a generic function to dump a buffer or message. Go on with LOG_M implementation improvement. Remove redundant options to enable/disable logs. 2018-08-24 17:43:14 +02:00
WEI-TAI CHEN 9b7143ca86 merge develop 2018-08-05 06:19:32 -07:00