Florian Kaltenberger
83e9908adb
merging develop with develop-nr
2018-10-25 03:15:09 -07:00
Wang Tsu-Han
1fc9fd4a46
Merge remote-tracking branch 'origin/develop' into parallel-config
2018-09-21 11:06:22 +02:00
Raphael Defosseux
7d602d5cc2
CI: basic-simulator --> seg fault core dumps are recovered and part of artifacts
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2018-09-19 11:55:43 +02:00
Wang Tsu-Han
cf09d19879
adding definition for UE
2018-09-13 12:52:44 +02:00
Cedric Roux
2cb87ddd02
Merge remote-tracking branch 'origin/feature-slice+restart-w35' into develop_integration_2018_w36
...
Conflicts:
openair2/ENB_APP/flexran_agent_common_internal.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
2018-09-07 16:13:40 +02:00
laurent
abbffef015
fix some exit situations, that was badly done by SIGUSR1 handler
2018-09-05 17:03:19 +02:00
Robert Schmidt
d3afce4f3c
Print detailed info why mutex locking failed
2018-09-05 14:21:39 +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
laurent
4c475c429b
first commit new itti
2018-08-06 16:52:27 +02:00
frtabu
b85cbddeec
log.c simplification, fix usefull functionality which never worked, move all log code from openair2 to common
2018-07-30 20:07:22 +02:00
Raymond Knopp
494348e2f0
Merge remote-tracking branch 'origin/develop' into enhancement-rfsim
2018-07-06 06:24:31 +02:00
laurent
6468f32c3b
remove precomputed turbo codec interleaver table, remove useless F1 and F2 parameters to turbo codec (also remove global var dependancy between libraries)
2018-07-03 22:40:44 +02:00
Raymond Knopp
27892e0935
Merge remote-tracking branch 'origin/develop' into enhancement-rfsim
...
Conflicts:
cmake_targets/build_oai
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-uesoftmodem.c
2018-06-28 14:44:47 -07:00
Cedric Roux
b65af94d47
Merge remote-tracking branch 'origin/311-encapsulate-lte_gold_generic-functionality' into develop
2018-06-18 16:25:57 +02:00
Cedric Roux
d579a74e54
Merge remote-tracking branch 'origin/migrate_rel10_rel14_to_make_version' into develop
2018-06-18 16:25:39 +02:00
Cedric Roux
5c6ad3142d
Merge remote-tracking branch 'origin/develop' into mu_with_tdd1
...
The monolithic eNodeB is not fully functional in FDD.
The TDD mode has not been tested.
Do not consider this commit as functional.
Conflicts:
cmake_targets/CMakeLists.txt
cmake_targets/build_oai
common/utils/itti/intertask_interface.c
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c
openair1/PHY/LTE_TRANSPORT/transport_eNB.h
openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
openair1/PHY/defs_eNB.h
openair1/PHY/impl_defs_lte.h
openair1/SCHED/fapi_l1.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/pusch_pc.c
openair2/COMMON/platform_types.h
openair2/COMMON/rrc_messages_types.h
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_paramdef.h
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue.c
openair2/LAYER2/MAC/mac.h
openair2/LAYER2/MAC/mac_proto.h
openair2/LAYER2/MAC/pre_processor.c
openair2/LAYER2/RLC/rlc.c
openair2/LAYER2/RLC/rlc_rrc.c
openair2/RRC/LITE/rrc_common.c
openair2/RRC/LTE/L2_interface.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/rrc_eNB.c
openair2/UTIL/LOG/log.h
targets/COMMON/openairinterface5g_limits.h
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.h
2018-06-12 16:23:36 +02:00
Sebastian Wagner
6742d6f471
Encapsulated lte_gold_generic functionality
2018-06-04 16:09:10 +02:00
Raymond Knopp
fa8b42c0d5
debugging of --siml1
2018-05-31 13:57:48 +02:00
Bi-Ruei, Chiu
f097cca7a5
Compare RRC_VERSION with MAKE_VERSION(x,y,z) macro to provide better SW configuration
...
To minimize migration effort, we follow the logic of legacy macro Rel10 and Rel14 used
for conditional compilation of current code.
In the future, they might be changed to accommodate finer software configuration, e.g.
MAKE_VERSION(12,2,0) or MAKE_VERSION(13,1,0) .... etc.
2018-05-29 18:00:58 +08:00
Guy De Souza
3ac00170b2
Compiling version- Merge with UE directory split
2018-05-16 11:37:57 +02:00
Cedric Roux
68479fa4f8
Merge remote-tracking branch 'origin/develop-uedirectorysplit' into develop_integration_2018_w19
...
Status so far:
- monolithic eNB compiles and is functional with 1 UE in FDD, 5/10/20MHz.
For 20MHz we don't have a nice TCP downlink (on haswell).
- oaisim does not compile
- UE does not compile
- phy simulators don't compile
- many new warnings
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/LTE_TRANSPORT/transport_eNB.h
openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
openair1/PHY/defs_eNB.h
openair1/SCHED/pusch_pc.c
openair1/SCHED/sched_common.h
openair1/SCHED_UE/phy_procedures_lte_ue.c
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler_mch.c
openair2/LAYER2/MAC/mac.h
openair2/LAYER2/MAC/ra_procedures.c
openair2/LAYER2/MAC/ue_procedures.c
openair2/RRC/LTE/MESSAGES/asn1_msg.h
openair2/RRC/LTE/rrc_UE.c
openair2/RRC/LTE/rrc_defs.h
targets/RT/USER/lte-softmodem.h
targets/RT/USER/lte-ue.c
2018-05-14 16:28:04 +02:00
Guy De Souza
303d677197
Merge branch 'develop-uedirectorysplit' into nr_initialsync
2018-05-02 16:21:33 +02:00
Raymond Knopp
861d06e855
UE directory splits, creation of UE-specific files, common UE/eNB files and extraction of UE/common components from eNodeB files. renaming of files to minimize common names across directories (i.e. defs.h, vars.h, extern.h)
2018-04-22 11:33:43 -07:00
Raymond Knopp
b458c09841
Merge branch 'develop-uedirectorysplit' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-uedirectorysplit
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c
openair1/PHY/LTE_UE_TRANSPORT/dci_ue.c
2018-04-09 15:55:08 -07:00
Guy De Souza
7b524674c6
Intermediate commit/ Not working(defs issue)
2018-04-05 16:48:26 +02:00