Merge branch 'enhancement-10-harmony' of...
Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony Conflicts: openair1/PHY/LTE_TRANSPORT/prach.c openair1/SCHED/phy_procedures_lte_eNb.c targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c targets/RT/USER/lte-enb.c
No related branches found
No related tags found
Showing
- cmake_targets/autotests/test_case_list.xml 2 additions, 2 deletionscmake_targets/autotests/test_case_list.xml
- cmake_targets/tools/build_helper 1 addition, 3 deletionscmake_targets/tools/build_helper
- openair1/PHY/LTE_TRANSPORT/if4_tools.c 1 addition, 1 deletionopenair1/PHY/LTE_TRANSPORT/if4_tools.c
- openair1/PHY/LTE_TRANSPORT/prach.c 8 additions, 4 deletionsopenair1/PHY/LTE_TRANSPORT/prach.c
- openair1/PHY/defs.h 6 additions, 3 deletionsopenair1/PHY/defs.h
- openair1/PHY/vars.h 1 addition, 1 deletionopenair1/PHY/vars.h
- openair1/SCHED/phy_procedures_lte_eNb.c 12 additions, 12 deletionsopenair1/SCHED/phy_procedures_lte_eNb.c
- targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c 2 additions, 1 deletiontargets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
- targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c 1 addition, 1 deletiontargets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
- targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf 3 additions, 0 deletions...S/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf
- targets/RT/USER/lte-enb.c 230 additions, 143 deletionstargets/RT/USER/lte-enb.c
- targets/RT/USER/lte-softmodem.c 188 additions, 160 deletionstargets/RT/USER/lte-softmodem.c
- targets/SIMU/USER/init_lte.c 1 addition, 0 deletionstargets/SIMU/USER/init_lte.c
Loading
Please register or sign in to comment