Commit Graph
7438 Commits
Author SHA1 Message Date
Cedric Roux 0c445bedda Merge remote-tracking branch 'origin/bugfix-310-IQrecplay' into develop 2018-06-18 16:25:48 +02:00
Cedric Roux d579a74e54 Merge remote-tracking branch 'origin/migrate_rel10_rel14_to_make_version' into develop 2018-06-18 16:25:39 +02:00
Cedric Roux 9adf1999db Merge remote-tracking branch 'origin/oai_ue_fixes' into develop
Conflicts:
	openair2/RRC/LTE/rrc_eNB.c
2018-06-18 16:13:06 +02:00
Cedric Roux 2f639e45b6 Merge remote-tracking branch 'origin/ulSNRs' into develop
Conflicts:
	openair2/ENB_APP/MACRLC_paramdef.h
	openair2/LAYER2/MAC/mac.h
2018-06-18 16:01:25 +02:00
Cedric Roux 68f0027830 Merge remote-tracking branch 'origin/mu_with_tdd1' into develop 2018-06-18 16:00:14 +02:00
Cedric Roux 4ba4d43aa6 set proper default values for puSch10xSnr and puCch10xSnr
20 was wrong, it means 2 dB.

200 is a bit high on my setup. Today the code hardcodes the noise
level as 30dB and a target of 20dB above noise is chosen by default.
Some more work is needed to estimate the real noise level. Some
more work is needed to set proper defaults.
2018-06-18 12:51:02 +02:00
Cedric Roux 437bd9cbe1 minor: cleaner indentation 2018-06-18 11:33:47 +02:00
Cedric Roux 2e389d61a0 bugfix: bzero was not called if allocating memory 2018-06-18 11:32:57 +02:00
Haruki NAOI 0fb553916b Fix: modify temporary disabled code by the commit of 5c6ad3142d. 2018-06-18 15:29:17 +09:00
Cedric Roux a7db85a6c2 put back variables in the local stack 2018-06-15 12:31:56 +02:00
Raphael Defosseux 49829f6928 Merge branch 'develop-ci' into 'develop'
eNb CI Integration Job builds locally basic simulator

See merge request oai/openairinterface5g!323
2018-06-15 10:12:00 +02:00
Raphael Defosseux 6f6c90cba8 Proper exit status on local build
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-06-15 09:47:16 +02:00
Raphael Defosseux f9f7e7c5af fix syntax
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-06-15 09:47:16 +02:00
Raphael Defosseux 4c92d6785e Improvements on Jenkins file:
- comment to GitLab merge-request does not anymore # as number (misinterpreted as issue number)
  - added local build script w/ generation of HTML result file
Improvements on bash scripts:
  - use of proper option parsing

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-06-15 09:47:16 +02:00
Cedric Roux cce51f69bc set value of pucch_n1_AN to 0 everywhere by default
Since now pucch_n1_AN is taken from the configuration file,
it has to be set to 0. Value 32 will not work well, at least
in FDD. This has to be handled properly at some point
(do not use uplink resource blocks used by PUCCH for PUSCH).
2018-06-14 16:51:53 +02:00
Cedric Roux dde219c81b bugfix: fix usage of bundling
Do not set 'bundling' for FDD, that breaks ULSCH decoding.
2018-06-14 16:49:58 +02:00
Haruki NAOI 86802258dd Merge branch 'mu_with_tdd1' of https://gitlab.eurecom.fr/oai/openairinterface5g into mu_with_tdd1 2018-06-14 18:43:00 +09:00
Cedric Roux 6cd761589e bugfix: fix T trace 2018-06-14 10:26:47 +02:00
Haruki NAOI e84fd27ec1 Fix: build fails when executing build with option "--mu" 2018-06-14 16:49:45 +09:00
Cedric Roux 5c6ad3142d Merge remote-tracking branch 'origin/develop' into mu_with_tdd1
The monolithic eNodeB is not fully functional in FDD.

The TDD mode has not been tested.

Do not consider this commit as functional.

Conflicts:
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	common/utils/itti/intertask_interface.c
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c
	openair1/PHY/LTE_TRANSPORT/transport_eNB.h
	openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
	openair1/PHY/defs_eNB.h
	openair1/PHY/impl_defs_lte.h
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/pusch_pc.c
	openair2/COMMON/platform_types.h
	openair2/COMMON/rrc_messages_types.h
	openair2/ENB_APP/enb_config.c
	openair2/ENB_APP/enb_paramdef.h
	openair2/LAYER2/MAC/config.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue.c
	openair2/LAYER2/MAC/mac.h
	openair2/LAYER2/MAC/mac_proto.h
	openair2/LAYER2/MAC/pre_processor.c
	openair2/LAYER2/RLC/rlc.c
	openair2/LAYER2/RLC/rlc_rrc.c
	openair2/RRC/LITE/rrc_common.c
	openair2/RRC/LTE/L2_interface.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/rrc_eNB.c
	openair2/UTIL/LOG/log.h
	targets/COMMON/openairinterface5g_limits.h
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-softmodem.h
2018-06-12 16:23:36 +02:00
Cedric Roux c88284da05 bugfix: fix compilation of the basic simulator
We need to build the softmodem first, otherwise
compilation of the lib 'config' fails because
of the T tracer.
2018-06-12 15:51:03 +02:00
Raphael Defosseux 076781915f another script location fix
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-06-12 15:04:09 +02:00
Raphael Defosseux 9b51d61276 Location of scripts was incorrect
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-06-12 14:44:27 +02:00
Raphael Defosseux e4a772965a Fixing pipeline syntax error
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-06-12 14:42:27 +02:00
Raphael Defosseux 346e8fb719 First draft of the CI scripts
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-06-12 14:37:42 +02:00
bruno mongazon acbd1f1f7d fix issue 310 IQrecplay 2018-06-04 13:05:13 +02:00
Bi-Ruei, Chiu f097cca7a5 Compare RRC_VERSION with MAKE_VERSION(x,y,z) macro to provide better SW configuration
To minimize migration effort, we follow the logic of legacy macro Rel10 and Rel14 used
for conditional compilation of current code.

In the future, they might be changed to accommodate finer software configuration, e.g.
MAKE_VERSION(12,2,0) or MAKE_VERSION(13,1,0) .... etc.
2018-05-29 18:00:58 +08:00
Florian Kaltenberger 9edcd9b961 Merge remote-tracking branch 'origin/develop' into oai_ue_fixes 2018-05-29 01:06:54 -07:00
Rajeev Gangula c5c66eeb4a Merge branch 'develop' into ulSNRs
Conflicts:
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/mac.h
2018-05-29 09:50:05 +02:00
Cedric Roux 3fd2470533 Merge remote-tracking branch 'origin/fix-unitary-simulations' into develop 2018-05-29 09:38:00 +02:00
Haruki NAOI a3329b562c Merge commit '8471bd14e2e400887e7419d3307921a1401e2823' into mu_with_tdd1
# Conflicts:
#	common/utils/itti/intertask_interface.c
#	openair1/SCHED/phy_procedures_lte_eNb.c
2018-05-29 14:52:19 +09:00
Haruki NAOI f5239e0905 Merge remote-tracking branch 'remotes/origin/ues_test' into mu_with_tdd1
# Conflicts:
#	common/utils/itti/intertask_interface.c
#	openair1/SCHED/fapi_l1.c
#	openair1/SCHED/phy_procedures_lte_eNb.c
2018-05-29 14:32:13 +09:00
Masayuki HARADA 8471bd14e2 Merge remote-tracking branch 'origin/sp3_master' into scd_refactoring 2018-05-29 14:30:02 +09:00
Haruki NAOI 18bd37f913 Revert "Fix: TDD uci_procedures misdeal pucch format1a."
This reverts commit c652a883ff.
2018-05-29 14:29:00 +09:00
Masayuki HARADA fb054e6523 Merge branch 'sp3_master' into scd_refactoring
# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
2018-05-29 14:24:25 +09:00
Raymond Knopp b036b18afe moved sidlink L1 functions to LTE_UE_TRANSPORT, corrected issue related to "find_dlsch" which is needed to compile UE and creates problem for unitary simulations (moved to lte-ue.c application) 2018-05-28 11:09:38 -07:00
Cedric Roux 4b943d4b7b Merge remote-tracking branch 'origin/develop_integration_2018_w19' into develop
Summary of changes:
- split UE and eNB directories
- nFAPI L2 emulator
- basic simulator
- various bug fixes

The nFAPI L2 emulator is not functional yet. Some code had to be removed
because it made the monolithic eNB non functional.

The unitary simulators (ulsim, dlsim) do not compile anymore. This will
be fixed later.
2018-05-28 17:31:09 +02:00
Cedric Roux b66b872928 integration fix: remove warnings
Remove warnings found while running:
    ./build_oai --UE -c -w USRP

And:
    ./build_oai --basic-simulator -c
2018-05-28 12:44:14 +02:00
Cedric Roux ed49592754 integration fix: remove warnings
Remove warnings popping up on:
    ./build_oai --eNB -w USRP

Maybe not always the best solution.
2018-05-24 17:15:42 +02:00
Haruki NAOI 14740aec74 Merge remote-tracking branch 'remotes/origin/rm916_bugfix' into sp3_master 2018-05-24 21:22:38 +09:00
Haruki NAOI c652a883ff Fix: TDD uci_procedures misdeal pucch format1a. 2018-05-24 20:08:27 +09:00
Haruki NAOI ab32cefbe2 Revert "fix DLSCH no retransmission"
This reverts commit 24c669f394.
2018-05-24 20:01:37 +09:00
Masayuki HARADA 91db46b6ba Merge branch 'rm917_bugfix' into sp3_master 2018-05-24 17:06:10 +09:00
Wu Jing a37c29eb80 fix rm971 bug(delete #if 0) 2018-05-24 16:44:28 +09:00
Masayuki HARADA 17c761afbe Merge branch 'rm918_bugfix' into sp3_master 2018-05-24 13:22:59 +09:00
Masayuki HARADA 44210a0a88 Fix PUSCH decode failure when recieve power is too high situation. 2018-05-24 13:21:37 +09:00
Florian Kaltenberger 81ac396187 Merge branch 'develop' into oai_ue_fixes 2018-05-22 06:25:09 -07:00
Wu Jing fadba8a1ed fix rm917 bug 2018-05-22 18:42:35 +09:00
jftt_wangshanshan 843e7c8fc4 Change SR detection for TDD for compliance with FDD. (try) 2018-05-21 16:43:12 +08:00
Masayuki HARADA ff604660fe delete UE_EXPANSION route 2018-05-18 10:58:26 +09:00