Commit Graph
292 Commits
Author SHA1 Message Date
Cedric Roux 74afbf84f4 warning fix: remove pragma in LFDS
Not sure that it's correct, but those #pragma seem
to be of no use for gcc. Let's remove them
completely.
2017-02-17 18:07:05 +01:00
Cedric Roux 76574a1ac0 Revert "fix nettle"
This reverts commit d31634c358.

Laurent Thomas had a problem on one machine with the build_oai
way of checking for nettle.

The problem with the alternative solution of including nettle/bignum.h
is that it is very unclear.

The problem with nettle is that the file nettle/config.h does not
exist for version 2. It was introduced in version 3.

We want to support both versions, but there is an API incompatibility.
So we need an #if #else mechanism.

The file nettle/bignum.h is present in both versions 2 and 3 and it
includes nettle/version.h in the version 3.

So by including this file, we can check for the existence of
NETTLE_VERSION_MAJOR (that comes from nettle/config.h) in the
code.

But as you can see, the reasoning is way too complex.

So it's better to keep the check in cmake_targets/CMakeLists.txt.

As long as we support version 2 this will be the way to go.

It is possible to force a given version in specific non-generic
customized environments.
2017-02-17 12:29:31 +01:00
gabrielC eadcba956e Merge branch 'develop-realtime-lts' into develop_integration_w07
Conflicts:
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c
2017-02-17 11:51:03 +01:00
Cedric Roux f92bd91544 Merge branch 'enhancement-199-nas-multi-ue' into develop_integration_w07
Conflicts:
	openair1/SCHED/phy_procedures_lte_ue.c
	targets/RT/USER/lte-softmodem.c
	targets/SIMU/USER/oaisim.c
	targets/SIMU/USER/oaisim_functions.c
2017-02-16 12:14:26 +01:00
Laurent d65d91ddcc gcc warning fix 2017-02-14 18:18:34 +01:00
laurent 3c191c26f3 fix BCH tracking 2017-02-09 17:46:04 +01:00
laurent 51b23b4061 merge latest develop, enhance real time, set back BCH tracing in UE as in develop branch 2017-02-08 21:19:10 +01:00
Laurent 094ac2f3ea merge with head of branch 2017-02-01 15:03:57 +01:00
Laurent 9f33d0904b merge develop 2017-02-01 13:08:35 +01:00
Elena_Lukashova a51c30f459 Merge branch 'develop' into feature-59-tm4
dlsim_tm4 works fine.
dlsim has a bug in llr processing after llr computations (see XFORMS).
2017-01-30 13:37:24 +01:00
Imad ALAWE b3ded7799a openairinterface5g: Fix multi definition of UE/eNB NB_MAX
In openairinterface5g many definitions in many layers of UE or eNB NB_MAX.
We created a file called openairinterface5g_limits.h
located at openairinterface5g_dir/targets/COMMON/ declaring the number max
of UE and eNB to be used in ALL layers depending on launching conditions
(LARGE_SCALE for example).
2017-01-25 13:58:53 +01:00
Cedric Roux 69c8b8a933 Merge branch 'feature-68-enb-agent' into develop_integration_w03 2017-01-20 16:59:16 +01:00
Cedric Roux e6f3c9b899 Merge branch 'enhancement-10-harmony' into develop_integration_w03
Conflicts:
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
2017-01-20 16:49:39 +01:00
Xenofon Foukas 84b61f2264 Merge remote-tracking branch 'origin/develop' into feature-68-enb-agent 2017-01-16 17:47:17 +02:00
Xenofon Foukas 9fc584d173 Fixed FlexRAN-related warnings 2017-01-16 17:45:58 +02:00
Xenofon Foukas dc8190dc6a Fixed issue with #pragma warnings in liblfds 2017-01-16 17:44:43 +02:00
Raymond Knopp 8be18c360b debugging for RRU if4p5 TDD 2017-01-15 08:58:26 +01:00
Laurent 396d59ff22 merge last develop 2017-01-11 23:07:22 +01:00
Cedric Roux f2f32f5340 fix LOG_X macros
Some of them might not be correctly handled.
I put /* TODO: XXX */ where I didn't know if
the fix was correct.
2017-01-11 15:48:00 +01:00
Cedric Roux cb67d586a4 add format indicator to get LOG_X warnings
The LOG_X macros emit a lot of warnings when compiling with the T
because they call the function logRecord (or logRecord_mt)
which has not been "marked" as calling printf, so gcc won't
emit typical printf warnings.

With the T, they directly translate to sprintf, so those warnings
pop up, much more verbose due to several macro expansions.

Let's make them pop up all the time so it's easier to fix them.
2017-01-10 14:21:02 +01:00
laurent d31634c358 fix nettle 2017-01-07 08:23:50 +01:00
Cedric Roux e05bf365be Merge branch 'bugfix-177' into develop_integration_wk01
Smoe conflicts, manually resolved.

Conflicts:
	openair1/SCHED/phy_procedures_lte_ue.c
2017-01-06 11:12:06 +01:00
Wilson W.K. Thong 4fe2d6d724 fix noise power calculation and downlink CQI reporting
see issue #177
2017-01-06 12:08:51 +08:00
laurent 2612df9ef2 after tests 2016-12-29 10:09:13 +01:00
laurent 3b44919d0b better performance measurements 2016-12-27 15:48:56 +01:00
laurent cedde4ad1f realtime for UE 2016-12-26 21:19:26 +01:00
Wilson W.K. Thong dabdf7933b add more logs to debug memory leak problem 2016-12-21 17:20:14 +08:00
Wilson W.K. Thong afeb256604 add more VCD logs to debug thread timing issue
see issue #166
2016-12-21 16:55:46 +08:00
Wilson W.K. Thong 8673fa8415 hotfix VCD log dump for thread timing debugging
see issue #165
2016-12-21 16:28:50 +08:00
gabrielC f79dd53edf Merge remote-tracking branch 'origin/feature-21-TM7-tmp' into develop_integration_w50 2016-12-15 11:39:04 +01:00
hbilel 7a92f587e5 Merge branch 'ue-tdd_fix_issueOai1B_45' into develop_integration_w50 2016-12-13 12:51:05 +01:00
hbilel 495e357a1e Merge branch 'develop1B' of https://gitlab.eurecom.fr/oai1B/openairinterface5g into enhancement-45
Conflicts:
	openair2/LAYER2/MAC/ue_procedures.c
2016-12-13 12:31:45 +01:00
hbilel 35ae311ac8 Merge branch 'develop1B' of https://gitlab.eurecom.fr/oai1B/openairinterface5g into bugfix-44 2016-12-13 12:27:41 +01:00
Florian Kaltenberger e470e2d3bd Merge remote-tracking branch 'origin/develop' into feature-21-TM7-tmp
Conflicts:
	targets/RT/USER/lte-enb.c
2016-12-07 09:40:20 +01:00
Wilson W.K. Thong e6671827bb clean up changes for submission 2016-12-07 14:42:26 +08:00
Wilson W.K. Thong 55e50b2052 enhanced wireshark logging. also logs BCH, PRACH and RAR. Tested with wireshark 2.2.2 on linux and windows
see issue #45
2016-12-07 10:45:44 +08:00
gabrielC 0fb34b2e28 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop1B 2016-12-06 12:05:25 +01:00
Wilson W.K. Thong 4a0e4b5e14 fixing thread busy crash: add more VCD logs to debug timing issues 2016-12-06 10:34:07 +08:00
Xenofon Foukas 8def47c488 Changed old licenses in FlexRAN agent source files 2016-12-05 22:04:12 +02:00
GabrirelCouturier 9c4cee34f0 [OAI-UE] several fixes in OAI-UE
1- implement max harq retrans
           2- bug in harqId > 1 for dci format 1A
           3- wrong G computation
           4- bug in harq UL for scheduling flag
           5- initial sync, limit freq offset to 150Hz
2016-11-21 11:30:24 +01:00
Florian Kaltenberger 8769024922 Merge remote-tracking branch 'origin/develop' into feature-21-TM7
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/INIT/lte_param_init.c
	openair1/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
	openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
	openair1/PHY/LTE_REFSIG/lte_dl_uespec.c
	openair1/PHY/LTE_TRANSPORT/dci.c
	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/PHY/LTE_TRANSPORT/initial_sync.c
	openair1/PHY/LTE_TRANSPORT/pbch.c
	openair1/PHY/LTE_TRANSPORT/pilots.c
	openair1/PHY/LTE_TRANSPORT/pmch.c
	openair1/PHY/LTE_TRANSPORT/proto.h
	openair1/PHY/defs.h
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/phy_procedures_lte_ue.c
	openair1/SIMULATION/LTE_PHY/dlsim.c
	openair1/SIMULATION/LTE_PHY/mbmssim.c
	openair1/SIMULATION/LTE_PHY/pdcchsim.c
	openair1/SIMULATION/LTE_PHY/ulsim.c
	openair2/ENB_APP/enb_config.c
	openair2/RRC/LITE/rrc_eNB.c
	targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c
	targets/RT/USER/sched_rx_pdsch.c
	targets/SIMU/USER/init_lte.c
	targets/SIMU/USER/oaisim_functions.c
2016-11-18 15:35:21 +01:00
Xenofon Foukas 8baf3e7e57 Changed naming convention for flexran related calls 2016-11-04 17:28:04 +02:00
hbilel 31fbc80520 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop1B
parent a6742020 - Commit 1fa2f76e61

Conflicts:
	targets/RT/USER/lte-softmodem.c
2016-10-24 16:21:05 +02:00
Xenofon Foukas 93b9b73582 Merge remote-tracking branch 'oai/develop' into oai-integration
Conflicts:
	cmake_targets/tools/build_helper
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/eNB_scheduler.c
2016-10-18 16:27:56 +03:00
Rohit Gupta e084e58388 merge from develop 2016-10-11 18:52:14 +02:00
fnabet 1b8c0d6551 merge from oai1B/develop1B 2016-10-10 14:55:46 +02:00
Navid Nikaein 6277038d7f remove the OMG SUMO related files and update te top-level OMG and cmakefiles 2016-10-10 13:32:16 +02:00
Rohit Gupta 4787c975ec delete files with GPL License + modify build scripts 2016-10-07 18:19:43 +02:00
Florian Kaltenberger 3e81e8c86b Merge remote-tracking branch 'origin/develop' into feature-59-tm4
Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/PHY/LTE_TRANSPORT/proto.h
	openair1/PHY/MODULATION/slot_fep.c
	openair1/PHY/TOOLS/lte_phy_scope.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SIMULATION/LTE_PHY/dlsim.c
2016-10-06 21:56:06 +02:00
Cedric Roux 494e0dc276 bugfix: forgot to reprocess files in the previous commit 2016-10-03 10:41:29 +02:00