Commit Graph
659 Commits
Author SHA1 Message Date
gabrielC c17e81b2aa Merge remote-tracking branch 'origin/develop_UE_20MHz' into develop_integration_w08
Conflicts:
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
2017-02-23 09:09:01 +01:00
hbilel 34ca9a7f93 [OAI-UE] issue#214 fix timing offset compensation 2017-02-22 11:52:01 +01:00
gabrielC 46b37aaa31 UE 20 MHz fix + remove too restrictive assert 2017-02-21 14:35:00 +01:00
Cedric Roux 339353a96c integration fix: have a central place of definition for clock_difftime_ns
Prior to this commit, the following command failed to build dlsim:
    ./build_oai --phy_simulators -c

Choice has been made to define it in a .h file as a static inline
function.
2017-02-20 10:53:35 +01:00
Cedric Roux c8e642494b integration fix: protect include file
The command line to get the error was:
    ./build_oai --eNB -w EXMIMO -c
2017-02-20 10:10:00 +01:00
Cedric Roux ea858d54fa integration fix: strerror has to be used, not perror
The command line to get the error was:
    ./build_oai --eNB -w EXMIMO -c
2017-02-20 10:09:05 +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 ac7c0df520 integration fix: let oaisim (S1) work again
- some cleanup
- thread names to include UE Mod_id
- arg of UE_thread_rxn_txnp4 to be struct rx_tx_thread_data again
- sync in UE_thread_rxn_txnp4 to use instance_cnt_rxtx again
- UE_thread to call itti_send_msg_to_task with UE->Mod_id + NB_eNB_INST
  instead of INSTANCE_DEFAULT again

This may break the softmodem UE, to be tested.
The most problematic thing may be the synchronization.
I don't think it will impact the processing at all,
but I won't bet my shirt on it.
2017-02-17 17:55:27 +01:00
Cedric Roux 7c11cf9646 redo commit 5805215227
git show -p 5805215227
to see what it's about
2017-02-17 14:39:00 +01:00
Cedric Roux 122953d986 redo commit 157707b042
git show 157707b042
to see what it's about
2017-02-17 14:25:26 +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
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 10a50563eb Merge remote-tracking branch 'origin/bugfix-exmimo' into develop_integration_w07 2017-02-17 10:08:48 +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 be0541aa8c remove a race 2017-02-16 11:38:38 +01:00
Laurent 6f6f9acb52 merge develop; add option to set affinity in UE 2017-02-16 11:34:02 +01:00
Florian Kaltenberger 7c4630057f fixing a wrongly placed } for correct exmimo initialization 2017-02-15 14:28:07 +01:00
Laurent 23c7547698 remove debug traces 2017-02-14 18:24:31 +01:00
Cedric Roux f52a42eda5 cleanup lte-softmodem.c
For whatever reason, lte-softmodem.c was totally messed up...

We took the version from the branch develop and added
abstraction_flag, which is needed in openair2/LAYER2/MAC/main.c
(this is not clean, previous commit added a comment for this).
This has to be cleaned at some point.
2017-02-14 16:41:07 +01:00
hbilel 5805215227 [OAI-UE] fix freq offset correction during cell scan 2017-02-13 16:46:28 +01:00
hbilel e88d1e739e [OAI-UE] new pucch procedure to support all formats 2017-02-13 16:15:47 +01:00
Laurent fa432bdd26 optim measurement function checkcpu() 2017-02-13 13:58:09 +01:00
Cedric Roux 9bf108c227 Revert "Merge remote-tracking branch 'origin/calib-LimeSDR' into develop_integration_w06"
This reverts commit ce14050bb4, reversing
changes made to 0ada1e9e32.
2017-02-10 17:32:26 +01:00
Cedric Roux ce14050bb4 Merge remote-tracking branch 'origin/calib-LimeSDR' into develop_integration_w06
Conflicts:
	openair1/PHY/MODULATION/ofdm_mod.c
2017-02-10 11:50:31 +01:00
Cedric Roux 0ada1e9e32 Merge remote-tracking branch 'origin/oaisim-rru' into develop_integration_w06
Conflicts:
	openair2/RRC/LITE/rrc_UE.c
2017-02-10 11:36:06 +01:00
laurent 3c191c26f3 fix BCH tracking 2017-02-09 17:46:04 +01:00
Cedric Roux 9c6cb96baf put UE id in thread names 2017-02-09 10:46:20 +01:00
Cedric Roux 393fe86563 fix: pass UE parameter to UE threads
oaisim is not functional with several UEs.
This fixes one issue. (It's still not functional for other reasons.)
2017-02-09 09:47:13 +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
Cedric Roux 157707b042 fix USE_MME compilation flag
We should use ENABLE_USE_MME, not USE_MME.
This code is useless anyway (I think, not sure, that's why I
leave it here), because the other threads wait for 'sync_var'
to become >=0.
2017-02-08 18:06:24 +01:00
Raymond Knopp bb5ee76ad8 changes in oaisim to support RRU + fronthaul. minor bugs corrected in UE. 2017-02-05 14:31:00 -08:00
Raymond Knopp d141195ea3 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop 2017-02-01 23:18:10 -08:00
Raymond Knopp 90cb9d6cb8 adding RRU/Fronthaul functionality to oaisim 2017-02-01 23:17:54 -08:00
gabrielC 723510f684 Remove LOG_I 2017-02-01 15:53:52 +01:00
gabrielC c935da6414 Cell sync Offset was not applied correctly in all case 2017-02-01 14:07:19 +01:00
Laurent 9f33d0904b merge develop 2017-02-01 13:08:35 +01:00
Raymond Knopp 02148c7950 refit for USRP (control of DSP cordic), no more trx_stop during synchronization 2017-01-29 16:15:08 -05:00
Raymond Knopp afb60b8500 initial LMS7002M register configuration. modifications for lte-ue and rf_device to use LimeSDR. 2017-01-28 17:32:16 -05:00
gabrielC 0dd076a37a [OAI-UE] fix time tracking and channel interpolation 2017-01-25 17:23:32 +01:00
Imad ALAWE a731de2f13 openair2: fix abstraction mode for oaisim with MME
When using abstraction mode, layer2_init_UE() and openair_rrc_ue_init()
are called according to first_sync state and only without MME support.

We added the global variable abstraction_flag to allow abstraction mode
when MME is enabled.
Openair2 is also used in lte-softmodem, so it must have a global variable
abstraction_flag. So we moved it out from the main() scope.
2017-01-25 13:34:14 +01:00
gabrielC 7a2984e8ae [OAI-UE] TimingOffset tracking faster loop 2017-01-25 10:57:20 +01:00
Florian Kaltenberger e84a00174b choosing the right version of the unresolved merge conflict in beamforming.c
changed the memory allocation of txdataF and beam_weigths
2017-01-21 16:20:10 +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
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
Tien-Thinh Nguyen dce5191542 update to make harmony work with Mobipass[Ercom] 2017-01-18 13:53:05 +01:00