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
Cedric Roux
bcfeb7af32
integration fix: put correct licensing information
2017-02-16 14:04:56 +01:00
Cedric Roux
36bd7e1d75
integration fix: remove comment
2017-02-16 14:01:15 +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
6f6f9acb52
merge develop; add option to set affinity in UE
2017-02-16 11:34:02 +01:00
hbilel
bfa8a28ccb
[OAI-UE] fix pucch format2 regression
2017-02-14 18:31:57 +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
hbilel
e88d1e739e
[OAI-UE] new pucch procedure to support all formats
2017-02-13 16:15:47 +01:00
Raymond Knopp
cd6ac4529d
addition of TX portion of pucch2a/b
2017-02-13 15:27:53 +01:00
Cedric Roux
6ba07564af
fix: do not modify dlsch[0]->g_pucch
...
This is done in another function.
2017-02-13 15:12:08 +01:00
Cedric Roux
8d7c06b194
cleanup: setting status to ACTIVE is done below
...
Don't do it twice.
The logic is: if ndi changed or it's a first tx then round=0
and later: if round==0 then status=ACTIVE
2017-02-13 15:10:00 +01:00
Cedric Roux
4d8e41100a
fix: check that dlsch[0] is not NULL
...
Note: the dci formats 2, 2A and 1E were not checked,
this has to be done. dlsch[0] and dlsch[1] (when
applicable) must be checked somehow.
2017-02-13 15:08:20 +01:00
Cedric Roux
82403ed1dd
cleanup: comments "Needs to be checked" are not needed
2017-02-13 15:07:06 +01:00
Cedric Roux
0bcee1e40e
fix: set mcs, TBS and Qm only if round == 0
...
Not sure at all about this one, seemed necessary to me,
but I don't get the full logic in there.
To be refined.
2017-02-11 12:34:05 +01:00
Cedric Roux
8f7b6391a5
fix: enough to do it once
...
This is done a bit above in the code, no need to do it twice.
2017-02-11 12:31:45 +01:00
Cedric Roux
c5f400e9d3
fix: do not access array before check
2017-02-11 12:25:46 +01:00
Cedric Roux
fc46dcff36
fix format 1A DCI management
...
I am not sure this is enough. To be refined.
2017-02-11 12:23:05 +01:00
Cedric Roux
80f47817d9
fix: warn if no PDSCH active
...
I doubt the case should happen. If it does, let's print an
error, will ease debugging.
2017-02-11 12:21:05 +01:00
Cedric Roux
a75cfd9073
fix: set default value of nb_rb
...
Not sure if necessary, but better do it.
2017-02-11 12:20:15 +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
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
Elena_Lukashova
b31282ae30
Merge branch 'develop' into feature-59-tm4
2017-02-09 18:03:16 +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
Florian Kaltenberger
b44c49bc30
adjusting power levels in alamouti receiver and dlsim. now TM2 dlsim tests pass again.
...
Conflicts:
openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
openair1/PHY/impl_defs_top.h
2017-02-08 11:10:37 +01:00
Raymond Knopp
4661138d87
protection in case of false DCI
2017-02-07 16:01:27 -08:00
Florian Kaltenberger
e0b8998def
fixing bug in PDSCH power allocation for TM2
...
Conflicts:
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/PHY/LTE_TRANSPORT/power_control.c
2017-02-07 10:02:49 +01:00
Elena_Lukashova
0cd250bc50
1. Fixing remaining bugs form merge. Both simulators pass all the test.
...
2. Adding dlsch_encoding_SIC, where the fisrt argument is UE structure.
3. Adding general test cases for dlsim_tm4 simulator. 015110.
2017-02-06 14:55:21 +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
Florian Kaltenberger
41a261266a
fixing some bugs
2017-02-03 16:17:52 +01: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
Laurent
9f33d0904b
merge develop
2017-02-01 13:08:35 +01:00
hbilel
29cc22bd18
[OAI-UE] bugfix issue#204: fix for pss/sss extraction during scan period
2017-01-31 09:53:15 +01:00
Elena_Lukashova
90fbbe7ef4
Merge branch 'feature-59-tm4' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-59-tm4
2017-01-30 15:16:09 +01:00
Elena_Lukashova
a51c30f459
Merge branch 'develop' into feature-59-tm4
...
dlsim_tm4 works fine.
dlsim has a bug in llr processing after llr computations (see XFORMS).
2017-01-30 13:37:24 +01: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
Cedric Roux
53e416be0b
update license information
...
Also included some source files not related to this branch.
modified: openair1/PHY/LTE_ESTIMATION/lte_dl_bf_channel_estimation.c
modified: openair1/PHY/LTE_TRANSPORT/pilots_ue_spec.c
modified: openair1/PHY/MODULATION/beamforming.c
modified: openair1/PHY/TOOLS/twiddle18432.h
modified: openair1/SIMULATION/LTE_PHY/dlsim_tm7.c
modified: openair3/NAS/TOOLS/nvram.c
modified: openair3/NAS/TOOLS/usim.c
modified: openair3/NAS/UE/user_defs.h
2017-01-27 16:09:56 +01:00
Florian Kaltenberger
b9407c40cf
adding missing file
2017-01-27 15:31:39 +01:00
Elena_Lukashova
b98bb25fba
Merge branch 'feature-60-tm4-fork' into feature-59-tm4
...
1. TM4 works on dlsim_tm4.c with full HARQ support for both PIA and SIC.
2017-01-27 10:36:10 +01:00
gabrielC
0dd076a37a
[OAI-UE] fix time tracking and channel interpolation
2017-01-25 17:23:32 +01:00
Elena_Lukashova
a33a3ead22
1.Fixing the bug in lte_ue_measuments.c for rank indicator.
...
2. Fixing the arguments in the dump_dlsch2.
2017-01-25 17:21:56 +01:00
Imad ALAWE
b3ded7799a
openairinterface5g: Fix multi definition of UE/eNB NB_MAX
...
In openairinterface5g many definitions in many layers of UE or eNB NB_MAX.
We created a file called openairinterface5g_limits.h
located at openairinterface5g_dir/targets/COMMON/ declaring the number max
of UE and eNB to be used in ALL layers depending on launching conditions
(LARGE_SCALE for example).
2017-01-25 13:58:53 +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
37a18b2530
integration fix: bad #if #endif position
2017-01-20 17:22:43 +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