Commit Graph
3033 Commits
Author SHA1 Message Date
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
Raphael Defosseux e40ec9578f Merge remote-tracking branch 'origin/enable-measurement-reports' into develop_integration_2019_w21 2019-05-22 11:38:10 +02:00
Raphael Defosseux 9466105ddc Merge remote-tracking branch 'origin/issue425_buildsimplification' into develop_integration_2019_w21 2019-05-22 11:34:15 +02:00
Raphael Defosseux 286956a04d Merge remote-tracking branch 'origin/RRC-Inactivity-timers-testing' into develop_integration_2019_w21 2019-05-22 11:33:49 +02:00
Raphael Defosseux aceb3a83ea Hack to break infinite loop when UE is released during RRC inactivity timeout
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-05-16 15:54:03 +02:00
Cedric Roux cd667e5563 RRC: add an option to enable measurement reports
In the configuration file, to enable measurements, add:

    enable_measurement_reports = "yes";

Note that if x2 is enabled then the option 'enable_measurement_reports'
is not taken into account and the measurements are enabled.
2019-05-13 15:52:54 +02:00
frtabu d30776912e Rebase fixes 2019-04-29 18:51:03 +02:00
frtabu 0bf3d8f6bc Remove deprecated build options, now available as config options: noS1, basic_simulator. Remove DISABLE_LOG_X macros, disabling logs now available via disabling the T_TRACER 2019-04-29 18:46:55 +02:00
frtabu 615a56fff6 Remove deprecated build options, now available as config options: noS1, basic_simulator. Remove DISABLE_LOG_X macros, disabling logs now available via disabling the T_TRACER 2019-04-29 18:33:59 +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
Raphael Defosseux f31694533e fix a few cppcheck errors.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-26 13:53:06 +02:00
Raphael Defosseux 96c11ff539 Merge remote-tracking branch 'origin/421-cdrx-for-lte' into develop_integration_2019_w17 2019-04-26 11:10:04 +02:00
Louis Adrien Dufrene e5eb58d227 Fix for CU/DU split error. To test. 2019-04-26 08:37:46 +02:00
Raphael Defosseux b40e2459a9 Merge remote-tracking branch 'origin/fix-flexran-test-free' into develop_integration_2019_w17 2019-04-25 17:31:37 +02:00
Raphael Defosseux d312a9d797 Merge remote-tracking branch 'origin/fix-cudu' into develop_integration_2019_w17 2019-04-25 17:07:00 +02:00
Raymond Knopp 14374c1473 fixed cppcheck errors and warnings. Removal of oaisim files tha came back during merge. 2019-04-25 11:53:52 +02:00
Raymond Knopp c245e426d2 made "is_slave" RRU parameter default to "no" instead of "yes". 2019-04-24 11:37:13 +02:00
Raymond Knopp 8ea46f8f95 changed CI configuration files so that the scheduling paramter for TDD and TM2 is "PARALLEL_SINGLE_THREAD" 2019-04-24 07:40:35 +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 82db432191 Make separate func_ptr setters for PDCP Ind/RLC Req 2019-04-19 14:06:48 +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
Robert Schmidt de1dc5c9d7 Correct if before call free() 2019-04-18 16:03:01 +02:00
Robert Schmidt b4f462b9c8 Align PROTO_AGENT functions with PDCP/RLC function pointers 2019-04-18 13:42:20 +02:00
Louis Adrien Dufrene 3f6ab59010 remove debug 2019-04-18 13:28:36 +02:00
Louis Adrien Dufrene 0e6431a7b9 Moved code for HARQ process from PHY layer to MAC layer 2019-04-18 11:51:20 +02:00
Louis Adrien Dufrene 5da3dd5df6 Some formats + CDRX added to feature_set.md 2019-04-18 10:59:17 +02:00
Louis Adrien Dufrene 93fb04ea5f End of merge from develop 2019-04-16 09:29:20 +02:00
Louis Adrien Dufrene 5ae494e974 merge from develop 2019-04-16 09:13:25 +02:00
Louis Adrien Dufrene 36cd05bcba Bug fix: dci0_ongoing timer ok, now impossible to set ul_SR when dci0 is ongoing. 2019-04-16 08:22:54 +02:00
Raphael Defosseux f8f19aa084 Merge remote-tracking branch 'origin/develop' into RRC-Inactivity-timers-testing 2019-04-15 21:21:07 +02:00
Louis Adrien Dufrene d7cddc2825 Bug fix of drx_config == PrNothing is now handled. Bug fix for dci0_ongoing not working. To investigate 2019-04-15 10:57:39 +02:00
Cedric Roux 9ea7073c68 Merge remote-tracking branch 'origin/fixes-mac-scheduler-2019-w13' into develop_integration_2019_w15
Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
2019-04-15 10:50:38 +02:00
Louis Adrien Dufrene 4c931888e6 Add dci0_ongoing_timer. Commit to build and test. 2019-04-15 08:54:00 +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
Rohit Gupta a05255d246 increased size of maximum SI allocation (to mcs 9 with 3 PRBs) Fixes issues with SI message using eMTC information elementswq 2019-04-13 01:12:33 +02:00
OAI-admin 7dc2b23115 minor modification in print info 2019-04-11 08:45:27 +02:00
OAI-admin 58082d84b8 Clean version. Check if there is a bug to fix. 2019-04-11 08:37:52 +02:00
OAI-admin 85ebe2d261 Build fix 2019-04-11 08:16:41 +02:00
Louis Adrien Dufrene 46b0a9fb38 Remove bypass_cdrx variable and add cdrx_waiting_ack. The CDRX is now activated at RRC COnnection Reconfiguration Complete reception. To Test 2019-04-11 07:36:05 +02:00
Louis Adrien Dufrene 62fba7c03d To clean and test: in rrc_eNB.c RRC Connection reconfiguration: CAT-M1 should not be configured 2019-04-10 10:19:36 +02:00
Louis Adrien Dufrene 3406634b6b This is version 1.0. To test. Cleanup of phy_procedures_lte_eNb.c eNB_scheduler_dlsch.c eNB_scheduler_ulsch.c pre_processor.c and asn1_msg.c 2019-04-10 08:48:37 +02:00
Louis Adrien Dufrene a73f639d8a Cleanup of rrc_eNB.c 2019-04-09 10:01:48 +02:00
frtabu 3535263cc3 Add a LOG in nas_config.c, apply astyle for the 6 files CI mentioned as not well formatted 2019-04-08 18:21:03 +02:00
Raphael Defosseux 064d7fd917 CI: fixing the build report and a few warnings
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-04-08 11:54:03 +02:00
frtabu 30b7c973e0 merge nfapi_cleanup 2019-04-05 18:43:40 +02:00
Louis Adrien Dufrene 7817358197 Cleanup of enb_config.c config.c asn1_msg.c asn1_msg.h 2019-04-05 11:56:29 +02:00
Louis Adrien Dufrene 8359b9684e Cleanup of mac.h and mac_proto.h 2019-04-05 08:28:23 +02:00
Louis Adrien Dufrene ca11800087 Cleanup of eNB_scheduler.c 2019-04-05 08:14:27 +02:00
Stefan Schaffelder 42e0929a0c apply last diff from ssr to local orange_cdrx branch. Remove SSR comments 2019-04-04 10:15:38 +02:00
Louis Adrien Dufrene 81f04d2982 Apply diff between ssr (CDRX) branch and develop 2019-04-04 08:17:26 +02:00