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
1f3b1ff8ff
integration fix: remove XER_PRINT from RRC
2017-02-16 12:53:25 +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
Cedric Roux
6397e66c29
bugfix: fix PCDP inst (again)
...
This commit follows 7d9945e884 .
lte-softmodem UE in S1 and lte-softmodem UE in noS1 modes behave
differently here.
This commit fixes the issue for thoses cases.
Other cases (eNB S1, eNB noS1, oaisim S1/noS1) have to be checked.
2017-02-16 11:23:24 +01:00
Cedric Roux
7d9945e884
bugfix: fix PDCP inst
...
This commit is a continuation of 614d6bbe2a
(ue_ip: use correct instance).
Now in openair2/NETWORK_DRIVER/UE_IP/common.c the 'inst' is not
forced to 1 anymore, we take the value 'pdcph_p->inst'.
It turns out that 'pdcph_p->inst' is 0 instead of 1 when we
run lte-softmodem as an UE.
So let's modify PDCP to set 'inst' to 1 where it was set to 0 for
the UE softmodem case, and skip the places where it is reset to 0,
still for the UE softmodem case.
This may break things, I am not sure.
2017-02-15 17:21:02 +01:00
Laurent
d65d91ddcc
gcc warning fix
2017-02-14 18:18:34 +01:00
Cedric Roux
6c789a36bc
minor: add a comment
2017-02-14 16:18:54 +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
614d6bbe2a
ue_ip: use correct instance
...
The problem was the following.
Run oaisim with two UEs:
sudo ../cmake_targets/oaisim_build_oai/build/oaisim -O enb.conf -u2 -s15 -AAWGN -y1 -b1 -Q0
Then wait for both UEs to be connected. The interfaces "oip1" and "oip2" are
activated, with IP addresses 192.172.0.2 for the first UE and 192.172.0.3 for
the second.
Then on the EPC machine, do:
ping 192.172.0.3
No reply.
On the oaisim machine, we see that the packets are sent to "oip1" instead
of "oip2".
The fix may break softmodem UE. The inst was forced to "1" for some reason.
To be checked.
2017-02-14 10:58:06 +01:00
hbilel
e88d1e739e
[OAI-UE] new pucch procedure to support all formats
2017-02-13 16:15:47 +01:00
Cedric Roux
2bf1180884
Merge remote-tracking branch 'origin/feature-68-enb-agent' into develop_integration_w06
...
Conflicts:
openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue.c
2017-02-10 12:22:46 +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
3c191c26f3
fix BCH tracking
2017-02-09 17:46:04 +01:00
Navid Nikaein
80eaec1d5c
fix the protobuf installation under ubuntu 16.04
2017-02-09 09:23: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
Navid Nikaein
5c09741fac
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into various-l2-fixes-187
2017-02-08 14:51:35 +01:00
Navid Nikaein
7e13688e80
fix again the compilation issue with flexran
2017-02-08 14:51:25 +01:00
Navid Nikaein
6b81ddf611
fix the compilation issue with flexran
2017-02-08 14:41:07 +01: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
Xenofon Foukas
274030c4d5
Merge remote-tracking branch 'origin/develop' into feature-68-enb-agent
2017-02-06 12:29:53 +02:00
Raymond Knopp
bb5ee76ad8
changes in oaisim to support RRU + fronthaul. minor bugs corrected in UE.
2017-02-05 14:31:00 -08:00
Xenofon Foukas
31dde6129c
Fixed various FlexRAN-related compilation warnings
2017-02-05 20:00:57 +02:00
Xenofon Foukas
8250ecd794
Added info required for stability and fairness of remote scheduler
2017-02-05 19:54:14 +02:00
Xenofon Foukas
0e687fb765
Fixed bug related to the reporting of timing advance to the controller that severely dropped the performance of the remote scheduler
2017-02-03 19:39:47 +02:00
Xenofon Foukas
a3427bf85b
Bug fixes for proper reporting of HARQs to the controller
2017-02-02 17:51:58 +02:00
Laurent
094ac2f3ea
merge with head of branch
2017-02-01 15:03:57 +01:00
Laurent
9f33d0904b
merge develop
2017-02-01 13:08:35 +01:00
Navid Nikaein
0a91243ca5
merge branch various-l2-fixes with the develop branch
2017-02-01 11:52:53 +01:00
Xenofon Foukas
6d6e1c8687
Stability improvements for remote real-time control
2017-01-31 19:15:51 +02: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
Xenofon Foukas
f1d4f4b93c
Changed behavior of API for PUCCH power reports
2017-01-30 14:23:19 +02:00
hbilel
7b64eae285
[OAI-UE] issue#200 release harq p[rocess after sending Ack
2017-01-30 12:00:08 +01:00
Xenofon Foukas
9224d36176
Fixed bug that prohibited 2 UEs to be scheduled at the same time
2017-01-27 19:19:17 +02:00
Anta Huang
471a7d7d10
revert the value of the aggregation
2017-01-27 10:49:04 +01:00
Anta Huang
c84f68cefc
fix the issue with RAN sharing
2017-01-26 18:43:05 +01:00
Xenofon Foukas
974e5beebc
Harmonized FlexRAN scheduler with MAC changes for support of multiple UEs
2017-01-25 20:02:38 +02:00
Xenofon Foukas
422c06c932
Merge remote-tracking branch 'origin/develop' into feature-68-enb-agent
2017-01-25 16:18:44 +02: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
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
Frédéric Leroy
2d8cf88884
openair2/RRC/LITE: remove fixed ue_mod_id = 0
2017-01-25 13:06:13 +01:00
Frédéric Leroy
b4cbddb970
UE: move nas_ue_task.h from openair2 to openair3/NAS/UE
2017-01-25 13:06:13 +01:00
Frédéric Leroy
3835f10659
UE/ESM: move esm_indication_callback_t from openair2 to esm_ebr.h
2017-01-25 13:06:13 +01:00
Frédéric Leroy
3df061b540
UE/EMM: move emm_indication_callback_t from openair2 to emm_main.h
2017-01-25 13:06:13 +01:00
Xenofon Foukas
d0476cb02b
Fixed various bugs related to scheduling using agent
2017-01-24 17:39:44 +02:00
Cedric Roux
af67618095
Merge branch 'bugfix-188-multi-UEs-fixes' into develop_integration_w03
2017-01-20 17:05:00 +01:00
Cedric Roux
69c8b8a933
Merge branch 'feature-68-enb-agent' into develop_integration_w03
2017-01-20 16:59:16 +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
a0f19a7265
add some printf for debug purpose (to be remove at some point)
...
this commit is here to help debug the previous ones.
It has to be reverted at some point.
2017-01-20 15:48:49 +01:00