Commit Graph
3129 Commits
Author SHA1 Message Date
Raphael Defosseux d109ffa112 Merge remote-tracking branch 'origin/hotfix-RU-dft-initialization' into develop_integration_w48 2018-11-28 18:12:32 +01:00
Raphael Defosseux 0d67854ce0 Merge remote-tracking branch 'origin/add-mac_MainConfig-to-RRCConnectionSetup' into develop_integration_w48 2018-11-28 18:10:56 +01:00
Wang Tsu-Han b25a592ced Merge branch 'develop' into L1_renaming
Conflicts:
	common/utils/LOG/log.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c
2018-11-28 13:51:36 +01:00
Wang Tsu-Han 6aadf8312a Merge branch '373-parallelization-not-working-correctly-in-phy-simulators-and-bad-implementation-2' into L1_renaming 2018-11-28 11:59:31 +01:00
Raymond Knopp 134a39fa34 Merge remote-tracking branch 'origin/add-mac_MainConfig-to-RRCConnectionSetup' into enhancement-ltem
Conflicts:
	cmake_targets/CMakeLists.txt
2018-11-26 23:02:29 +01:00
Raymond Knopp 552bd6979d Merge remote-tracking branch 'origin/develop' into enhancement-ltem
Conflicts:
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
2018-11-26 23:01:47 +01:00
Raymond Knopp fb5201ba97 initialization of dfts for RU. moved init_dfts out from lte_init_top into lte_init_RU() and lte_init_ue_signal() 2018-11-26 21:02:41 +01:00
Raphael Defosseux f8ccd284a0 Merge remote-tracking branch 'origin/develop' into 374-missing-rrc-inactivity-timer-missing-default-drx-ie-in-s1-setup-ue-s1-id-unknown-after-detach-for-switch-off
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-11-23 14:10:50 +01:00
Raymond Knopp b89f9284dd adds a mac_MainConfig information element to RRCConnectionSetup. This is to configure PHR reporting during the first part of the Attach procedure. 2018-11-21 20:24:24 +01:00
Louis Adrien Dufrene ed61d774f6 add test on ue_context 2018-11-21 17:03:52 +01:00
Louis Adrien Dufrene e77d910398 Macro removed in enb_config.c, but rrc timer thresh still set to 0 (deactivated) 2018-11-21 13:26:12 +01:00
yoshio.inoue 0fb80c0cff Fixed problem that u-plane does not transferr with noS1 in L2 nFAPI Simulator 2018-11-21 11:44:18 +09:00
Louis Adrien Dufrene cf07c4d394 astyle applied 2018-11-20 16:39:05 +01:00
Louis Adrien Dufrene d082b50896 add MACRO for timer threshold 2018-11-20 16:19:37 +01:00
OAI-admin 1094835db1 RRC timer fixed and tested 2018-11-20 15:07:43 +01:00
Louis Adrien Dufrene c194956da3 RRC timer thres removed from UE context and added to eNB RRC context, value 0 of thres equivalent to infinity 2018-11-20 14:15:50 +01:00
Raphael Defosseux c7dbada527 Merge remote-tracking branch 'origin/issue362_getoptions_errorhandling' into develop_integration_2018_w47 2018-11-20 13:10:25 +01:00
Raymond Knopp c88d3e062c fixed call to check_band_frequencies in enb_config.c (order was was wrong). 2018-11-19 20:56:49 +01:00
Raymond Knopp 7900864fe4 testing after integration of eMTC 2018-11-19 18:01:36 +01:00
Raymond Knopp 55ed97ebfa correction to include file name. 2018-11-19 12:53:20 +01:00
Raymond Knopp 7474b69c29 added missing files. updates for testing in eMTC configuration after merge. 2018-11-19 09:26:03 +01:00
Raymond Knopp 6266d5c389 Merge remote-tracking branch 'origin/develop' into enhancement-ltem
Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_TRANSPORT/dci.c
	openair1/PHY/LTE_TRANSPORT/edci.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/transport_eNB.h
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/COMMON/rrc_messages_types.h
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/config.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_bch.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/LAYER2/MAC/mac.h
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/rrc_defs.h
	openair2/RRC/LTE/rrc_eNB.c
	openair2/RRC/LTE/rrc_eNB_S1AP.c
2018-11-19 00:43:49 +01:00
Raymond Knopp 246ee327fb rework of configuration for eMTC/Sidelink. Removal of warnings introduced by eMTC code. Validation of configuration component for eMTC and regular LTE. Sidelink is still not configured. 2018-11-18 20:17:18 +01:00
Louis Adrien Dufrene bfb65b57f7 astyle applied 2018-11-16 11:36:44 +01:00
Louis Adrien Dufrene 700437f184 astyle applied 2018-11-16 08:49:28 +01:00
Louis Adrien Dufrene 22e44306f8 RRC inactivity timer deactivated 2018-11-15 13:28:59 +01:00
Louis Adrien Dufrene 9a080adec5 RRC inactivity timer: first commit to DRX_master 2018-11-13 14:20:16 +01:00
Louis Adrien Dufrene 961a70a04e Fusion wasn't ok, needed some modifications 2018-11-13 11:20:14 +01:00
Louis Adrien Dufrene a409614185 Merge develop done, conflicts resolved 2018-11-13 10:49:20 +01:00
Louis Adrien Dufrene 287010f82f RRC timer: last format done. Timer reset in scheduling of DTCH (DL/UL). Commit to test. 2018-11-13 10:21:38 +01:00
Louis Adrien Dufrene 76e1636258 RRC timer reset in scheduler: format of some functions before first test 2018-11-12 17:38:19 +01:00
Wang Tsu-Han c9ab59fc4d fixes for misplacing L1_rxtx_proc_t with L1_proc_t 2018-11-12 15:58:56 +01:00
Wang Tsu-Han 17bb5db352 renaming change for UE and simulation 2018-11-12 14:48:18 +01:00
Cedric Roux d6ce682b56 Merge remote-tracking branch 'origin/issuePHR' into develop_integration_2018_w46 2018-11-12 11:03:04 +01:00
OAI-admin d3f8f9d65b End of bug fix: S1 id unknown after detach request for switch off in idle 2018-11-12 07:46:32 +01:00
Louis Adrien Dufrene 94bf32b0d4 Bug fix: S1 id unknown after Detach Request (need to test) 2018-11-08 08:31:23 +01:00
Robert Schmidt 8d862dace4 F1 test: fixes after merge 2018-11-07 16:13:04 +01:00
Robert Schmidt f3a5720dd9 FlexRAN: Apply slicing configuration if MAC CM present 2018-11-07 16:13:03 +01:00
Robert Schmidt f0c5f57159 Do not free mem_block in PDCP, it is freed in F1 or RLC 2018-11-07 16:13:03 +01:00
Robert Schmidt a477043a24 Add some useful LOG statements 2018-11-07 16:13:03 +01:00
Robert Schmidt 6c33f79095 Fix bugs after merge
* F1AP has to read MCC/MNC from list
* Do not stop if MACRLC list is not present in conf, it might be a CU
2018-11-07 16:13:03 +01:00
Robert Schmidt 07d9c6a3be Cast malloc() to type 2018-11-07 16:13:03 +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
Robert Schmidt c1e680dd89 FlexRAN: free memory of statistics reports 2018-11-07 10:58:09 +01:00
Robert Schmidt 836f6c6374 Include statistics flag only when values are written 2018-11-07 10:54:35 +01:00
Robert Schmidt f02b539234 Correct init_cont_stats_update(), test for result 2018-11-07 10:54:35 +01:00
Robert Schmidt 2cf4060680 Implement stats_reply-specific destroy function 2018-11-07 10:54:35 +01:00
Robert Schmidt 86d8e21445 Test for CMs before taking CM-specific stats 2018-11-07 10:54:34 +01:00
Robert Schmidt 23650bdea3 Make flexran_agent_handle_stats() respect presence of MAC, RRC CMs 2018-11-07 10:54:34 +01:00
Robert Schmidt 3b3c9daefb Reformat flexran_agent_handle_stats() for better readability 2018-11-07 10:54:34 +01:00