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
calvin wang
948f2df9f1
modify BSR code according comments
2016-10-21 18:26:50 +08:00
Xenofon Foukas
b218128862
Moved agent and protocol to flexran naming convention
2016-10-20 16:37:45 +03:00
Raymond Knopp
d8defff0fa
periodic cqi procedures
2016-10-20 06:32:33 -07:00
Xenofon Foukas
93b9b73582
Merge remote-tracking branch 'oai/develop' into oai-integration
...
Conflicts:
cmake_targets/tools/build_helper
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/LAYER2/MAC/eNB_scheduler.c
2016-10-18 16:27:56 +03:00
Rohit Gupta
5725374ed4
Merge branch 'develop' into bugfix-137-uplink-fixes
2016-10-17 21:25:56 +02:00
Raymond Knopp
2e688c69ca
small bugfixes to avoid segfault in rx_sdu
2016-10-12 23:31:31 -07:00
Rohit Gupta
057d7619f6
Merge branch 'feature-131-new-license' into develop
2016-10-11 17:39:26 +02:00
Cedric Roux
ef67b3a0a9
hotfix: reserve RBs in Random Access Response case
...
The RBs were not marked as used. A later UE downlink scheduling
could use those RBs, messing up everything.
Not sure this is the right place to mark them used. Maybe better
to do it in the "if (!CCE_allocation_infeasible" test.
2016-10-11 12:29:15 +02:00
Rohit Gupta
b481bfd985
Merge branch 'develop' into feature-131-new-license
2016-10-10 19:25:02 +02:00
Nikos Makris
af6af8a90d
Cleanup of the messages; sometimes an error is logged
2016-10-10 20:12:46 +03:00
Nikos Makris
e0c3356dbb
Fixed memory management issues
2016-10-10 19:43:26 +03:00
fnabet
138ed2fbb4
[OAI-UE] fixes:
...
1- frame/subframe update
2- ccch discard regression
2016-10-10 17:16:01 +02:00
Cedric Roux
5894f3e6c2
issue 137 - remove hack: MCS reduction in case of CQI reporting
...
This hack was probably put in place in an attempt to circumvent
problems solved by previous commits.
As far as I checked (with my knowledge of the day) we can't exhaust
uplink physical bits with ULSCH data bits when there is CQI reporting
at the same time.
To be refined if this idea is proved wrong.
2016-10-10 16:40:42 +02:00
fnabet
b11ed995d2
fix build issue after merge from develop
2016-10-10 16:22:01 +02:00
fnabet
1b8c0d6551
merge from oai1B/develop1B
2016-10-10 14:55:46 +02:00
Rohit Gupta
c51edecdee
Merge branch 'bugfix-136-OAI-UE-Attach-fixes' into 'develop'
...
[OAI-UE] issue#136 attach fixes:
- pusch/pucch power control
- pucch encoding call
- srb/drb add with default value
See merge request !44
2016-10-10 12:03:51 +02:00
Raymond Knopp
81ae8fb2ff
cleaned up formatting of CCE table trace in eNB_scheduler_primitives.c
2016-10-07 23:41:51 -07:00
fnabet
310a87ea90
[OAI-UE] issue#136 attach fixes:
...
- pusch/pucch power control
- pucch encoding call
- srb/drb add with default value
2016-10-07 18:30:55 +02:00
Rohit Gupta
73aa265793
Merge branch 'develop' into feature-131-new-license
2016-10-07 13:58:08 +02:00
Florian Kaltenberger
3e81e8c86b
Merge remote-tracking branch 'origin/develop' into feature-59-tm4
...
Conflicts:
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/PHY/LTE_TRANSPORT/proto.h
openair1/PHY/MODULATION/slot_fep.c
openair1/PHY/TOOLS/lte_phy_scope.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SIMULATION/LTE_PHY/dlsim.c
2016-10-06 21:56:06 +02:00
fnabet
2e76cb7e37
Merge branch 'develop1B' into 6-bugfix-wireshark-sfn
2016-10-05 16:24:58 +02:00
Nikos Makris
2a4fa1da41
Fixed broken UL for data plane split
2016-10-04 18:59:01 +03:00