Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

openairinterface5G
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

fb054e65

Commit fb054e65 authored 6 years ago by HARADA Masayuki

Downloads
- Plain Diff

Merge branch 'sp3_master' into scd_refactoring

# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c

parents ff604660 14740aec

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c 13 additions, 11 deletions

openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
openair1/SCHED/phy_procedures_lte_eNb.c 49 additions, 6 deletions

openair1/SCHED/phy_procedures_lte_eNb.c
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c 0 additions, 20 deletions

openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c 29 additions, 28 deletions

openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp 1 addition, 0 deletions

targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
targets/RT/USER/lte-softmodem.c 23 additions, 12 deletions

targets/RT/USER/lte-softmodem.c

with 115 additions and 77 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment