Skip to content
  • Cédric Roux's avatar
    Merge remote-tracking branch 'origin/develop-uedirectorysplit' into develop_integration_2018_w19 · 68479fa4
    Cédric Roux authored
    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
    68479fa4