Merge branch 'issue255_256_257_paging_reesta_release' into develop_integration_2018_w03
Conflicts: targets/RT/USER/lte-softmodem.c
No related branches found
No related tags found
Showing
- cmake_targets/CMakeLists.txt 1 addition, 0 deletionscmake_targets/CMakeLists.txt
- openair1/PHY/LTE_TRANSPORT/dci_tools.c 1 addition, 1 deletionopenair1/PHY/LTE_TRANSPORT/dci_tools.c
- openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c 19 additions, 1 deletionopenair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
- openair1/PHY/defs.h 1 addition, 0 deletionsopenair1/PHY/defs.h
- openair1/SCHED/defs.h 7 additions, 0 deletionsopenair1/SCHED/defs.h
- openair1/SCHED/phy_procedures_lte_common.c 20 additions, 0 deletionsopenair1/SCHED/phy_procedures_lte_common.c
- openair1/SCHED/phy_procedures_lte_eNb.c 2 additions, 2 deletionsopenair1/SCHED/phy_procedures_lte_eNb.c
- openair2/COMMON/mac_messages_def.h 2 additions, 0 deletionsopenair2/COMMON/mac_messages_def.h
- openair2/COMMON/mac_messages_types.h 8 additions, 0 deletionsopenair2/COMMON/mac_messages_types.h
- openair2/COMMON/pdcp_messages_def.h 1 addition, 0 deletionsopenair2/COMMON/pdcp_messages_def.h
- openair2/COMMON/pdcp_messages_types.h 10 additions, 0 deletionsopenair2/COMMON/pdcp_messages_types.h
- openair2/COMMON/s1ap_messages_def.h 9 additions, 0 deletionsopenair2/COMMON/s1ap_messages_def.h
- openair2/COMMON/s1ap_messages_types.h 118 additions, 12 deletionsopenair2/COMMON/s1ap_messages_types.h
- openair2/LAYER2/MAC/defs.h 20 additions, 0 deletionsopenair2/LAYER2/MAC/defs.h
- openair2/LAYER2/MAC/eNB_scheduler.c 54 additions, 2 deletionsopenair2/LAYER2/MAC/eNB_scheduler.c
- openair2/LAYER2/MAC/eNB_scheduler_dlsch.c 356 additions, 1 deletionopenair2/LAYER2/MAC/eNB_scheduler_dlsch.c
- openair2/LAYER2/MAC/eNB_scheduler_primitives.c 50 additions, 28 deletionsopenair2/LAYER2/MAC/eNB_scheduler_primitives.c
- openair2/LAYER2/MAC/eNB_scheduler_ulsch.c 2 additions, 0 deletionsopenair2/LAYER2/MAC/eNB_scheduler_ulsch.c
- openair2/LAYER2/MAC/extern.h 1 addition, 1 deletionopenair2/LAYER2/MAC/extern.h
- openair2/LAYER2/MAC/proto.h 8 additions, 0 deletionsopenair2/LAYER2/MAC/proto.h
Loading
Please register or sign in to comment