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
cig
7344d87567
Merge branch 'fhg-ta' into fhg-ra
2020-02-03 10:45:29 +01:00
Robert Schmidt
a8b4a62b82
Read RU config before FlexRAN to allow split identification
2020-01-20 11:35:35 +01:00
Raymond Knopp
3a52199351
Merge remote-tracking branch 'origin/NR_RRCConfiguration' into nr-dual-connectivity
2020-01-14 14:57:10 +01:00
matzakos
8f46241522
ENDC: Merge NR_RRCConfiguration into nr-dual-connectivity branch
2020-01-14 12:57:35 +01:00
Raphael Defosseux
e7aa071e1b
Merge remote-tracking branch 'origin/develop' into merging-2019-w51-to-develop-nr
2020-01-10 15:35:54 +01:00
frtabu
aaaa6d5c51
more cppcheck fixes
2019-12-20 16:44:25 +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
LouisAdrien
206f17b2a4
[under test] Fix CDRX starts at RRCReconfComplete again; new comments
2019-10-10 08:10:16 +02: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
yilmazt
08eda57aca
final minor changes before the merge
2019-10-08 18:32:02 +02:00
yilmazt
e5a9f02af6
develop-nr merge
2019-10-07 12:04:58 +02:00
yilmazt
c348a9eec6
common thread-related minor functions in new .h file
2019-10-04 16:48:13 +02:00
matzakos
2e8b93ef8b
ENDC: Reverse the role of eNB and gNB for the ENDC X2 setup procedure. Currently, gNB: slave sending the setup request, eNB:master.
2019-10-03 18:11:58 +02:00
frtabu
b9b4d05e41
remove RRC_VERSION macros, simplify build-oai and CMakefile.txt accordingly, get rid of remaining compilation warnings (opt module improperly merged and patch asn1c files with tests against max 64 bits integer value)
2019-09-23 19:46:44 +02:00
Javier Morgade
bcf42ca2a5
Implemented M2AP managing procedures at eNB (ENB_APP)
...
-M2 register against MCE (Multicast Control Entity)
-Basic M2AP control procedures developed (eNB<-M2AP->MCE)
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:19:00 +02:00
yilmazt
4967e1b1ac
develop&-nr up-to-date as of 30.7.19
2019-07-30 22:01:48 +02:00
yilmazt
2b321fd1c7
Merging latest develop commits
2019-07-16 11:20:24 +02:00
Raphael Defosseux
729aab5798
Merge remote-tracking branch 'origin/nfapi_cleanup1' into develop_integration_2019_w30
2019-07-24 08:29:01 +02:00
yoshio.inoue
46537af2b2
Merge remote-tracking branch 'origin/OAI_develop' into oai_dev_x2ho_tdd
2019-07-09 14:45:31 +09:00
luaihui
94af4d0eca
Merge remote-tracking branch 'origin/OAI_develop' into oai_develop_nfapi
2019-07-09 12:45:45 +09:00
Wu Jing
02532d044e
x2 handover for tdd
2019-07-04 17:40:31 +09:00
Wu Jing
4239dacd02
Merge branch 'OAI_develop' into oai_develop_nfapi
2019-07-02 22:23:35 +09:00
Robert Schmidt
e26f7d7555
F1: correctly initialize CU RRC params (clean up code after 99012f88b9)
2019-06-27 14:22:10 +02:00
Raphael Defosseux
99012f88b9
HACK: force initialization of variables in CU case!
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-06-21 16:02:23 +02:00
Raphael Defosseux
8f68d596f1
Merge remote-tracking branch 'origin/develop-entv' into develop_integration_2019_w25
2019-06-18 13:42:50 +02:00
Raphael Defosseux
56eb818d08
Merge remote-tracking branch 'origin/ru_rau_enhancement_L1_renaming' into develop_integration_2019_w25
2019-06-18 13:40:42 +02:00
yilmazt
420e6194d4
All 4 nr<e-(ue)softmodems are compiling
2019-06-16 19:46:11 +02:00
Javier Morgade
8b4c23cf80
Merge remote-tracking branch 'origin/develop' into develop-entv
2019-06-10 15:21:51 +02:00
yilmazt
a2cad44f0f
Merging latest develop-nr commits
2019-06-06 21:44:15 +02:00
Dong Anyuan
7dc6547479
Fix Coverity Scan CID 339944
2019-05-28 19:41:59 +09:00
Dong Anyuan
f19c72f785
Fix Coverity Scan CID 339951
2019-05-28 19:38:22 +09:00
He Shanyun
48e2d78fd6
cut down the usage of memory when using rcc and rru
2019-05-28 16:06:17 +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
Javier Morgade
b1c1c4545a
Merge remote-tracking branch 'origin/develop' into develop-entv
2019-05-23 16:51:30 +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
286956a04d
Merge remote-tracking branch 'origin/RRC-Inactivity-timers-testing' into develop_integration_2019_w21
2019-05-22 11:33:49 +02:00
Javier Morgade
786895dcd9
Merge remote-tracking branch 'origin/develop' into develop-entv
2019-05-17 18:11:55 +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
Raymond Knopp
26d5eb90b6
intermediate commit to synch machine
2019-05-03 13:37:22 +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
d312a9d797
Merge remote-tracking branch 'origin/fix-cudu' into develop_integration_2019_w17
2019-04-25 17:07:00 +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
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
Raphael Defosseux
f8f19aa084
Merge remote-tracking branch 'origin/develop' into RRC-Inactivity-timers-testing
2019-04-15 21:21:07 +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
Louis Adrien Dufrene
a73f639d8a
Cleanup of rrc_eNB.c
2019-04-09 10:01:48 +02:00