Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

openairinterface5G
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

Maintenance operation of our GitLab server is scheduled for Wednesday, April 16, 2025, at 2PM.

5b7ae122

Commit 5b7ae122 authored 4 years ago by Roberto Louro Magueta

Downloads
- Patches
- Plain Diff

Fix develop merge conflicts

parent 03b52cec

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

cmake_targets/CMakeLists.txt 50 additions, 50 deletions

cmake_targets/CMakeLists.txt
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c 1 addition, 1 deletion

openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c 3 additions, 1 deletion

openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair2/LAYER2/NR_MAC_UE/mac_vars.c 1 addition, 1 deletion

openair2/LAYER2/NR_MAC_UE/mac_vars.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c 31 additions, 30 deletions

openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c 8 additions, 6 deletions

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/RRC/NR_UE/rrc_UE.c 129 additions, 14 deletions

openair2/RRC/NR_UE/rrc_UE.c

with 223 additions and 103 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