Commit Graph
1416 Commits
Author SHA1 Message Date
Rohit Gupta 02f3298a58 several fixes to previous commit. First tests in FDD with USRP and UE ok. 2017-03-10 16:18:40 +01:00
Florian Kaltenberger 7f24927c43 WIP: SRS configuration of PUSCH and PUCCH. No SRS detection yet. To be tested on HW 2017-03-10 12:42:04 +01:00
Cedric Roux 60b83d84ea hotfix: pass "%s" to LOG_W to avoid compilation warnings
The warning was:

------------------------
In file included from /roux/openairinterface5g/openair2/UTIL/LOG/log.h:306:0,
                 from /roux/openairinterface5g/openair1/PHY/defs.h:54,
                 from /roux/openairinterface5g/openair2/LAYER2/MAC/eNB_scheduler_ulsch.c:33:
/roux/openairinterface5g/openair2/UTIL/LOG/log.h: In function 'printMeas':
/roux/openairinterface5g/common/utils/T/T.h:94:26: warning: format not a string literal and no format arguments [-Wformat-security]
 #define T_ID(x) ((struct T_header *)(uintptr_t)(x))
                          ^
/roux/openairinterface5g/common/utils/T/T.h:29:22: note: in definition of macro 'T_PUT_int'
     int T_PUT_var = (val); \
                      ^
/roux/openairinterface5g/common/utils/T/T.h:269:7: note: in expansion of macro 'T_HEADER'
       T_HEADER(t); \
       ^
/roux/openairinterface5g/common/utils/T/T.h:101:76: note: in expansion of macro 'T3'
         n18,n19,n20,n21,n22,n23,n24,n25,n26,n27,n28,n29,n30,n31,n32,n,...) T##n
                                                                            ^
/roux/openairinterface5g/common/utils/T/T.h:102:16: note: in expansion of macro 'TN'
 #define T(...) TN(__VA_ARGS__)
                ^
/roux/openairinterface5g/openair2/UTIL/LOG/log.h:308:28: note: in expansion of macro 'T'
 #    define LOG_W(c, x...) T(T_LEGACY_ ## c ## _WARNING, T_PRINTF(x))
                            ^
/roux/openairinterface5g/common/utils/T/T_IDs.h:71:30: note: in expansion of macro 'T_ID'
 #define T_LEGACY_PHY_WARNING T_ID(68)
                              ^
/roux/openairinterface5g/openair2/UTIL/LOG/log.h:308:30: note: in expansion of macro 'T_LEGACY_PHY_WARNING'
 #    define LOG_W(c, x...) T(T_LEGACY_ ## c ## _WARNING, T_PRINTF(x))
                              ^
/roux/openairinterface5g/openair2/UTIL/LOG/log.h:411:9: note: in expansion of macro 'LOG_W'
         LOG_W(PHY,txt2);
------------------------

over and over.

By replacing LOG_W(PHY,txt2) by LOG_W(PHY,"%s",txt2) all the warnings
are removed.
2017-02-23 11:01:45 +01:00
Cedric Roux e62f569b5d Merge remote-tracking branch 'origin/various-l2-fixes-187' into develop_integration_w07 2017-02-17 18:23:00 +01:00
Cedric Roux 603c84c700 fix warnings: fix LOG_X problems when compiling lte-softmodem
The compilation line was:
    ./build_oai --eNB -w USRP

The file openairinterface5g/cmake_targets/log/lte-softmodem.Rel10.txt
has been checked and all LOG_X (and 'msg') warnings have been fixed.
2017-02-17 18:07:06 +01:00
Cedric Roux 96dc12ccce fix warning: add missing */ 2017-02-17 18:07:06 +01:00
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
Chia-Yu Chang 1b417979e9 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into various-l2-fixes-187
Conflicts:
	openair1/PHY/LTE_TRANSPORT/if4_tools.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.25PRB.lo.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.usrpb210.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.50PRB.oaisim.conf
2017-02-17 12:01:26 +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
pyroclaste 3dd1faadd4 Add the compression for IF5 and RTT measurements for FH and RF 2017-02-17 11:38:44 +01:00
Cedric Roux 1f3b1ff8ff integration fix: remove XER_PRINT from RRC 2017-02-16 12:53:25 +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 6f6f9acb52 merge develop; add option to set affinity in UE 2017-02-16 11:34:02 +01:00
Cedric Roux 6397e66c29 bugfix: fix PCDP inst (again)
This commit follows 7d9945e884.

lte-softmodem UE in S1 and lte-softmodem UE in noS1 modes behave
differently here.

This commit fixes the issue for thoses cases.

Other cases (eNB S1, eNB noS1, oaisim S1/noS1) have to be checked.
2017-02-16 11:23:24 +01:00
Cedric Roux 7d9945e884 bugfix: fix PDCP inst
This commit is a continuation of 614d6bbe2a
(ue_ip: use correct instance).

Now in openair2/NETWORK_DRIVER/UE_IP/common.c the 'inst' is not
forced to 1 anymore, we take the value 'pdcph_p->inst'.

It turns out that 'pdcph_p->inst' is 0 instead of 1 when we
run lte-softmodem as an UE.

So let's modify PDCP to set 'inst' to 1 where it was set to 0 for
the UE softmodem case, and skip the places where it is reset to 0,
still for the UE softmodem case.

This may break things, I am not sure.
2017-02-15 17:21:02 +01:00
Laurent d65d91ddcc gcc warning fix 2017-02-14 18:18:34 +01:00
Cedric Roux 6c789a36bc minor: add a comment 2017-02-14 16:18:54 +01:00
gabrielC 2dc9dc0316 Merge remote-tracking branch 'origin/tm4-fixes' into develop_integration_w07
Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/LTE_TRANSPORT/power_control.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	targets/SIMU/USER/oaisim_functions.c
2017-02-14 15:25:37 +01:00
Cedric Roux 614d6bbe2a ue_ip: use correct instance
The problem was the following.

Run oaisim with two UEs:

    sudo ../cmake_targets/oaisim_build_oai/build/oaisim -O enb.conf -u2 -s15 -AAWGN -y1 -b1 -Q0

Then wait for both UEs to be connected. The interfaces "oip1" and "oip2" are
activated, with IP addresses 192.172.0.2 for the first UE and 192.172.0.3 for
the second.

Then on the EPC machine, do:

    ping 192.172.0.3

No reply.
On the oaisim machine, we see that the packets are sent to "oip1" instead
of "oip2".

The fix may break softmodem UE. The inst was forced to "1" for some reason.
To be checked.
2017-02-14 10:58:06 +01:00
hbilel e88d1e739e [OAI-UE] new pucch procedure to support all formats 2017-02-13 16:15:47 +01:00
Xenofon Foukas 9e55f8ebcd Fixed bug in the establishment of DRBs 2017-02-11 17:57:11 +02:00
Cedric Roux 2bf1180884 Merge remote-tracking branch 'origin/feature-68-enb-agent' into develop_integration_w06
Conflicts:
	openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue.c
2017-02-10 12:22:46 +01:00
Cedric Roux 0ada1e9e32 Merge remote-tracking branch 'origin/oaisim-rru' into develop_integration_w06
Conflicts:
	openair2/RRC/LITE/rrc_UE.c
2017-02-10 11:36:06 +01:00
Elena_Lukashova b31282ae30 Merge branch 'develop' into feature-59-tm4 2017-02-09 18:03:16 +01:00
laurent 3c191c26f3 fix BCH tracking 2017-02-09 17:46:04 +01:00
Navid Nikaein 80eaec1d5c fix the protobuf installation under ubuntu 16.04 2017-02-09 09:23:13 +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
Navid Nikaein 5c09741fac Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into various-l2-fixes-187 2017-02-08 14:51:35 +01:00
Navid Nikaein 7e13688e80 fix again the compilation issue with flexran 2017-02-08 14:51:25 +01:00
Navid Nikaein 6b81ddf611 fix the compilation issue with flexran 2017-02-08 14:41:07 +01:00
Florian Kaltenberger e0b8998def fixing bug in PDSCH power allocation for TM2
Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/PHY/LTE_TRANSPORT/power_control.c
2017-02-07 10:02:49 +01:00
Xenofon Foukas 274030c4d5 Merge remote-tracking branch 'origin/develop' into feature-68-enb-agent 2017-02-06 12:29:53 +02:00
Raymond Knopp bb5ee76ad8 changes in oaisim to support RRU + fronthaul. minor bugs corrected in UE. 2017-02-05 14:31:00 -08:00
Xenofon Foukas 31dde6129c Fixed various FlexRAN-related compilation warnings 2017-02-05 20:00:57 +02:00
Xenofon Foukas 8250ecd794 Added info required for stability and fairness of remote scheduler 2017-02-05 19:54:14 +02:00
Xenofon Foukas 0e687fb765 Fixed bug related to the reporting of timing advance to the controller that severely dropped the performance of the remote scheduler 2017-02-03 19:39:47 +02:00
Xenofon Foukas a3427bf85b Bug fixes for proper reporting of HARQs to the controller 2017-02-02 17:51:58 +02: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
Navid Nikaein 0a91243ca5 merge branch various-l2-fixes with the develop branch 2017-02-01 11:52:53 +01:00
Xenofon Foukas 6d6e1c8687 Stability improvements for remote real-time control 2017-01-31 19:15:51 +02: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
Xenofon Foukas f1d4f4b93c Changed behavior of API for PUCCH power reports 2017-01-30 14:23:19 +02:00
hbilel 7b64eae285 [OAI-UE] issue#200 release harq p[rocess after sending Ack 2017-01-30 12:00:08 +01:00
Xenofon Foukas 9224d36176 Fixed bug that prohibited 2 UEs to be scheduled at the same time 2017-01-27 19:19:17 +02:00
Anta Huang 471a7d7d10 revert the value of the aggregation 2017-01-27 10:49:04 +01:00
Anta Huang c84f68cefc fix the issue with RAN sharing 2017-01-26 18:43:05 +01:00
Xenofon Foukas 974e5beebc Harmonized FlexRAN scheduler with MAC changes for support of multiple UEs 2017-01-25 20:02:38 +02:00
Xenofon Foukas 422c06c932 Merge remote-tracking branch 'origin/develop' into feature-68-enb-agent 2017-01-25 16:18:44 +02:00