Merge branch 'enhancement-10-harmony' of...
Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony Conflicts: openair1/SCHED/phy_procedures_lte_eNb.c
No related branches found
No related tags found
Showing
- openair1/PHY/INIT/lte_init.c 31 additions, 21 deletionsopenair1/PHY/INIT/lte_init.c
- openair1/PHY/LTE_TRANSPORT/if4_tools.c 9 additions, 5 deletionsopenair1/PHY/LTE_TRANSPORT/if4_tools.c
- openair1/PHY/LTE_TRANSPORT/pcfich.c 1 addition, 1 deletionopenair1/PHY/LTE_TRANSPORT/pcfich.c
- openair1/PHY/MODULATION/defs.h 1 addition, 1 deletionopenair1/PHY/MODULATION/defs.h
- openair1/PHY/MODULATION/ofdm_mod.c 11 additions, 11 deletionsopenair1/PHY/MODULATION/ofdm_mod.c
- openair1/PHY/MODULATION/slot_fep_ul.c 9 additions, 5 deletionsopenair1/PHY/MODULATION/slot_fep_ul.c
- openair1/PHY/defs.h 3 additions, 1 deletionopenair1/PHY/defs.h
- openair1/SCHED/defs.h 1 addition, 1 deletionopenair1/SCHED/defs.h
- openair1/SCHED/phy_procedures_lte_eNb.c 12 additions, 13 deletionsopenair1/SCHED/phy_procedures_lte_eNb.c
- openair1/SIMULATION/LTE_PHY/dlsim.c 9 additions, 2 deletionsopenair1/SIMULATION/LTE_PHY/dlsim.c
- targets/ARCH/COMMON/common_lib.h 2 additions, 2 deletionstargets/ARCH/COMMON/common_lib.h
- targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp 4 additions, 1 deletiontargets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
- targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.100PRB.usrpb210.conf 1 addition, 1 deletion...RIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.100PRB.usrpb210.conf
- targets/RT/USER/lte-enb.c 27 additions, 12 deletionstargets/RT/USER/lte-enb.c
- targets/RT/USER/lte-softmodem.c 17 additions, 19 deletionstargets/RT/USER/lte-softmodem.c
- targets/RT/USER/rru_if4p5_usrp.gtkw 6 additions, 120 deletionstargets/RT/USER/rru_if4p5_usrp.gtkw
- targets/SIMU/USER/init_lte.c 29 additions, 23 deletionstargets/SIMU/USER/init_lte.c
- targets/SIMU/USER/init_lte.h 1 addition, 0 deletionstargets/SIMU/USER/init_lte.h
Loading
Please register or sign in to comment