Commit Graph
2219 Commits
Author SHA1 Message Date
Cedric Roux c54cb41805 Merge remote-tracking branch 'origin/various-fixes-w12' into develop_integration_w12 2017-03-24 17:07:26 +01:00
Cedric Roux 53bb6a8c2c compilation warning removal 2017-03-24 15:33:51 +01:00
Cedric Roux d296abb8d0 compilation warning removal 2017-03-24 15:24:35 +01:00
Cedric Roux 5345b160fc compilation warning removal 2017-03-24 15:23:43 +01:00
Cedric Roux 045132ba6e compilation warning removal 2017-03-24 15:20:56 +01:00
Cedric Roux 4080a63938 compilation warning removal 2017-03-24 15:18:57 +01:00
Cedric Roux f754e31ead compilation warnings removal 2017-03-24 15:17:13 +01:00
Cedric Roux 7a6709a24e warning removal/bug fixes/adding logs in rb_tool.c 2017-03-24 15:12:52 +01:00
Cedric Roux 4fcb6272f4 RRC Rel14
- import RRC ASN.1 defintions from the specifications
  (file openair2/RRC/LITE/MESSAGES/asn1c/ASN1_files/RRC-e10.asn)
  contrary to rel8/10, all modules have been imported, maybe it's too much
  to refine in case of problems
- deal with rel14 in fix_asn1
- all code that was for Rel10 is now for Rel10/Rel14
- some incompatible changes (mostly in naming) were resolved in favor
  of rel14, see in openair2/RRC/LITE/defs.h
- unsure about the rlc layer, some arrays have changed (values appended),
  I only changed the definition and in tests in the code, I changed
  the index limit, maybe it's not enough

Rel14 is the default compilation mode.
2017-03-23 18:06:40 +01:00
Calisson 7685cf1811 fixing srs in msg3. now all SRS subframe configs work. 2017-03-21 14:16:19 +01:00
Calisson 1677e8f847 Merge remote-tracking branch 'origin/develop' into feature-218-srs 2017-03-20 17:15:26 +01:00
Calisson e2d46f8040 adding mechanism for SRS scheduling of multiple UEs. 2017-03-20 17:13:42 +01:00
fnabet 353334f69b RLC AM Rx PDU Segment changes 2017-03-16 16:45:44 +01:00
Cedric Roux 20b420bb84 fix compilation for ubuntu 16
This work was done by Laurent Thomas.
2017-03-16 14:44:38 +01:00
fnabet 01530385f1 RLC AM fix Tx Status Report 2017-03-15 18:56:53 +01:00
gabrielC 40fa3e076c RLC AM Rx fixes 2017-03-15 16:58:54 +01:00
GabrielCouturier 18f628848c RLC AM Fix on ReTx 2017-03-15 16:54:01 +01:00
fnabet bf71c6f01e RLC AM Tx Segment: fix 2017-03-15 10:10:32 +01:00
Calisson 1e193853eb WIP: adding srs channel estimation to eNB. estimation results yet to be checked. 2017-03-14 17:13:14 +01:00
fnabet c1da605f6d RLC AM code cleaning 2017-03-14 10:10:36 +01:00
GabrielCouturier cf9727c4be RLC AM fix bad assert for resegmentation 2017-03-13 19:44:52 +01:00
gabrielC dabf833c10 RLC AM Rx Segment and Tx Status Report fixes 2017-03-13 19:41:24 +01:00
fnabet 3a43c08ae3 RLC AM fix RX Segment 2017-03-13 15:54:27 +01:00
fnabet 0e78513b5a RLC AM Tx Segment : missing data_ptr setting 2017-03-13 12:27:09 +01:00
Florian Kaltenberger c135dd611b scheduling also UL SF 4 in TDD mode 3 2017-03-10 16:19:38 +01:00
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
fnabet 0ce73b4d0e RLC AM Rx PDU Segment fixes 2017-03-09 18:08:43 +01:00
fnabet 7f60e38fee RCL AM: fixes on Tx resegmentation 2017-03-09 16:04:31 +01:00
GabrielCouturier 7c7172ca18 RLC AM fix bad pointer init in ReSegmentation 2017-03-08 17:16:30 +01:00
gabrielC ce1ac08b19 RLC AM fix for PDU Segment insertion in case of gaps 2017-03-07 18:33:14 +01:00
gabrielC b5ab7267c2 RLC AM fix for PDU insertion in case of gaps 2017-03-07 17:51:29 +01:00
GabrielCouturier fd5932c544 RLC AM Tx: TPollRetx Expiry fix for BO 2017-03-07 16:58:39 +01:00
GabrielCouturier dc960a6043 RLC AM: missing SN setup in Tx Pdu Management at first Tx 2017-03-07 16:01:35 +01:00
fnabet 6504013077 RLC AM : fix update of vrMS in tReordering expiry 2017-03-04 15:19:58 +01:00
fnabet 709b1fd299 RLC AM: fix TReordering expiry 2017-03-04 13:40:13 +01:00
fnabet e1293616d6 Merge tag '2017.w08' into bugfix-189-rlc-am-fixes 2017-03-02 14:53:56 +01:00
fnabet 684ca32e9b RLC AM Add Log points 2017-03-02 14:51:58 +01:00
fnabet 52006fc6ea RLC AM : Add Rx PDU Segment handling 2017-03-02 10:37:33 +01:00
fnabet daa308c33a Merge tag '2017.w07' into bugfix-189-rlc-am-fixes 2017-02-24 17:15:30 +01:00
fnabet aac9c6119d RLC AM fix in Retx PDU segment 2017-02-23 17:44:47 +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
fnabet 0030635237 RLC AM Tx buffer: fix sn modulo window size access 2017-02-22 13:00:30 +01:00
fnabet b0d468c0f7 RLC AM: add retransmission and Rx status pdu 2017-02-22 11:40:55 +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