Commit Graph
599 Commits
Author SHA1 Message Date
gabrielC 46b37aaa31 UE 20 MHz fix + remove too restrictive assert 2017-02-21 14:35:00 +01:00
Cedric Roux e62f569b5d Merge remote-tracking branch 'origin/various-l2-fixes-187' into develop_integration_w07 2017-02-17 18:23:00 +01:00
Cedric Roux 603c84c700 fix warnings: fix LOG_X problems when compiling lte-softmodem
The compilation line was:
    ./build_oai --eNB -w USRP

The file openairinterface5g/cmake_targets/log/lte-softmodem.Rel10.txt
has been checked and all LOG_X (and 'msg') warnings have been fixed.
2017-02-17 18:07:06 +01:00
Chia-Yu Chang 1b417979e9 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into various-l2-fixes-187
Conflicts:
	openair1/PHY/LTE_TRANSPORT/if4_tools.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
	targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.25PRB.lo.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.usrpb210.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.50PRB.oaisim.conf
2017-02-17 12:01:26 +01:00
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
pyroclaste 3dd1faadd4 Add the compression for IF5 and RTT measurements for FH and RF 2017-02-17 11:38:44 +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
gabrielC 4ecdfa05f1 UE logging, Replace LOG_I by LOG_D 2017-02-14 16:34:56 +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 f66f6e49cb deal with empty subframes at UE side even in oaisim
The memset was also too big. It should only clear
one subframe.

Only tested without abstraction.
Abstraction does not work for the moment anyway, but just to
keep that in mind.
2017-02-14 10:27:24 +01:00
gabrielC 9ecae1837c [OAI-UE] fix ack/nack reporting on pusch 2017-02-13 18:15:07 +01:00
hbilel 5805215227 [OAI-UE] fix freq offset correction during cell scan 2017-02-13 16:46:28 +01:00
hbilel e88d1e739e [OAI-UE] new pucch procedure to support all formats 2017-02-13 16:15:47 +01:00
Cedric Roux 7fd46420d9 minor: fix log (from LOG_D to LOG_I) 2017-02-13 11:16:38 +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 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 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
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
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 a3427bf85b Bug fixes for proper reporting of HARQs to the controller 2017-02-02 17:51:58 +02:00
gabrielC e45f26e48e Fix for ACK not send when DCI0 and DCI1 received at same sfn 2017-02-01 10:26:59 +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
hbilel 7b64eae285 [OAI-UE] issue#200 release harq p[rocess after sending Ack 2017-01-30 12:00:08 +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
gabrielC 7a2984e8ae [OAI-UE] TimingOffset tracking faster loop 2017-01-25 10:57:20 +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
Raymond Knopp 4c78c177db Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony
Conflicts:
	openair1/SCHED/phy_procedures_lte_eNb.c
	targets/RT/USER/lte-enb.c
2017-01-14 22:54:12 +01:00
Raymond Knopp 6fd41105c9 RRU changes for S-Subframe 2017-01-14 22:40:36 +01:00
Raymond.Knopp 9ee29fb0b2 changes for S-subframe support in fronthaul 2017-01-14 14:35:19 +01:00
Cedric Roux 22942608fa fix 'unused variables' warning 2017-01-11 15:53:41 +01:00
Cedric Roux f2f32f5340 fix LOG_X macros
Some of them might not be correctly handled.
I put /* TODO: XXX */ where I didn't know if
the fix was correct.
2017-01-11 15:48:00 +01:00
Raymond.Knopp 14d28e2dbd fixes for precoding (turning off if nb_antennas_tx=1), configuration files, timing advance with 3/4 sampling on 20 MHz, logging in MAC 2017-01-07 12:41:36 +01:00
Cedric Roux e05bf365be Merge branch 'bugfix-177' into develop_integration_wk01
Smoe conflicts, manually resolved.

Conflicts:
	openair1/SCHED/phy_procedures_lte_ue.c
2017-01-06 11:12:06 +01:00
Cedric Roux 217eba6b6e Merge branch 'bugfix-176' into develop_integration_wk01
There were some conflicts, manually resolved.

Conflicts:
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/SCHED/phy_procedures_lte_ue.c
2017-01-06 11:04:39 +01:00
Cedric Roux ce9b316da2 Merge branch 'bugfix-164' into develop_integration_wk01 2017-01-06 10:52:35 +01:00
Cedric Roux 02ecf9fd45 Merge branch 'bugfix-156' into develop_integration_wk01 2017-01-06 10:47:18 +01:00
Wilson W.K. Thong 4fe2d6d724 fix noise power calculation and downlink CQI reporting
see issue #177
2017-01-06 12:08:51 +08:00
Wilson W.K. Thong 2e7c28a591 fix incorrect PUCCH format causing no SR received by eNB in TDD
fix incorrect fss_pusch calculation
fix the incorrrect HARQ-PID checking
remove incorrect checking on downlink DCI HARQ PID value
fix incorrect downlink ACK/NACK feedback procedures in TDD
fix no activating PDSCH decoding when DL-DCI is indicating a downlink retransmission

see issue #176
2017-01-06 12:01:05 +08:00
Raymond Knopp 219016e7a4 Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony
Conflicts:
	openair1/PHY/INIT/lte_init.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
	targets/SIMU/USER/init_lte.c
2017-01-04 07:18:52 +01:00
Raymond Knopp 1d331c0bf8 Changes for 20 MHz RRU (dual-thread mode) 2017-01-03 07:46:36 +01:00
Raymond.Knopp db4b77ebd2 Merge remote-tracking branch 'origin/develop' into enhancement-10-harmony
Conflicts:
	targets/RT/USER/lte-softmodem.c
2016-12-22 23:17:37 +01:00
hbilel 6f9ba77bd8 Merge branch 'T-tracer-branch' into develop_integration_wk01
Conflicts:
	openair1/SCHED/phy_procedures_lte_ue.c
2016-12-22 11:36:23 +01:00
hbilel 759f5f751f [OAI-UE] 1- ignore bad dci
2- reset dataTx buff correctly
           3- pucch/pusch power control fix
2016-12-22 11:18:29 +01:00