Merge remote-tracking branch 'origin/ulSNRs' into develop
Conflicts: openair2/ENB_APP/MACRLC_paramdef.h openair2/LAYER2/MAC/mac.h
No related branches found
No related tags found
Showing
- openair1/SCHED/phy_procedures_lte_eNb.c 5 additions, 5 deletionsopenair1/SCHED/phy_procedures_lte_eNb.c
- openair2/ENB_APP/MACRLC_paramdef.h 6 additions, 0 deletionsopenair2/ENB_APP/MACRLC_paramdef.h
- openair2/ENB_APP/enb_config.c 2 additions, 0 deletionsopenair2/ENB_APP/enb_config.c
- openair2/LAYER2/MAC/eNB_scheduler.c 0 additions, 1 deletionopenair2/LAYER2/MAC/eNB_scheduler.c
- openair2/LAYER2/MAC/eNB_scheduler_dlsch.c 4 additions, 4 deletionsopenair2/LAYER2/MAC/eNB_scheduler_dlsch.c
- openair2/LAYER2/MAC/eNB_scheduler_ulsch.c 5 additions, 5 deletionsopenair2/LAYER2/MAC/eNB_scheduler_ulsch.c
- openair2/LAYER2/MAC/mac.h 3 additions, 0 deletionsopenair2/LAYER2/MAC/mac.h
- openair2/LAYER2/MAC/main.c 16 additions, 12 deletionsopenair2/LAYER2/MAC/main.c
- targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf 2 additions, 0 deletions...S/GENERIC-LTE-EPC/CONF/enb.band7.tm1.100PRB.usrpx310.conf
- targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf 2 additions, 0 deletions...TS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
Loading
Please register or sign in to comment