Commit Graph
307 Commits
Author SHA1 Message Date
Raymond Knopp 8da1c4b5bb Note: this commit is work in progress. Contains initial integration of NFAPI data structures which are tested for TX path. RX path to follow. 2017-07-06 08:18:32 -07:00
Raymond Knopp d23697aef3 Merge branch 'develop' into RU-RAU-split
Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
	openair1/PHY/LTE_TRANSPORT/dci.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
	openair1/PHY/LTE_TRANSPORT/dlsch_decoding.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/if4_tools.c
	openair1/PHY/LTE_TRANSPORT/if5_tools.c
	openair1/PHY/LTE_TRANSPORT/if5_tools.h
	openair1/PHY/LTE_TRANSPORT/pcfich.c
	openair1/PHY/LTE_TRANSPORT/phich.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/rar_tools.c
	openair1/PHY/LTE_TRANSPORT/srs_modulation.c
	openair1/PHY/defs.h
	openair1/PHY/impl_defs_lte.h
	openair1/PHY/impl_defs_top.h
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/phy_procedures_lte_ue.c
	openair2/COMMON/mac_rrc_primitives.h
	openair2/ENB_APP/enb_config.c
	openair2/ENB_APP/enb_config.h
	openair2/LAYER2/MAC/config.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_mch.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/main.c
	openair2/LAYER2/MAC/proto.h
	openair2/RRC/LITE/MESSAGES/asn1_msg.c
	openair2/RRC/LITE/MESSAGES/asn1_msg.h
	openair2/RRC/LITE/rrc_UE.c
	openair2/RRC/LITE/rrc_common.c
	openair2/RRC/LITE/rrc_eNB.c
	targets/ARCH/COMMON/common_lib.c
	targets/ARCH/COMMON/common_lib.h
	targets/ARCH/ETHERNET/USERSPACE/LIB/eth_raw.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.h
	targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
	targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
	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/rru.band7.tm1.if4p5.25PRB.oaisim.conf
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c
	targets/RT/USER/rt_wrapper.h
	targets/SIMU/USER/channel_sim.c
	targets/SIMU/USER/init_lte.c
	targets/SIMU/USER/oaisim.c
	targets/SIMU/USER/oaisim_functions.c
2017-06-05 15:33:38 -07:00
Raymond Knopp 413df163d8 first working version with oaisim. This is prior to MAC interface reworking 2017-06-04 02:44:26 -07:00
Cedric Roux 94dd884325 redo commit cb67d586a4
Seems like this commit got lost at some point.

Here was the message:
-----------------------------------------------------------------------------
Author: Cedric Roux <cedric.roux@eurecom.fr>
Date:   Tue Jan 10 14:21:02 2017 +0100

    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-05-18 11:34:58 +02:00
gabrielC 98a7a16ead bug fixes from Fujitsu (bug 21)
Note: this fix does not solve the issue with how
this buffer is used in this function, but I'm not
sure this code is used at all (Cédric Roux).

----------------------------------------------------------
bug 21

Ttile:
PAYLOAD_MAX=1500, so this coding results in index overflow.
Additionally, operator "!=" just compairs something, this
coding is meaningless.

Bug Location:
buffer[PAYLOAD_MAX] != '\0';

Note:
Detected by CppCheck
----------------------------------------------------------
2017-05-12 11:16:14 +02:00
Raymond Knopp ca2c8357c9 vcd for rru/rau. bug fixing on fronthaul interfaces 2017-04-19 02:51:15 +02:00
Raymond Knopp 98cbcf619b vcd modifications for RU-RAU split, gtkw for rau_if4 2017-04-18 04:45:42 -07:00
Raymond Knopp b42aed9ed9 initial testing version of L1L-L1H split (RRU-RAU) 2017-04-17 10:40:23 -07:00
Cedric Roux c36c04537a integration fix: fixes for pthread_getname_np
- define _GNU_SOURCE before including pthread.h
- do not use static for the array 'threadname' used
  to store the name, it makes it a global variable
  accessed by several threads in parallel
- increase size of 'threadname' (maybe not necessary)
- properly indent #define / #under (# should be at column 1)
2017-04-03 10:26:42 +02:00
Cedric Roux a032502713 Merge remote-tracking branch 'origin/bugfix-189-rlc-am-fixes' into develop_integration_w13 2017-03-30 10:21:10 +02:00
hbilel 3c7c61a46c RLC AM fix specific reassembly issue 2017-03-28 18:08:00 +02:00
Wilson W.K. Thong 4a2f9d2571 #220 enhance logging to show also thread name 2017-03-28 10:17:51 +08: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 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
pyroclaste 3dd1faadd4 Add the compression for IF5 and RTT measurements for FH and RF 2017-02-17 11:38:44 +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