Commit Graph
1273 Commits
Author SHA1 Message Date
Cedric Roux 2cb87ddd02 Merge remote-tracking branch 'origin/feature-slice+restart-w35' into develop_integration_2018_w36
Conflicts:
	openair2/ENB_APP/flexran_agent_common_internal.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
2018-09-07 16:13:40 +02:00
Cedric Roux 20797a52f8 Merge remote-tracking branch 'origin/generate_sss_tables' into develop_integration_2018_w36
Conflicts:
	openair1/PHY/INIT/init_top.c
2018-09-07 16:01:58 +02:00
Cedric Roux 9051a0ec45 Merge branch 'recode_itti_from_scratch' into develop_integration_2018_w36
Note: we don't include the last commit from origin/recode_itti_from_scratch
because it is just astyle formatting. As of today we don't enforce
astyle and including this work would lead to future merge conflicts.
A proper process to enforce astyle has to be put in place. In the
meantime, no astyle allowed in commits if the changes are too big
and not relevant to work done.
2018-09-07 15:57:13 +02:00
Cedric Roux 8b4d303375 Merge remote-tracking branch 'origin/generate_75KHz_tables' into develop 2018-09-07 15:53:26 +02:00
laurent 46231a5d5d merge with latest develop 2018-09-06 09:43:26 +02:00
Robert Schmidt 21f6609472 FlexRAN: move slice param verification to agent
- until now, on every iteration, the scheduler checked for changed parameter
  (and verified some)
- this functionality moves to the FlexRAN Agent, which verifies all parameters
  * individually, e.g. Max MCS <= 28 for DL
  * group-based, e.g. the sum of slice percentages is <= 100
- slice configuration changes are only applied if all verifications pass
- it is assumed in the scheduler, that configuration passed from outside is
  correct and can be used "as-is"

fix accounting setting
2018-09-03 18:10:28 +02:00
Cedric Roux c22180ff31 Merge remote-tracking branch 'origin/issue326_LOGreview' into develop_integration_2018_w35
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/LAYER2/MAC/eNB_scheduler_phytest.c
2018-08-31 12:55:28 +02:00
laurent cea4ef5372 generate sss tables 2018-08-31 11:47:53 +02:00
laurent 4221816f5e generate 7.5KHz tables 2018-08-31 10:46:36 +02:00
frtabu 77f70e77ea MSC logging utility as a config option 2018-08-24 17:43:14 +02:00
frtabu 24f8fcf346 Use common log mechanism in layer 3, mapping specific macros to common ones and extending common log utilities to support specific layer3 requirements 2018-08-24 17:43:14 +02:00
Konstantinos Alexandris 3b3b971807 minor fixes for x2 + modify conf files
The configuration file has now to contain ENB_IPV4_ADDRESS_FOR_X2C and
ENB_PORT_FOR_X2C in the NETWORK_INTERFACES section.

For example:

    NETWORK_INTERFACES :
    {
        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.111/24";
        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.111/24";
        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152

        ENB_IPV4_ADDRESS_FOR_X2C                 = "192.168.12.111/24";
        ENB_PORT_FOR_X2C                         = 36422; # Spec 36422
    };
2018-08-23 16:15:14 +02:00
Konstantinos Alexandris d3edb3a095 Merge remote-tracking branch 'origin/develop' into x2 2018-08-22 16:02:24 +02:00
Konstantinos Alexandris 40942e34a0 Initial commit on X2AP (add target eNBs as input) 2018-08-22 15:32:22 +02:00
Cedric Roux dfee206027 Merge remote-tracking branch 'origin/fix_missing_s1ap_15.2.0_asn_module_and_update_asn1c_commit' into develop_integration_2018_w33 2018-08-17 15:38:55 +02:00
Cedric Roux d4a8b5f35e compilation warning "jobserver unavailable" removal
This commit removes the warning:
make[4]: warning: jobserver unavailable: using -j1.  Add '+' to parent make rule.

Basically, inside a Makefile we should use $(MAKE) instead of make.
2018-08-17 12:25:13 +02:00
Cedric Roux 55ba99ac62 T: check consistency of T_messages.txt with VCD functions and variables traces
Since VCD has now to go through the T tracer, we enforce the consistency
of data found in common/utils/LOG/vcd_signal_dumper.[ch] with data
found in common/utils/T/T_messages.txt.

We might get completely rid of common/utils/LOG/vcd_signal_dumper.[ch] at some
point. For the moment, let's keep it.

This commit adds the program common/utils/T/check_vcd.c and necessary
modifications to enforce its use at compilation time.

If you modify common/utils/LOG/vcd_signal_dumper.[ch] but do not update
common/utils/T/T_messages.txt an error will pop up when you compile the
software. You have to keep both modules synchronized.
2018-08-17 12:24:39 +02:00
Bi-Ruei, Chiu 6562577e96 Update asn1c commit with two new fixes 2018-08-16 16:36:41 +08:00
laurent 1603e99d7e fix other targets after CI trial 2018-08-06 17:54:34 +02:00
laurent 4c475c429b first commit new itti 2018-08-06 16:52:27 +02:00
Cedric Roux d688c99843 Merge remote-tracking branch 'origin/337-fix-t_ids-h-issue-for-phy_mex' into develop_integration_2018_w31
Conflicts:
	cmake_targets/CMakeLists.txt
2018-08-03 09:46:22 +02:00
Cedric Roux 409b3d5c20 Merge remote-tracking branch 'origin/issue326_LOGreview' into develop_integration_2018_w31 2018-08-03 09:45:26 +02:00
Cedric Roux 9e8ad4923b fix install on centOS
- install package 'vim-common' to have 'xxd' needed by the compilation
  process of the T tracer
- change the way xxd is called so that no file is created in case
  of error
2018-08-01 16:36:35 +02:00
Elena Lukashova c3e4f68609 1.Adding PHY_MEX to the list of the libraries to be compiled with T_tracer,
otherwise T_IDs.h was not generated.
2.Adding extra files to the PHY_MEX library.
2018-07-31 11:59:18 +02:00
frtabu 30509955c2 remove compilation warnings, especially when disabling T_TRACER. enhance LOG_M macro implementation, introduce LOG_DEBUG_XXX macro to replace #ifdef DEBUG_XXX 2018-07-30 20:07:22 +02:00
frtabu b85cbddeec log.c simplification, fix usefull functionality which never worked, move all log code from openair2 to common 2018-07-30 20:07:22 +02:00
Cedric Roux a385af0109 better setup for asn1c
- use OAI location to retrieve asn1c
- use a specific commit instead of a branch name
2018-07-24 16:01:54 +02:00
Cedric Roux 1961fd7f20 remove gccxml/castxml
This was used for the ITTI analyzer.

The ITTI analyzer is now to be considered obsolete.
The source code will be removed at some point.
2018-07-24 15:52:04 +02:00
Cedric Roux 320551124c fix 2018-07-20 16:37:22 +02:00
Cedric Roux e7ea9e7611 Merge remote-tracking branch 'origin/issue326_LOGreview' into develop_integration_2018_w29
Conflicts:
	cmake_targets/CMakeLists.txt
2018-07-20 12:11:52 +02:00
Cedric Roux d89dbb4882 Merge remote-tracking branch 'origin/feature-s1ap-r14-based-on-new-asn1c' into develop_integration_2018_w29
Conflicts:
	targets/SIMU/PROC/channel_sim_proc.c
	targets/SIMU/USER/oaisim_pad.c
2018-07-20 12:10:15 +02:00
Cedric Roux 87f2185431 Merge remote-tracking branch 'origin/mmse_receiver' into develop_integration_2018_w29
Conflicts:
	cmake_targets/CMakeLists.txt
2018-07-20 12:09:32 +02:00
Raymond Knopp 3539761c28 Log review step 1: legacy VCD removal, LOG macro modified, TTracer enabled at build time by default, in a way it, by default configuration, provides console logs, as in previous versions 2018-07-13 16:43:34 +02:00
Bi-Ruei, Chiu a3e9c48006 Create configure file for asn1c
Add `autoreconf -iv` in build_helper to create configure file for asn1c.
2018-07-13 17:10:27 +08:00
Bi-Ruei, Chiu 0071fb6173 Add ASN files of LTE-RRC, S1AP and X2AP of 2018 Jun release 2018-07-13 10:04:46 +08:00
Bi-Ruei, Chiu a247907d3a Use an un-official community collaboration version of asn1c
1. It's no need to modify LTE-RRC's ASN.1 file for enabling option group
   feature in generate_asn1.
2. It's no need to patch the C header files generated from
   LTE-RRC/S1AP/X2AP's ASN.1 in fix_asn1.
3. It's no need to pre-process S1AP/X2AP's ASN.1 for enabling information
   object class feature by asn1tostruct.py.

This commit requires an un-official version of asn1c which are
collaboration of asn1c community members and `build_helper` is modified
in this commit accordingly :

  https://github.com/brchiu/asn1c/tree/velichkov_s1ap_plus_option_group

This asn1c can also convert ASN.1 of 5G NR RRC (38.331, v15.1.0) and
generate C files with -findirect-choice command line option without
tweaking ASN.1 file.

Examples for how to use this asn1c for S1AP are in S1AP files, e.g.
s1ap_eNB_nas_procedures.c and s1ap_eNB_handler.c.

There is an modified openair-cn (based on tag 0.5.0) with this new asn1c at :

  https://github.com/brchiu/openair-cn/tree/new-asn1c

Basic S1AP interaction and data transfer operation between OAI eNB and
this modified openair-cn has been tested.

Note: Community version of asn1c is keeping evolved to provide better usage.
2018-07-13 10:04:46 +08:00
Elena Lukashova 240c429956 1. Adding lapack-dev and lapacke-dev into the build script.
2. Remove get_pmi from  PHY_SRC_UE and add it instead to PHY_SRC_COMMON.
3. Linking lte-uesoftmodem and lte-uesoftmodem-nos1 targets with ${ATLAS_LIBRARIES}.
2018-07-10 17:58:14 +02:00
Elena Lukashova 69d9c0f7c3 Adding lapack-dev and lapacke-dev to build script 2018-07-10 15:05:11 +02:00
Elena Lukashova a9f583cd83 Correcting space in CMakeLists.txt 2018-07-08 17:03:31 +02:00
Elena Lukashova 647ed85345 Adapting PHY code to work with mex-functions:
1. Moving get_pmi into a separate file and making corresponding
changes in CMakeLists.txt.
2. Creating PHY_MEX library with functions required for the receiver
mex-functions.
3. Making necessary changes in defs_UE.h so that mex-functions
do not complain about multiple LOG_ calls.
2018-07-08 16:58:33 +02:00
Elena Lukashova 0dfcff7504 1. Adding cblast and lapacke-based functions required for mmse computation
to linear_preprocessing_rec.c.
2. Adding linear_preprocessing_rec.c to PHY_SRC_UE library.
3. Adding mmse_flag and mmse functionalities to dlsch_demodulation.
4. For now, dlsim_tm4 will not compile.
2018-07-06 18:23:21 +02:00
Raymond Knopp 494348e2f0 Merge remote-tracking branch 'origin/develop' into enhancement-rfsim 2018-07-06 06:24:31 +02:00
Raymond Knopp b4be5a4460 fixed ulsim for testcases 2018-07-05 23:09:30 +02:00
Raphael Defosseux f3b5f5433c Merge branch 'develop' into '322-code-cleanup-log_m-to-replace-write_output'
# Conflicts:
#   openair1/PHY/LTE_UE_TRANSPORT/srs_modulation.c
2018-07-03 15:48:19 +02:00
Raymond Knopp dd22040da2 updated to dlsim test cases. Some constraints were relaxed (w.r.t. 3GPP UE performance targets) in order for all tests to pass. 2018-06-30 09:00:12 +02:00
Raphael Defosseux 0a9225082f CI: hotfix: syntax error in Jenkins pipeline
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-06-29 17:25:55 +02:00
Raphael Defosseux c3d1aac90a CI: stability / cosmetics improvements
-- Stability issues when installing packages for USRP variants on new VM
     It sometimes timed-out
     Added loop up to 5 tries to add apt-repository
  -- Temporary merge during MergeRequest processing now returns an
     error when there are any conflicts
     Will stop the whole build
  -- Physical simulator now has a XLST for the XML result

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-06-29 16:43:37 +02:00
Raymond Knopp 5a808cb1ca Merge branch 'develop' into enhancement-rfsim
Conflicts:
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/RRC/LTE/rrc_UE.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-uesoftmodem.c
2018-06-28 14:54:15 -07:00
Raymond Knopp 27892e0935 Merge remote-tracking branch 'origin/develop' into enhancement-rfsim
Conflicts:
	cmake_targets/build_oai
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c
2018-06-28 14:44:47 -07:00
bruno mongazon 08e0571cb5 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into 322-code-cleanup-log_m-to-replace-write_output 2018-06-28 14:16:38 +02:00