Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

340d05ee

Commit 340d05ee authored 8 years ago by Florian Kaltenberger

Downloads
- Plain Diff

Merge branch 'calib-LimeSDR' of https://gitlab.eurecom.fr/oai/openairinterface5g into calib-LimeSDR

Conflicts:
	targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp

parents 19a2337c 4342595e

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

cmake_targets/CMakeLists.txt 1 addition, 0 deletions

cmake_targets/CMakeLists.txt
openair1/SCHED/phy_procedures_lte_eNb.c 1 addition, 1 deletion

openair1/SCHED/phy_procedures_lte_eNb.c
targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp 29 additions, 14 deletions

targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.lmssdr.conf 6 additions, 6 deletions

...CTS/GENERIC-LTE-EPC/CONF/enb.band13.tm1.50PRB.lmssdr.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.lmssdr.conf 3 additions, 3 deletions

...ECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.lmssdr.conf
targets/RT/USER/lte-enb.c 3 additions, 2 deletions

targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ue.c 5 additions, 4 deletions

targets/RT/USER/lte-ue.c

with 48 additions and 30 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