cig
7344d87567
Merge branch 'fhg-ta' into fhg-ra
2020-02-03 10:45:29 +01:00
Raymond Knopp
2ebc75b9a2
fixes for the thread blocking problem
2020-01-22 15:09:32 +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
Raphael Defosseux
c409da3bb8
Patch provided by Gabriel Arrobo.
...
Mainly comestics and integer type management
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-01-09 14:10:04 +01:00
Florian Kaltenberger
da8be6a78b
Merge remote-tracking branch 'origin/pdcp-ul-noS1-v2' into integration-develop-nr-2019w50
2019-12-12 12:52:55 +01:00
Florian Kaltenberger
e104d640e0
Merge remote-tracking branch 'origin/ru-parallel-beamforming-merge' into integration-develop-nr-2019w50
2019-12-12 12:49:55 +01:00
laurent
ec08b771b1
merge develop-nr
2019-12-05 05:07:23 +01:00
laurent
80cd6940af
modifications
2019-12-05 04:53:56 +01:00
Florian Kaltenberger
c4121a997f
registering log components
2019-11-25 22:07:51 +01:00
Wang Tsu-Han
d252696b14
Merge branch 'develop-nr' into ru-parallel-beamforming
...
Conflicts:
common/utils/T/T_defs.h
executables/nr-ru.c
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
openair1/PHY/defs_RU.h
openair1/SCHED_NR/nr_ru_procedures.c
openair1/SCHED_NR/sched_nr.h
openair2/LAYER2/NR_MAC_gNB/nr_mac_common.c
2019-11-05 15:43:19 +01:00
Wang Tsu-Han
57421caae5
adding tracer for tx fronthaul
2019-11-04 15:32:25 +01:00
yilmazt
08eda57aca
final minor changes before the merge
2019-10-08 18:32:02 +02:00
yilmazt
5f46038ed5
Merge branch 'develop-nr' into develop-nr_cppcheck
2019-10-07 12:09:18 +02:00
Sebastian Wagner
03da0a5ed8
CI: fixing compilation warning in phy simulators
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-10-05 11:24:03 +02:00
yilmazt
9aa3483235
executables compiling again
2019-10-03 16:00:46 +02:00
yilmazt
84af6103f8
another batch of cppcheck error corrections
2019-09-24 11:59:17 +02:00
javier.morgade@ieee.org
ac1347843f
COMMON types updated: VCD,FAPI
...
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@ieee.org <javier.morgade@ieee.org >
2019-09-14 12:55:32 +02:00
Wang Tsu-Han
9ccb93a094
adding mask for feptx thread and VCD logging
2019-09-09 15:36:08 +02:00
Khalid Ahmed
9078c5dcb2
Adding VCD functions to NR dlschsim
2019-08-29 09:10:32 +02:00
Khalid Ahmed
c984c71f52
Adding VCD liberaries to nr-softmodem/nr-uesoftmodem
2019-08-28 10:52:29 +02:00
yilmazt
920c1452bd
Minor changes to the organization of nr_phy simulators
2019-07-31 17:40:05 +02:00
yilmazt
4967e1b1ac
develop&-nr up-to-date as of 30.7.19
2019-07-30 22:01:48 +02:00
yilmazt
e823ae9d0b
phy_simulators working again
2019-07-20 17:52:32 +02:00
yilmazt
2b321fd1c7
Merging latest develop commits
2019-07-16 11:20:24 +02:00
Wu Jing
4239dacd02
Merge branch 'OAI_develop' into oai_develop_nfapi
2019-07-02 22:23:35 +09:00
Raphael Defosseux
8f68d596f1
Merge remote-tracking branch 'origin/develop-entv' into develop_integration_2019_w25
2019-06-18 13:42:50 +02:00
yilmazt
ce9c9ec88f
develop and develop-nr are now current as of 14.6.19
2019-06-17 16:11:52 +02:00
yilmazt
420e6194d4
All 4 nr<e-(ue)softmodems are compiling
2019-06-16 19:46:11 +02:00
WANG Tsu-Han
bdc6aff4a0
adding tracer
2019-06-11 16:43:17 +02:00
Wu Jing
4cd5d80d98
add log-mem function to collect log
2019-06-08 13:32:12 +09:00
yilmazt
f6a4a6b99a
phy_simulators do compile, but dlsim&nr_(ulsch/dlsch/pbch)sims do not pass tests + Raphael's CI patch applied.
2019-05-23 21:47:49 +02: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
Javier Morgade
786895dcd9
Merge remote-tracking branch 'origin/develop' into develop-entv
2019-05-17 18:11:55 +02:00
yilmazt
7719314983
Merge branch 'develop' into develop-nr
2019-05-17 17:11:31 +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
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
yilmazt
5fa78b4d6e
Final --phy_simulators warning removals for this branch, and former polar coding function corrections
2019-04-16 17:24:58 +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
Javier Morgade
a3f2ce1b2c
VCD FeMBMS Prototypes
2019-04-11 21:32:32 +02:00
Louis Adrien Dufrene
81f04d2982
Apply diff between ssr (CDRX) branch and develop
2019-04-04 08:17:26 +02:00
laurent
48a103ea82
fixes
2019-04-03 22:12:10 +02: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
1a07a1e067
Replace redundant CU_F1AP/DU_F1AP with F1AP
2019-02-22 10:26:41 +01:00
Robert Schmidt
030e11ba9a
Merge branch 'develop' into feature-127-protocol-split
2019-02-21 20:18:35 +01:00
Raymond Knopp
1b013ece30
Merge remote-tracking branch 'origin/ru_rau_enhancement-external-timing' into ru_rau_enhancement_L1_renaming
2019-01-30 11:42:54 +01:00
Raymond Knopp
72b5745abb
Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement-external-timing
...
Conflicts:
openair1/PHY/LTE_TRANSPORT/if4_tools.c
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/defs_eNB.h
openair1/SCHED_UE/phy_procedures_lte_ue.c
openair1/SIMULATION/LTE_PHY/dlsim.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.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
targets/RT/USER/lte-uesoftmodem.c
targets/RT/USER/rfsim.c
2019-01-26 11:54:10 +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
frtabu
e329ba787c
fix command line parsing for config_getlist, also improve help processing and fix probe (opt) parameters processing
2019-01-22 22:43:33 +01:00