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

e05bf365

Commit e05bf365 authored 8 years ago by Cédric Roux

Downloads
- Plain Diff

Merge branch 'bugfix-177' into develop_integration_wk01

Smoe conflicts, manually resolved.

Conflicts:
	openair1/SCHED/phy_procedures_lte_ue.c

parents 217eba6b 4fe2d6d7

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c 80 additions, 17 deletions

openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c 25 additions, 22 deletions

openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/initial_sync.c 1 addition, 1 deletion

openair1/PHY/LTE_TRANSPORT/initial_sync.c
openair1/PHY/LTE_TRANSPORT/proto.h 27 additions, 0 deletions

openair1/PHY/LTE_TRANSPORT/proto.h
openair1/PHY/LTE_TRANSPORT/sss.c 27 additions, 4 deletions

openair1/PHY/LTE_TRANSPORT/sss.c
openair1/PHY/LTE_TRANSPORT/uci_tools.c 1 addition, 0 deletions

openair1/PHY/LTE_TRANSPORT/uci_tools.c
openair1/PHY/LTE_TRANSPORT/ulsch_coding.c 2 additions, 0 deletions

openair1/PHY/LTE_TRANSPORT/ulsch_coding.c
openair1/SCHED/phy_procedures_lte_ue.c 9 additions, 5 deletions

openair1/SCHED/phy_procedures_lte_ue.c
openair2/UTIL/LOG/vcd_signal_dumper.c 3 additions, 0 deletions

openair2/UTIL/LOG/vcd_signal_dumper.c
openair2/UTIL/LOG/vcd_signal_dumper.h 3 additions, 0 deletions

openair2/UTIL/LOG/vcd_signal_dumper.h

with 178 additions and 49 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