Florian Kaltenberger
340d05eebf
Merge branch 'calib-LimeSDR' of https://gitlab.eurecom.fr/oai/openairinterface5g into calib-LimeSDR
...
Conflicts:
targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
2017-03-10 15:26:46 +01:00
Florian Kaltenberger
19a2337c99
Merge remote-tracking branch 'origin/develop' into calib-LimeSDR
...
Conflicts:
openair1/PHY/MODULATION/ofdm_mod.c
targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
2017-03-09 08:54:34 +01:00
Raymond.Knopp
4342595ea8
calibration (RX) for LimeSDR. Use of new API for RF gains.
2017-03-09 02:43:31 +01:00
Cedric Roux
c1e460183b
Merge remote-tracking branch 'origin/nokia-fixes-w08' into develop_integration_w09
2017-03-03 15:33:20 +01:00
Cedric Roux
f94835becf
bugfix: "if_compress" parameter not taken into account
...
Bug reported by Bruno Mongazon from Nokia.
"Without this line, the config file parameter is not properly stored and
the FH will always work with compression."
2017-03-03 15:25:10 +01:00
Cedric Roux
94229ca593
bugfix: = instead of ==
...
Bug reported by Bruno Mongazon from Nokia.
2017-03-03 15:17:00 +01:00
khadraou
0a46cc56a2
fixed PRACH hardcoded size
2017-03-01 10:11:07 +01:00
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
b82e7c1a88
hotfix: forgot targets/COMMON/threads_t.h in a previous commit
2017-02-17 20:19:24 +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
053704b5c2
remove wrong comment
2017-02-17 18:01:02 +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
Cedric Roux
f58c7b1be9
integration fix: restore enb.band7.tm1.usrpb210.conf
...
Many variables were changed that should not have been changed.
2017-02-17 12:41:13 +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
Cedric Roux
7b36af0597
bugfix: variable was on the stack
...
Guess what happens when we return from the function...
2017-02-15 15:38:37 +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
gabrielC
2dc9dc0316
Merge remote-tracking branch 'origin/tm4-fixes' into develop_integration_w07
...
Conflicts:
openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
openair1/PHY/LTE_TRANSPORT/power_control.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
targets/SIMU/USER/oaisim_functions.c
2017-02-14 15:25:37 +01:00
Cedric Roux
b904ce7978
rewrite synchronisation in oaisim/channel simulation
...
The idea is as follows.
oaisim waits for all tasks to be done for a TTI.
To do so it waits for last_rx_timestamp == current_rx_timestamp,
for all UEs and eNBs.
When it's done, it increases current_rx_timestamp by samples_per_tti,
to inform UEs and eNBs that a new TTI is ready.
In the functions [UE|eNB]_trx_read, we wait for a new TTI to be ready,
that is we wait for current_rx_timestamp != last_rx_timestamp.
The UE has also to wait for processing threads to be done.
In the eNB it's not necessary because the processing is all
done in one thread, that is: read subframe, process this subframe,
emit subframe+4, and then back to read subframe.
The code is not clean. We should not use usleep but semaphores.
Also, do_[DL|UL]_sig should not read from rxdata and write to txdata,
but use internal buffers.
The functions [UE|eNB]_trx_read should call do_[DL|UL]_sig and then
copy from the internal buffers of the channel simulator into rxdata.
The functions [UE|eNB]_trx_write should write data passed into the
internal buffers of the channel simulator.
2017-02-13 17:58:11 +01:00
Cedric Roux
14aa96787a
bugfix: eNB_id should have been UE_id
2017-02-13 17:47:47 +01:00
Florian Kaltenberger
aefb958a6f
tx calibration for LimeSDR band 13
2017-02-13 17:12:10 +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
Florian Kaltenberger
d930378e13
calibration for new firmware/gateware
2017-02-13 16:05:40 +01:00
Laurent
fa432bdd26
optim measurement function checkcpu()
2017-02-13 13:58:09 +01:00
Florian Kaltenberger
442bb79bd0
Merge remote-tracking branch 'origin/develop' into calib-LimeSDR
...
Conflicts:
openair1/PHY/MODULATION/ofdm_mod.c
2017-02-13 11:17:28 +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
Laurent
012d333c8e
tune USRP/USB packet size
2017-02-10 17:08:28 +01:00
Cedric Roux
94e039ac87
Merge remote-tracking branch 'origin/fix-if4p5' into develop_integration_w06
...
Conflicts:
openair1/PHY/LTE_TRANSPORT/prach.c
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
2017-02-10 14:59:39 +01:00
Younes
91e12a9724
Fix if4p5
2017-02-10 14:51:43 +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
b9e03cf251
fix usrp thread priority
2017-02-09 19:17:28 +01:00
Elena_Lukashova
b31282ae30
Merge branch 'develop' into feature-59-tm4
2017-02-09 18:03:16 +01:00
laurent
3c191c26f3
fix BCH tracking
2017-02-09 17:46:04 +01:00