Rohit Gupta
41b80a11d0
Merge from develop
2016-09-21 18:27:24 +02:00
Raymond Knopp
7678f88a47
Merge branch 'develop' into enhancement-10-harmony
...
Conflicts:
cmake_targets/autotests/test_case_list.xml
openair1/PHY/INIT/lte_init.c
openair1/PHY/INIT/lte_param_init.c
openair1/PHY/LTE_TRANSPORT/pucch.c
openair1/SIMULATION/LTE_PHY/pdcchsim.c
openair2/ENB_APP/enb_config.h
openair2/RRC/LITE/rrc_eNB.c
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.generic.oaisim.local_no_mme.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf
targets/RT/USER/lte-softmodem.c
targets/SIMU/USER/init_lte.c
targets/SIMU/USER/oaisim.c
targets/SIMU/USER/oaisim_functions.c
2016-09-18 22:16:29 -07:00
Raymond Knopp
a205844d77
addition of paging in UE, modifications for dlsim
2016-09-03 08:49:14 -07:00
Cedric Roux
85e562d0b9
hotfix: fix a silly bug
2016-09-01 12:18:19 +02:00
Rohit Gupta
de51b52b08
Merge branch 'develop' into feature-44-dedicated-drb
2016-08-23 18:15:17 +02:00
Rohit Gupta
c99a48d946
merge from develop
2016-08-14 23:12:58 +02:00
Cedric Roux
696d92f04d
bugfix: forgot to include T.h
2016-08-10 17:13:31 +02:00
Cedric Roux
3d64a195ef
T: add a trace (random access downlink msg4)
2016-08-10 17:09:15 +02:00
Raymond Knopp
b9e550812a
addition of handling of UE list MAC when RRC cannot add a UE context.
2016-08-06 19:28:45 +02:00
Rohit Gupta
2efe981eb0
Merge from develop
2016-08-04 16:36:36 +02:00
Rohit Gupta
05192acbb0
Merge branch 'develop' into feature-44-dedicated-drb
2016-07-30 20:44:23 +02:00
Cedric Roux
b07efe7a01
add trace ENB_MAC_UE_DL_PDU_WITH_DATA to trace downlink pdu
2016-07-27 11:36:35 +02:00
Raymond Knopp
02051f1cd5
Merge branch 'develop' into enhancement-10-harmony
...
Conflicts:
openair1/SCHED/phy_mac_stub.c
openair1/SCHED/phy_procedures_lte_eNb.c
targets/RT/USER/lte-softmodem.c
2016-07-24 03:14:29 -07:00
Rohit Gupta
da1d8230f0
Merge branch 'develop' into feature-44-dedicated-drb
2016-07-12 19:44:00 +02:00
Cedric Roux
d48c336934
hotfix: better management of s-tmsi reconnect
...
The code was changing the rnti in the red-black tree without
removing/reinserting the context. This is wrong because the
rnti is a key of the red-black tree and you cannot change the
key in a stored item at will.
There are also modifications of the function mac_eNB_rrc_ul_failure
which has to remove the UE in any case.
And rrc_mac_remove_ue has been changed for the case where
the UE is not found.
2016-07-11 12:47:31 +02:00
Aikaterini Trilyraki
f9fda301fd
adding two rules for run_enb_ue_virt_s1 script to resolve the issue of data path with simulated UE (contributed by A. Ksentini)
2016-07-08 12:37:55 +02:00
Aikaterini Trilyraki
49e6a2b720
add T for all lcids
2016-07-07 17:15:10 +02:00
nikaeinn
957707ad39
merge with the develop branch
2016-07-05 10:58:23 +02:00
Cedric Roux
d0c99c296e
Merge branch 'develop' into T
2016-06-28 13:21:32 +02:00
Cedric Roux
bfa749a7fa
hotfix: rrc_mac_remove_ue was wrong
2016-06-24 10:58:29 +02:00
Cedric Roux
6445cc95f5
add T traces for MAC PDU/SDU including full buffers
2016-06-23 12:39:57 +02:00
Raymond Knopp
1f274a7b04
Merge remote-tracking branch 'origin' into enhancement-10-harmony
...
Merge in develop too.
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/CODING/3gpplte_sse.c
openair1/PHY/LTE_TRANSPORT/phich.c
openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
openair1/SCHED/phy_mac_stub.c
openair1/SCHED/phy_procedures_lte_eNb.c
targets/RT/USER/lte-softmodem.c
2016-06-21 23:36:23 -07:00
Cedric Roux
031e6a024f
Merge branch 'develop' into T
2016-06-16 17:22:30 +02:00
Cedric Roux
70d58491fc
bugfix: uplink transmission/retransmission traces were wrong
2016-06-16 11:09:25 +02:00
Cedric Roux
4ea0121cab
hotfix: rewrite allocate_CCEs, it didn't work properly.
...
The distinction common space/user space still requires some
careful examination.
2016-06-15 22:24:15 +02:00
Cedric Roux
26c3a6a039
forgot to include T.h
...
if you compile *without* T it fails because the T macro is interpreted
as a function call
2016-06-10 12:42:44 +02:00
Cedric Roux
310b027acd
Merge remote-tracking branch 'main/develop' into T
...
Conflicts:
cmake_targets/CMakeLists.txt
cmake_targets/build_oai
openair1/PHY/LTE_TRANSPORT/pucch.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
targets/RT/USER/lte-softmodem.c
2016-06-10 11:49:59 +02:00
Cedric Roux
d7e072a413
MAC tracing in the code
2016-06-10 10:46:45 +02:00
Raymond Knopp
1654af9a63
removed some traces that flooded the screen. Added UE information in PHY/MAC/RRC to indicate status of active/failing UEs every 10.24 seconds.
2016-06-08 00:28:16 +02:00
Raymond Knopp
fd70527bf2
updates for 2 RXn-TXnp4 threads
2016-06-02 16:00:02 -07:00
Raymond Knopp
e198a7423f
updated unitary simulations and corrected bugs in threading and scheduling of L1 procedures.
2016-05-27 10:21:23 -07:00
Raymond Knopp
b188a5cfeb
changed threading (acqusition is slot based). removal of eNB_thread. timing all based on received timestamp.
2016-05-26 15:14:57 -07:00
Navid Nikaein
107eec224e
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-44-dedicated-drb
2016-05-25 09:36:32 +02:00
Raymond Knopp
3cfbb76840
Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony
...
Conflicts:
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/SCHED/phy_procedures_lte_eNb.c
2016-05-20 03:49:36 -07:00
Raymond Knopp
d3d423f51e
split phy_procedures_eNB_TX into sub-modules for better understanding. No functional differences.
2016-05-15 14:10:04 -07:00
Raymond Knopp
4070a3affa
fixed CCE allocation bug.
2016-05-10 19:34:36 +02:00
Navid Nikaein
3430dbc41d
merge with the develop branch
2016-05-03 15:51:07 +02:00
Raymond Knopp
2dfe84a7e4
bugfixing for UL. Remaining problems: CCE allocations in subframe 5 lead to occasional illegal DCI allocations (affects UL DCI which is missed by UE). waveform compliance with CQI in ULSCH.
2016-04-10 23:25:58 +02:00
Navid Nikaein
b5e3fa0521
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-44-dedicated-drb
2016-04-06 19:22:19 +02:00
Navid Nikaein
0a3a8a5daf
fix the dedicated DRB setup with multiple E_RAB_SETUP_REQ
2016-04-06 19:21:53 +02:00
Navid Nikaein
b8181d06f1
merge with the develop
2016-04-04 14:47:46 +02:00
Raymond Knopp
b511419090
resolved residual warnings after merge with develop (no warnings again for lte-softmodem)
2016-04-01 09:17:37 -07:00
Raymond Knopp
e71aebc603
Merge remote-tracking branch 'origin/develop' into bugfix-48-L1L2signaling
...
Conflicts:
openair1/PHY/LTE_ESTIMATION/lte_eNB_measurements.c
openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/pre_processor.c
openair2/LAYER2/openair2_proc.c
openair2/RRC/LITE/rrc_eNB.c
openair3/NAS/UE/API/USIM/usim_api.c
openair3/NAS/UE/ESM/esm_ebr_context.c
2016-03-31 14:36:12 -07:00
Navid Nikaein
b65065fa68
merge with the develop
2016-03-30 12:25:56 +02:00
Cedric Roux
5f823b401a
some more warning removals
2016-03-28 22:45:20 +02:00
Cedric Roux
20b6fee632
remove more warnings
2016-03-27 13:36:37 +02:00
Raymond Knopp
1d3ce6d99c
Merge branch 'cleanup' into bugfix-48-L1L2signaling
...
Conflicts:
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
targets/ARCH/COMMON/common_lib.c
2016-03-27 03:09:22 -07:00
Raymond Knopp
aab91dd0d4
removal of MAC_INTERFACE directory and its consequences
2016-03-27 02:50:47 -07:00
Cedric Roux
77363df00b
remove #warning lines (comment them out)
2016-03-26 22:52:19 +01:00
Cedric Roux
04eed3bd6e
remove "unused variable" and "set but not used" warnings
2016-03-25 23:58:58 +01:00