Merge remote-tracking branch 'origin/oaisim-rru' into develop_integration_w06
Conflicts: openair2/RRC/LITE/rrc_UE.c
No related branches found
No related tags found
Showing
- cmake_targets/CMakeLists.txt 3 additions, 1 deletioncmake_targets/CMakeLists.txt
- cmake_targets/build_oai 11 additions, 2 deletionscmake_targets/build_oai
- openair1/PHY/LTE_TRANSPORT/dci_tools.c 4 additions, 2 deletionsopenair1/PHY/LTE_TRANSPORT/dci_tools.c
- openair1/PHY/LTE_TRANSPORT/prach.c 34 additions, 13 deletionsopenair1/PHY/LTE_TRANSPORT/prach.c
- openair1/PHY/LTE_TRANSPORT/ulsch_modulation.c 1 addition, 1 deletionopenair1/PHY/LTE_TRANSPORT/ulsch_modulation.c
- openair1/PHY/defs.h 1 addition, 0 deletionsopenair1/PHY/defs.h
- openair1/SCHED/phy_mac_stub.c 147 additions, 29 deletionsopenair1/SCHED/phy_mac_stub.c
- openair1/SCHED/phy_procedures_lte_eNb.c 5 additions, 1 deletionopenair1/SCHED/phy_procedures_lte_eNb.c
- openair1/SCHED/phy_procedures_lte_ue.c 15 additions, 18 deletionsopenair1/SCHED/phy_procedures_lte_ue.c
- openair2/LAYER2/MAC/rar_tools.c 1 addition, 1 deletionopenair2/LAYER2/MAC/rar_tools.c
- openair2/RRC/LITE/rrc_UE.c 7 additions, 3 deletionsopenair2/RRC/LITE/rrc_UE.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.generic.oaisim.local_no_mme.conf 1 addition, 1 deletion...E-EPC/CONF/enb.band7.tm1.generic.oaisim.local_no_mme.conf
- targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.25PRB.lo.conf 191 additions, 0 deletions...TS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.25PRB.lo.conf
- targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf 191 additions, 0 deletions...TS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
- targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.conf 193 additions, 0 deletions...ENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.conf
- targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.50PRB.oaisim.conf 193 additions, 0 deletions...ENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.50PRB.oaisim.conf
- targets/RT/USER/lte-enb.c 28 additions, 19 deletionstargets/RT/USER/lte-enb.c
- targets/RT/USER/lte-softmodem.c 1 addition, 1 deletiontargets/RT/USER/lte-softmodem.c
- targets/RT/USER/lte-ue.c 28 additions, 22 deletionstargets/RT/USER/lte-ue.c
Loading
Please register or sign in to comment