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
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
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
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
Cedric Roux
ed49592754
integration fix: remove warnings
...
Remove warnings popping up on:
./build_oai --eNB -w USRP
Maybe not always the best solution.
2018-05-24 17:15:42 +02:00
Wang Tsu-Han
7e10daaf14
bug fix for phy-test DL
2018-05-15 15:21:32 +02:00
Wang Tsu-Han
db7b1f5903
phy test fix
2018-05-14 11:18:41 +02:00
Raymond Knopp
596736afae
dlsim/ulsim functional. lte-softmodem/lte-uesoftmodem compile.
2018-04-24 22:14:20 -07:00
Raymond Knopp
b2cc1252c6
Merge remote-tracking branch 'origin/develop' into RU-RAU-split-parallel-EMUFH-phy-test-merge
...
Conflicts:
cmake_targets/build_oai
common/utils/itti/intertask_interface.c
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/PHY/defs.h
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/ENB_APP/enb_paramdef.h
openair2/LAYER2/MAC/defs.h
openair2/LAYER2/MAC/eNB_scheduler.c
targets/ARCH/COMMON/common_lib.c
targets/COMMON/create_tasks.c
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-softmodem.h
2018-03-12 12:10:48 +01:00
Wang Tsu-Han
23f5628735
changing into double sided signal for pipeline
2018-03-05 11:20:51 +01:00
Wang Tsu-Han
cb4dc53042
adding wait stage for every wakeup
2018-02-22 15:59:23 +01:00
Wang Tsu-Han
56a32a22d4
changing emulate-rf into an executional option instead of compiler option
2018-02-21 18:13:34 +01:00
Wang Tsu-Han
869b9a5c6f
fix for phy-test UL and adding wakeup_txfh
2018-02-20 15:05:00 +01:00
Wolfgang A. Mozart
2194bc8564
fixed timing issue for phy-test scheduling UL. UL is broken after first execution of dlsch decoding
2018-02-19 10:45:34 +01:00
Wang Tsu-Han
bf601fce71
adding phy-test for UL
2018-02-16 19:15:40 +01:00
Wang Tsu-Han
3efaa38394
adjustable thread structure
2018-01-26 18:05:17 +01:00
Eurecom
30d5f151c3
specified modulation for QPSK
2018-01-22 18:02:02 +01:00
Wang Tsu-Han
d82a0d900d
adding ulsch_decoding multiy threading
2017-12-12 15:24:00 +01:00
Wang Tsu-Han
3f6c5430a2
changing back the rxtx thread and add another worker thread for coding
2017-11-10 14:23:18 +01:00
Wang Tsu-Han
ccba43e2f0
adding phy-test to config. fixing power allocation for phy-test.
2017-10-27 15:47:09 +02:00
Wang Tsu-Han
85ce7de775
added thread for TX streaming
2017-10-27 10:33:30 +02:00
Florian Kaltenberger
5487c709b1
adding some missing parameters
2017-10-23 15:02:08 +02:00
Florian Kaltenberger
2dc1a602c6
first phy-test version to be tested
2017-10-23 15:02:07 +02:00