Commit Graph
5542 Commits
Author SHA1 Message Date
Cedric Roux 69c8b8a933 Merge branch 'feature-68-enb-agent' into develop_integration_w03 2017-01-20 16:59:16 +01:00
Cedric Roux 74d07a70f6 Merge branch 'enhancement-192-beamforming' into develop_integration_w03
Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/MODULATION/beamforming.c
	openair1/PHY/defs.h
	targets/RT/USER/lte-enb.c
2017-01-20 16:58:29 +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
Cedric Roux da0cbaf86c fix: add /usr/include/lime to include directories
when testing on haswell, using apt-get to install LimeSDR
libraries and includes, it put it in /usr/include, not
/usr/local/include
2017-01-20 16:38:26 +01:00
Cedric Roux f7fb0280a0 Merge branch 'develop-new-LMSSDR' into develop_integration_w03 2017-01-20 16:37:44 +01:00
Raymond.Knopp 56241235cf rcc configuration file band 7 if5. 2017-01-20 08:44:41 +01:00
Navid Nikaein 27a1101a58 add support for RAN/radio resource slicing through flexran 2017-01-19 12:44:20 +01:00
Florian Kaltenberger e0c7479122 and one more fix 2017-01-19 09:32:29 +01:00
Florian Kaltenberger 0695828e4c some fixes 2017-01-18 16:43:02 +01:00
Florian Kaltenberger b0b5cb21e5 Beamforming is now only done when necessary. This patch is based on one from enhancement-10-harmony. 2017-01-18 15:31:04 +01:00
Raymond.Knopp 1224cf44ae switch RX to HIGH band input by default 2017-01-18 14:14:07 +01:00
Tien-Thinh Nguyen dce5191542 update to make harmony work with Mobipass[Ercom] 2017-01-18 13:53:05 +01:00
Raymond.Knopp 773afc1490 TX power calibration, RX_W by default 2017-01-18 13:21:07 +01:00
Raymond.Knopp 12cc35932a Merge branch 'develop' into develop-new-LMSSDR
Conflicts:
	targets/RT/USER/lte-softmodem.c
2017-01-18 10:44:37 +01:00
Florian Kaltenberger 550759231d change loop limit to NB_ANTENNA_PORTS_ENB 2017-01-18 09:38:14 +01:00
Florian Kaltenberger a5e6690ded adding multadd_cpx_vector 2017-01-18 09:33:39 +01:00
Xiwen JIANG ab57b0ddd3 replace the conjugate vector multiplexing with direct vector multiplexing 2017-01-18 09:16:13 +01:00
Florian Kaltenberger 8a9ef14e4f reduced the max number of antenna ports to 6 to save memory (we are not using antenna port >5 anyway)
mult_cpx_conj_vector can now also do multiply add
beam_precoding now uses mult_cpx_conj_vector

Conflicts:
	openair1/PHY/MODULATION/beamforming.c
2017-01-18 09:15:57 +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
Tien-Thinh Nguyen 73920f3f6e [minor modification] fixed the issue related to TX with FDD 2017-01-16 16:08:40 +01:00
Cedric Roux dec41a2a99 Merge branch 'develop_integration_w02' into 'develop'
Develop integration w02

See merge request !82
2017-01-16 10:20:01 +01:00
Cedric Roux 0af4c17000 fix phy simulators compilation - for real
This is the real fix, d5a6817887
was not the right solution.
2017-01-16 09:52:14 +01:00
Raymond Knopp 8be18c360b debugging for RRU if4p5 TDD 2017-01-15 08:58:26 +01:00
Raymond Knopp 2da964bb2d changes for RRU TDD if4p5 2017-01-15 01:07:30 +01:00
Raymond.Knopp 84c61990b7 fix for S-subframe handling (if4p5_asynch_DL) 2017-01-14 16:23:13 +01:00
Raymond Knopp 4c78c177db Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony
Conflicts:
	openair1/SCHED/phy_procedures_lte_eNb.c
	targets/RT/USER/lte-enb.c
2017-01-14 22:54:12 +01:00
Raymond Knopp 6fd41105c9 RRU changes for S-Subframe 2017-01-14 22:40:36 +01:00
Raymond.Knopp 9ee29fb0b2 changes for S-subframe support in fronthaul 2017-01-14 14:35:19 +01:00
Raymond Knopp 0f47f01cae Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony 2017-01-13 19:52:48 +01:00
Raymond Knopp 848f78465b addition of IF4p5 ULTICK packet for TDD fronthaul 2017-01-13 19:49:22 +01:00
Cedric Roux ff11cf5f23 Merge branch 'bugfix-183-LOG_X-format' into develop_integration_w02 2017-01-13 17:16:16 +01:00
Cedric Roux fe2446b7e3 Merge branch 'bugfix-185-simulator-compilation' into develop_integration_w02 2017-01-13 17:14:23 +01:00
Cedric Roux c6a2cf042a Merge branch 'bugfix-186-rrh-gw-compilation' into develop_integration_w02 2017-01-13 17:12:57 +01:00
Cedric Roux c88ec0bd81 Merge branch 'bugfix-184' into develop_integration_w02 2017-01-13 17:09:24 +01:00
Cedric Roux 31cbb18f0e Merge branch '180-fix_TDDConfigurationFileParseRrror' into develop_integration_w02 2017-01-13 17:07:13 +01:00
Cedric Roux 490492cbfa Merge branch '182-MistakeLogicalOperatorsAndBitwiseOperators' into develop_integration_w02 2017-01-13 17:04:18 +01:00
Cedric Roux 7edff5fe0b Merge branch 'bugfix-181-oaisim' into develop_integration_w02 2017-01-13 17:02:42 +01:00
Cedric Roux adfaa6d9f3 Merge branch 'develop-new-LMSSDR' into develop_integration_w02
Conflicts:
	targets/RT/USER/lte-softmodem.c
2017-01-13 17:01:30 +01:00
Raymond.Knopp 90015dfb35 Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony 2017-01-13 14:17:42 +01:00
Raymond.Knopp 5715de89f2 changes for TDD fronthaul 2017-01-13 14:17:26 +01:00
Cedric Roux ab7a3e8e9c fix compilation of RRH GW
I am not sure this is the correct solution.

The problem seems to be that the RRH GW does not use ITTI
and thus the type 'as_nas_info_t' is not defined, and then
the compilation fails.

The simple fix is to include 'as_message.h' in
'openair2/RRC/LITE/defs.h' if ENABLE_ITTI is not
defined. Maybe it's not good. RRH GW compiles with this fix.
2017-01-12 17:58:28 +01:00
Cedric Roux d5a6817887 fixing mbmssim and pdcchsim compilation
"frame" is not defined, we pass 0 instead.

Maybe not the right solution.
2017-01-12 17:32:54 +01:00
Florian Kaltenberger ccdb80efbc initializing N_TA_offset for TDD eNB. Fixes issue 184. 2017-01-12 10:57:35 +01:00
calvin wang 801a2e5de7 fix mistake bitwise operators 2017-01-12 16:47:57 +08:00
Cedric Roux 669aa1fbcf fix duplicated definition of boolean_t
It is defined both in openair2/COMMON/commonDef.h and
openair2/COMMON/platform_types.h.

Removing one or the other definition creates many problems
when compiling this or that part of the system (ue_ip.ko,
at_nas_ue). Let's keep both and protect the definitions
inside #ifdefs.
2017-01-12 09:27:22 +01:00
Cedric Roux 237da58846 fix a warning in openair3/NAS/UE/EMM/IdleMode.c
I'm not sure this is the right fix, so I put a LOG_TRACE
that is displayed when the code comes here.
2017-01-12 09:26:51 +01:00
Raymond.Knopp c70e705aa4 lmssdr configuration file 2017-01-11 16:10:27 +01:00
Cedric Roux 89cff54730 remove '#define OPENAIR_LTE' from openair1/PHY/defs.h 2017-01-11 16:00:36 +01:00