 bruno mongazon
|
b016bc229a
|
fixed #320 issue
|
2018-06-25 18:23:36 +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 |
|
|
Masayuki HARADA
|
fb054e6523
|
Merge branch 'sp3_master' into scd_refactoring
# Conflicts:
# openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
|
2018-05-29 14:24:25 +09:00 |
|
|
Masayuki HARADA
|
f55bd83d55
|
select scheduler by config file
|
2018-05-17 18:27:09 +09:00 |
|
|
Masayuki HARADA
|
677ad4298c
|
Devide source file of scheduler
|
2018-05-17 10:48:39 +09:00 |
|