Wang Tsu-Han
d45fcd6fc2
Merge branch 'develop' into parallel-phy-test-EMUFH
...
Conflicts:
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/PHY/LTE_UE_TRANSPORT/get_pmi.c
openair2/LAYER2/MAC/eNB_scheduler_phytest.c
openair3/S1AP/MESSAGES/ASN1/R8/s1ap-8.10.0.asn1
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ru.c
targets/RT/USER/rfsim.h
2018-07-30 11:42:34 +02:00
Wang Tsu-Han
aa00a4734a
reset for remerging
2018-07-30 11:24:08 +02:00
Raymond Knopp
11c4cb9b33
1. fixed initialization issues for lte-uesoftmodem when running with non RF simulation target.
...
2. minor modifications in dlsch_demodulation.c for 2 eNB TX antennas, 1 RX antenna. Inconsistant indexing of some arrays in this case.
3. change in config_load_configmodule.c : removed exit(-1) when no configuration file is used. This makes unitary simulators exit. Effect on lte-XXsoftmodem TBC.
2018-07-25 00:33:04 +02:00
Cedric Roux
1961fd7f20
remove gccxml/castxml
...
This was used for the ITTI analyzer.
The ITTI analyzer is now to be considered obsolete.
The source code will be removed at some point.
2018-07-24 15:52:04 +02:00
Cedric Roux
b1d0287327
Merge remote-tracking branch 'origin/issue321_tdd_config1' into develop_integration_2018_w29
...
Conflicts:
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
2018-07-20 12:26:13 +02:00
Cedric Roux
e7ea9e7611
Merge remote-tracking branch 'origin/issue326_LOGreview' into develop_integration_2018_w29
...
Conflicts:
cmake_targets/CMakeLists.txt
2018-07-20 12:11:52 +02:00
Cedric Roux
c836ef28f4
Merge remote-tracking branch 'origin/enhancement-rfsim' into develop_integration_2018_w29
...
Conflicts:
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/UTIL/LOG/log.c
targets/RT/USER/lte-uesoftmodem.c
targets/SIMU/USER/oaisim.c
targets/SIMU/USER/oaisim_functions.c
2018-07-20 12:06:26 +02:00
Raymond Knopp
3539761c28
Log review step 1: legacy VCD removal, LOG macro modified, TTracer enabled at build time by default, in a way it, by default configuration, provides console logs, as in previous versions
2018-07-13 16:43:34 +02:00
Haruki NAOI
eb030b6a29
fix: compile error using "--mu" build option.
2018-07-13 14:53:14 +09:00
Haruki NAOI
b033317286
Merge remote-tracking branch 'remotes/origin/develop' into issue321_tdd_config1
...
# Conflicts:
# openair2/UTIL/LOG/log.c
2018-07-13 14:13:10 +09:00
Raymond Knopp
b2821c1f53
T tracer configuration identical for all executables, no ref to T Tracer config variables (T_port, T_wait...) outside the T tracer
2018-07-09 15:18:27 +02:00
oai
719762ccab
fix basic_simulator compilation failure
2018-07-06 15:30:02 +02:00
Raymond Knopp
494348e2f0
Merge remote-tracking branch 'origin/develop' into enhancement-rfsim
2018-07-06 06:24:31 +02:00
oai
bfecc0110b
Remove compilation warnings, also fix telnet server compilation failure and NB-IoT shared lib compilation failure introduced when reviewing L1 sources organization
2018-07-05 17:37:38 +02:00
Haruki NAOI
823c838d21
Merge remote-tracking branch 'remotes/origin/develop' into issue321_tdd_config1
2018-07-05 11:15:30 +09:00
Haruki NAOI
4f52f5a748
fix: sync_cond is posted before eNB_thread_rxtx thread is not activated.
2018-07-05 10:13:17 +09:00
Raphael Defosseux
f3b5f5433c
Merge branch 'develop' into '322-code-cleanup-log_m-to-replace-write_output'
...
# Conflicts:
# openair1/PHY/LTE_UE_TRANSPORT/srs_modulation.c
2018-07-03 15:48:19 +02:00
Raymond Knopp
5a808cb1ca
Merge branch 'develop' into enhancement-rfsim
...
Conflicts:
openair1/SCHED_UE/phy_procedures_lte_ue.c
openair2/RRC/LTE/rrc_UE.c
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-uesoftmodem.c
2018-06-28 14:54:15 -07:00
Raymond Knopp
d0926ec041
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop
...
Conflicts:
targets/RT/USER/lte-uesoftmodem.c
2018-06-28 14:49:23 -07: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
bruno mongazon
94611edefe
fix issue #322
2018-06-28 14:15:15 +02:00
bruno mongazon
7a5c40c130
fix issue #320 after having to merge with develop again since committed in the meantime
2018-06-26 15:08:49 +02:00
Cedric Roux
142fa8f4da
hotfix: remove code that deadlocks
...
We have to not call that function here because
it blocks everything if number of proc > 4.
2018-06-26 10:43:31 +02:00
bruno mongazon
107e256170
fixed #320 issue
2018-06-25 18:42:31 +02:00
bruno mongazon
b016bc229a
fixed #320 issue
2018-06-25 18:23:36 +02:00
Raymond Knopp
fb4d10c83a
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop
2018-06-21 23:13:47 -07:00
matzakos
74d1853ef6
Minor modifications to make nfapi-L2-emulator work again and redundant logs removal.
2018-06-21 17:56:29 +02:00
Cedric Roux
0c445bedda
Merge remote-tracking branch 'origin/bugfix-310-IQrecplay' into develop
2018-06-18 16:25:48 +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
9adf1999db
Merge remote-tracking branch 'origin/oai_ue_fixes' into develop
...
Conflicts:
openair2/RRC/LTE/rrc_eNB.c
2018-06-18 16:13:06 +02:00
Haruki NAOI
0fb553916b
Fix: modify temporary disabled code by the commit of 5c6ad3142d.
2018-06-18 15:29:17 +09:00
Wang Tsu-Han
0b405e3d2b
throughput fix for sdu and config file change back to 93
2018-06-15 12:14:34 +02:00
Haruki NAOI
e84fd27ec1
Fix: build fails when executing build with option "--mu"
2018-06-14 16:49:45 +09: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
Wang Tsu-Han
e4a7318877
Merge branch 'develop' into parallel-phy-test-EMUFH
...
Conflicts:
openair1/PHY/defs_eNB.h
targets/RT/USER/lte-enb.c
2018-06-12 16:18:45 +02:00
Raymond Knopp
c2ad982b76
vcd debugging for RF simulator
2018-06-05 05:47:43 -07:00
Raymond Knopp
f1ddab49dc
Merge branch 'enhancement-rfsim' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-rfsim
2018-06-05 01:36:58 -07:00
Raymond Knopp
74c7d3efc4
Merge branch 'develop' into enhancement-rfsim
...
Conflicts:
targets/RT/USER/lte-uesoftmodem.c
2018-06-04 22:33:07 -07:00
Raymond Knopp
6416c6d4ea
minor changes to remove global variable in dci handling
2018-06-04 22:31:43 -07:00
bruno mongazon
acbd1f1f7d
fix issue 310 IQrecplay
2018-06-04 13:05:13 +02:00
Raymond Knopp
79de529592
removed undef in lte-softmodem.h
2018-06-04 01:36:11 +02:00
Raymond Knopp
8dd9cf3c86
creation of simulation data structure. some cleanup and testing with multiple UEs
2018-06-04 00:12:48 +02:00
Raymond Knopp
c3c6284b83
Merge remote-tracking branch 'origin/develop' into enhancement-rfsim
2018-06-03 08:57:24 +02:00
Raymond Knopp
b91a763065
removal of dead include
2018-06-03 08:56:33 +02:00
Raymond Knopp
293110e2cc
cleanup of warnings and default parameters for simulator target
2018-06-03 08:48:42 +02:00
Raymond Knopp
897de9f8e2
testing of rf simulation in UE
2018-06-02 10:10:35 -07:00
Wang Tsu-Han
b40215665a
fixes for printing single thread fep timing measurment
2018-05-31 14:20:18 +02:00
Raymond Knopp
fa8b42c0d5
debugging of --siml1
2018-05-31 13:57:48 +02:00
Raymond Knopp
16b7faaafa
added missing .h file
2018-05-30 17:52:49 -07:00
Raymond Knopp
eb363157c6
moved simulation target into lte-uesoftmodem with --simL1 option
2018-05-30 17:49:55 -07:00