Merge branch 'develop' into feature-127-protocol-split
Showing
- README.txt 1 addition, 0 deletionsREADME.txt
- ci-scripts/buildOnVM.sh 12 additions, 5 deletionsci-scripts/buildOnVM.sh
- ci-scripts/cppcheck_suppressions.list 9 additions, 0 deletionsci-scripts/cppcheck_suppressions.list
- ci-scripts/createVM.sh 31 additions, 0 deletionsci-scripts/createVM.sh
- ci-scripts/main.py 20 additions, 0 deletionsci-scripts/main.py
- ci-scripts/runTestOnVM.sh 8 additions, 1 deletionci-scripts/runTestOnVM.sh
- common/utils/T/tracer/gui/notify.c 1 addition, 1 deletioncommon/utils/T/tracer/gui/notify.c
- common/utils/T/tracer/textlog.c 3 additions, 0 deletionscommon/utils/T/tracer/textlog.c
- common/utils/T/tracer/utils.c 1 addition, 1 deletioncommon/utils/T/tracer/utils.c
- openair1/PHY/TOOLS/lte_phy_scope_tm4.c 0 additions, 3 deletionsopenair1/PHY/TOOLS/lte_phy_scope_tm4.c
- openair2/LAYER2/MAC/eNB_scheduler_dlsch.c 850 additions, 531 deletionsopenair2/LAYER2/MAC/eNB_scheduler_dlsch.c
- openair2/LAYER2/MAC/eNB_scheduler_fairRR.c 17 additions, 9 deletionsopenair2/LAYER2/MAC/eNB_scheduler_fairRR.c
- openair2/LAYER2/MAC/eNB_scheduler_primitives.c 1866 additions, 1387 deletionsopenair2/LAYER2/MAC/eNB_scheduler_primitives.c
- openair2/LAYER2/MAC/mac_proto.h 5 additions, 5 deletionsopenair2/LAYER2/MAC/mac_proto.h
- openair2/LAYER2/MAC/pre_processor.c 89 additions, 64 deletionsopenair2/LAYER2/MAC/pre_processor.c
- openair3/S1AP/s1ap_eNB_trace.c 1 addition, 1 deletionopenair3/S1AP/s1ap_eNB_trace.c
- openair3/TEST/EPC_TEST/generate_scenario.c 1 addition, 1 deletionopenair3/TEST/EPC_TEST/generate_scenario.c
- openair3/TEST/EPC_TEST/play_scenario.c 1 addition, 1 deletionopenair3/TEST/EPC_TEST/play_scenario.c
- targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp 13 additions, 6 deletionstargets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
- targets/RT/USER/lte-ru.c 20 additions, 28 deletionstargets/RT/USER/lte-ru.c
Loading
Please register or sign in to comment