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
Florian Kaltenberger
e84a00174b
choosing the right version of the unresolved merge conflict in beamforming.c
...
changed the memory allocation of txdataF and beam_weigths
2017-01-21 16:20:10 +01:00
Cedric Roux
74d07a70f6
Merge branch 'enhancement-192-beamforming' into develop_integration_w03
...
Conflicts:
openair1/PHY/INIT/lte_init.c
openair1/PHY/MODULATION/beamforming.c
openair1/PHY/defs.h
targets/RT/USER/lte-enb.c
2017-01-20 16:58:29 +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
Florian Kaltenberger
e0c7479122
and one more fix
2017-01-19 09:32:29 +01:00
Florian Kaltenberger
0695828e4c
some fixes
2017-01-18 16:43:02 +01:00
Florian Kaltenberger
b0b5cb21e5
Beamforming is now only done when necessary. This patch is based on one from enhancement-10-harmony.
2017-01-18 15:31:04 +01:00
Tien-Thinh Nguyen
dce5191542
update to make harmony work with Mobipass[Ercom]
2017-01-18 13:53:05 +01:00
Raymond.Knopp
12cc35932a
Merge branch 'develop' into develop-new-LMSSDR
...
Conflicts:
targets/RT/USER/lte-softmodem.c
2017-01-18 10:44:37 +01:00
Tien-Thinh Nguyen
73920f3f6e
[minor modification] fixed the issue related to TX with FDD
2017-01-16 16:08:40 +01:00
Raymond Knopp
8be18c360b
debugging for RRU if4p5 TDD
2017-01-15 08:58:26 +01:00
Raymond Knopp
2da964bb2d
changes for RRU TDD if4p5
2017-01-15 01:07:30 +01:00
Raymond.Knopp
84c61990b7
fix for S-subframe handling (if4p5_asynch_DL)
2017-01-14 16:23:13 +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
Raymond Knopp
0f47f01cae
Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony
2017-01-13 19:52:48 +01:00
Raymond Knopp
848f78465b
addition of IF4p5 ULTICK packet for TDD fronthaul
2017-01-13 19:49:22 +01:00
Cedric Roux
ff11cf5f23
Merge branch 'bugfix-183-LOG_X-format' into develop_integration_w02
2017-01-13 17:16:16 +01:00
Cedric Roux
c88ec0bd81
Merge branch 'bugfix-184' into develop_integration_w02
2017-01-13 17:09:24 +01:00
Cedric Roux
7edff5fe0b
Merge branch 'bugfix-181-oaisim' into develop_integration_w02
2017-01-13 17:02:42 +01:00
Cedric Roux
adfaa6d9f3
Merge branch 'develop-new-LMSSDR' into develop_integration_w02
...
Conflicts:
targets/RT/USER/lte-softmodem.c
2017-01-13 17:01:30 +01:00
Raymond.Knopp
90015dfb35
Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony
2017-01-13 14:17:42 +01:00
Raymond.Knopp
5715de89f2
changes for TDD fronthaul
2017-01-13 14:17:26 +01:00
Florian Kaltenberger
ccdb80efbc
initializing N_TA_offset for TDD eNB. Fixes issue 184.
2017-01-12 10:57:35 +01:00
Cedric Roux
d36e4e4c85
fix minor warning
2017-01-11 15:55:55 +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
6e9a28b1a7
Merge remote-tracking branch 'origin/develop' into develop-new-LMSSDR
...
Conflicts:
targets/RT/USER/lte-softmodem.c
2017-01-07 13:06:23 +01:00
Raymond.Knopp
5575fed27b
some warning removal.
2017-01-07 12:55:48 +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
ce9b316da2
Merge branch 'bugfix-164' into develop_integration_wk01
2017-01-06 10:52:35 +01:00
Raymond.Knopp
28d16f4a91
Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony
...
Conflicts:
openair1/SCHED/phy_procedures_lte_eNb.c
2017-01-05 01:48:52 +01:00
Raymond Knopp
e66338669e
changes for RRU (merge with develop). single-thread-disable flag is functional for RRU.
2017-01-05 09:47:14 +01:00
Raymond Knopp
e466b2c1bc
patch for lte-ue.c on trx_read which allows oaisim to work. rxdata -> UE->common_vars.rxdata
2017-01-04 14:26:58 -05: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
93a244cfaf
debugging for 20 MHz RRU
2017-01-02 23:39:35 +01:00
Raymond.Knopp
975342399d
bugfix for DCCH2/SRB2 in eNB_scheduler_dlsch.c, demultiplexing SIMD alignment issue in ulsch_decoding.c, IF5 fronthaul modification in lte-enb.c
2016-12-27 21:31:11 +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
Raymond.Knopp
12ed6c21f1
minor changes in lte-enb.c and rcc configuration files
2016-12-22 23:16:31 +01:00
Wilson W.K. Thong
a513f8bc39
hotfix logs on multi-threading
2016-12-21 17:20:14 +08:00
Wilson W.K. Thong
afeb256604
add more VCD logs to debug thread timing issue
...
see issue #166
2016-12-21 16:55:46 +08:00
Wilson W.K. Thong
8673fa8415
hotfix VCD log dump for thread timing debugging
...
see issue #165
2016-12-21 16:28:50 +08:00
Wilson W.K. Thong
210cbd60ef
fixing thread busy crash: add more error checking to catch timing issues
...
see issue #165
2016-12-21 16:28:50 +08:00
hbilel
619d34d781
[OAI-UE] UE T-tracer updates part 2
2016-12-19 18:05:59 +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
7a92f587e5
Merge branch 'ue-tdd_fix_issueOai1B_45' into develop_integration_w50
2016-12-13 12:51:05 +01:00
hbilel
595db57af0
Merge branch 'ue-tdd_fix_issueOai1B_44' into develop_integration_w50
...
Conflicts:
targets/RT/USER/lte-ue.c
2016-12-13 12:50:47 +01:00
hbilel
1b07582ce4
Merge branch 'ue-tdd_fix_issueOai1B_43' into develop_integration_w50
2016-12-13 12:49:41 +01:00
hbilel
e227a12736
Merge remote-tracking branch 'oai1B/bugfix-42' into ue-tdd_fix_issueOai1B_42
2016-12-13 12:41:10 +01:00