Cedric Roux
2a62db97e6
Merge remote-tracking branch 'origin/develop' into develop_integration_w50
2016-12-16 22:47:18 +01:00
gabrielC
f79dd53edf
Merge remote-tracking branch 'origin/feature-21-TM7-tmp' into develop_integration_w50
2016-12-15 11:39:04 +01:00
hbilel
ca078ff549
fix compilation error
2016-12-13 17:38:43 +01:00
hbilel
495e357a1e
Merge branch 'develop1B' of https://gitlab.eurecom.fr/oai1B/openairinterface5g into enhancement-45
...
Conflicts:
openair2/LAYER2/MAC/ue_procedures.c
2016-12-13 12:31:45 +01:00
Chia-Yu Chang
7f4c961d82
add T messages for FLEXRAN and fix a complication error in FLEXRAN
2016-12-12 18:41:26 +01:00
hbilel
e0bf855fbf
initialize max retans tx Mlimit
2016-12-12 12:12:27 +01:00
hbilel
e04e8a62cc
remove mac-struct usage from phy
2016-12-12 11:45:22 +01:00
gabrielC
bd30471076
[OAI-UE] merge com4Innov branch to integration branch
2016-12-08 11:07:38 +01:00
Florian Kaltenberger
e470e2d3bd
Merge remote-tracking branch 'origin/develop' into feature-21-TM7-tmp
...
Conflicts:
targets/RT/USER/lte-enb.c
2016-12-07 09:40:20 +01:00
Wilson W.K. Thong
55e50b2052
enhanced wireshark logging. also logs BCH, PRACH and RAR. Tested with wireshark 2.2.2 on linux and windows
...
see issue #45
2016-12-07 10:45:44 +08:00
Wilson W.K. Thong
4041a661fc
fixed incorrect wiresahrk SFN/SF for UL/DL data
2016-12-07 10:43:47 +08:00
gabrielC
0fb34b2e28
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop1B
2016-12-06 12:05:25 +01:00
Xenofon Foukas
8def47c488
Changed old licenses in FlexRAN agent source files
2016-12-05 22:04:12 +02:00
fnabet
bc032392c9
add workarounds for OAI issues
2016-12-05 16:51:27 +01:00
hbilel
ea7c0e1b36
reduce BSR logging
2016-11-29 15:26:57 +01:00
GabrirelCouturier
b80ce3510e
BSR and MAC UL encoding fixes
2016-11-28 19:27:25 +01:00
hbilel
710a246596
enhance BSR log
2016-11-28 10:55:00 +01:00
hbilel
ca2aeaccb8
BSR and MAC multiplexing fixes
2016-11-28 10:36:46 +01:00
Rohit Gupta
045c947015
Merge branch 'develop' into feature-68-enb-agent
2016-11-25 10:08:53 +01:00
hbilel
b0b472e035
BSR fixes on CMW500
2016-11-24 18:17:21 +01:00
fnabet
880cddb4a0
Merge branch 'develop1B' into BSR_fixes_fabrice
2016-11-24 11:39:56 +01:00
fnabet
6f0b71deac
merge Calvin changes and add fixes
2016-11-24 11:37:13 +01:00
Florian Kaltenberger
f446a5ea17
Merge branch 'develop' into feature-21-TM7
2016-11-22 18:24:40 +01:00
Cedric Roux
b526ef7b47
T: update a trace
...
add ndi to trace ENB_MAC_UE_DL_SDU
2016-11-22 12:04:06 +01:00
Cedric Roux
6bb69e1964
hotfix: correct Msg3 ressource blocks reservation
...
The Msg3 ressource blocks used by random access procedure
were not correctly handled. The MAC scheduler could wrongly
allocate a ressource block for both random access Msg3 and
a regular UE.
This hotfix hopefully fixes the problem.
A new function "set_msg3_subframe" has been added in the
interface between PHY and MAC.
2016-11-22 10:38:18 +01:00
GabrirelCouturier
34b75f393d
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into bugfix-26
2016-11-21 11:19:30 +01:00
Florian Kaltenberger
8769024922
Merge remote-tracking branch 'origin/develop' into feature-21-TM7
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/INIT/lte_init.c
openair1/PHY/INIT/lte_param_init.c
openair1/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
openair1/PHY/LTE_REFSIG/lte_dl_uespec.c
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/PHY/LTE_TRANSPORT/initial_sync.c
openair1/PHY/LTE_TRANSPORT/pbch.c
openair1/PHY/LTE_TRANSPORT/pilots.c
openair1/PHY/LTE_TRANSPORT/pmch.c
openair1/PHY/LTE_TRANSPORT/proto.h
openair1/PHY/defs.h
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_ue.c
openair1/SIMULATION/LTE_PHY/dlsim.c
openair1/SIMULATION/LTE_PHY/mbmssim.c
openair1/SIMULATION/LTE_PHY/pdcchsim.c
openair1/SIMULATION/LTE_PHY/ulsim.c
openair2/ENB_APP/enb_config.c
openair2/RRC/LITE/rrc_eNB.c
targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-ue.c
targets/RT/USER/sched_rx_pdsch.c
targets/SIMU/USER/init_lte.c
targets/SIMU/USER/oaisim_functions.c
2016-11-18 15:35:21 +01:00
GabrirelCouturier
7f74065484
BSR fixes for ping
2016-11-18 15:22:11 +01:00
calvin wang
319ae6fbbf
fix bsr report inaccurate value
2016-11-18 16:44:18 +08:00
fnabet
69ccc900e8
fix BSR long size and fill
2016-11-16 18:24:04 +01:00
Xenofon Foukas
c0ad88e537
Fixed bug in the creation of MAC PDUs in the local flexran scheduler
2016-11-16 16:12:30 +02:00
hbilel
f0f34c029b
BSR fixes with CMW500
2016-11-15 16:13:24 +01:00
calvin wang
3bd591bfec
change bsr trigger
2016-11-15 18:41:46 +08:00
calvin wang
6097e0516f
fix build error
2016-11-14 11:10:33 +08:00
calvin wang
09f149d86b
Stabilization UE BSR feature
2016-11-11 18:01:39 +08:00
Xenofon Foukas
1c86e23edf
Merge remote-tracking branch 'origin/develop' into feature-68-enb-agent
2016-11-11 08:54:56 +02:00
Xenofon Foukas
2078a9e57c
Added macros for enabling FlexRAN agent operation
2016-11-09 12:09:02 +02:00
Rohit Gupta
1a99e785a0
remove warnings
2016-11-08 03:14:01 +01:00
fnabet
d56c651081
Reapply BSR changes
2016-11-07 11:57:02 +01:00
fnabet
048b5384dd
[OAI-UE] revert commit 8236206c and 9672b410 "BSR-stabilization + rebase from oai1B"
2016-11-07 11:22:11 +01:00
Xenofon Foukas
83929d42f2
Refactored local FlexRAN scheduler to make further use of FlexRAN API
2016-11-05 14:09:48 +02:00
Fabrice Nabet
9672b41089
Merge branch 'L2_Stabilization-22-BSR_fertilization' into 'develop1B'
...
L2 stabilization 22 bsr fertilization
merge BSRfertilization branch to develop1B
See merge request !13
2016-11-04 16:58:09 +00:00
Xenofon Foukas
5864cc08cd
Integrated scheduler to overall FlexRAN agent functionality
2016-11-04 17:49:39 +02:00
Xenofon Foukas
8baf3e7e57
Changed naming convention for flexran related calls
2016-11-04 17:28:04 +02:00
hbilel
10ab1c3e8b
[OAI-UE] - PUCCH Format2 Periodic CQI/RI reporting
...
Handle SRS TX in case of CQI / SR / AN simultaneous transmission
2016-10-27 14:30:30 +02:00
calvin wang
6644204765
add BSR trigger code for interoperability test
2016-10-27 11:47:17 +08:00
calvin wang
0dfde2f441
Merge branch 'develop1B' of https://gitlab.com/TCL_Communications/openairinterface5g into L2_Stabilization-22-BSR_fertilization
2016-10-27 09:07:13 +08:00
calvin wang
7e6a74d5be
change debug info
2016-10-26 13:21:26 +08:00
Xenofon Foukas
b6c7909d03
Fixed bugs related to MAC padding and RLC requests in AM mode
2016-10-24 19:14:07 +03:00
hbilel
31fbc80520
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop1B
...
parent a6742020 - Commit 1fa2f76e61
Conflicts:
targets/RT/USER/lte-softmodem.c
2016-10-24 16:21:05 +02:00