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

0b4716d7

Commit 0b4716d7 authored 4 years ago by Raphael Defosseux

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/NR_UL_scheduling' into develop_integration_2020_w36

parents 88b3d0af 1a8e5314

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/NR_TRANSPORT/pucch_rx.c 46 additions, 42 deletions

openair1/PHY/NR_TRANSPORT/pucch_rx.c
openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c 11 additions, 1 deletion

openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c 65 additions, 0 deletions

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c 0 additions, 59 deletions

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/mac_proto.h 1 addition, 1 deletion

openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/NR_PHY_INTERFACE/NR_IF_Module.c 1 addition, 1 deletion

openair2/NR_PHY_INTERFACE/NR_IF_Module.c

with 124 additions and 104 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