Robert Schmidt
024904db90
repair enb_app.c after merge, delete unnecessary code
2018-01-31 16:42:01 +01:00
Robert Schmidt
a6098dbf09
delete unnecessary FlexRAN source files
...
all the FlexRAN scheduling code is now also handled by the general OAI
scheduling code
2018-01-31 16:42:01 +01:00
Robert Schmidt
b45a340b63
RAN API: no set_RC_vars(), check use RC directly, give error messages
2018-01-31 16:42:01 +01:00
Robert Schmidt
cdbf65f5af
revise RAN API
...
- when changing values RC.rrc[i]->configuration should be changed too
- then, RRC_RECONFIGURATION_REQ will pass the changed conf down until PHY
- give warnings at functions that are not implemented
- rename functions
flexran_get_tdd_ack_nack_feedback() -> flexran_get_tdd_ack_nack_feedback_mode()
flexran_get_ue_pmi() -> flexran_get_ue_wpmi()
2018-01-31 16:41:56 +01:00
Eurecom
5f028730cd
bug fix for RXTX same thread
2018-01-30 17:22:34 +01:00
Eurecom
f0e10b0d89
bug fix for shared info between threads
2018-01-30 14:56:23 +01:00
Raymond Knopp
200be2b1ee
Merge branch 'develop-nos1-fixes' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nos1-fixes
2018-01-28 13:14:51 +01:00
Raymond Knopp
0d05de6382
minor changes after merge with develop for noS1 simulation
2018-01-28 13:13:59 +01:00
Xu Bo
ef4aee1e28
Merge branch 'issue255_256_257_tmp' into ues_test
2018-01-27 04:14:06 +00:00
Xu Bo
0dcc3dceaf
reduce UL failure timer log by change LOG_I to LOG_D
2018-01-27 04:13:12 +00:00
Xu Bo
664d1a4b5f
merge issue271_hundreds_of_ues into ues_test and fix conflict in openair2/LAYER2/MAC/defs.h
2018-01-27 02:24:43 +00:00
Xu Bo
098a177d6f
Merge branch 'issue271_hundreds_of_ues' into ues_test
2018-01-27 02:12:47 +00:00
Xu Bo
dedd3c6344
fix issue that when RRCConnectionRelease happened by UL failure DL SCD doesn't send DCCH(RRCConnectionRelease) to UE because ul_out_of_sync is set to 1
2018-01-27 02:11:57 +00:00
Xu Bo
b7e2a90ef4
fix release timer by starting timer after SCD DCCH(RRCConnectionRelease)
2018-01-27 02:06:08 +00:00
Wang Tsu-Han
3efaa38394
adjustable thread structure
2018-01-26 18:05:17 +01:00
Xu Bo
260a2a7d3d
Merge branch 'issue255_256_257_tmp' into ues_test
2018-01-26 17:08:09 +09:00
Xu Bo
d9d28e3209
reset release_timer from 200ms to 100ms because of flightmode on/off issue, reduce ul failure timer log
2018-01-26 08:00:57 +00:00
Xu Bo
1547a45eae
Merge remote-tracking branch 'remotes/origin/issue255_256_257_tmp' into ues_test
2018-01-26 07:15:45 +00:00
Xu Bo
0105373cdc
Merge remote-tracking branch 'remotes/origin/issue271_hundreds_of_ues' into ues_test
2018-01-26 06:43:41 +00:00
Xu Bo
b44c83ef46
add remove ue info of pre_scd thread to freeList and for ru_thread to remove the UE in the freeList
2018-01-26 06:15:28 +00:00
Xu Bo
23b5b6ac20
add remove ue info to freeList when RRCConnectionReestablish occurs and for ru_thread to remove the info
2018-01-26 05:57:37 +00:00
Florian Kaltenberger
13c8931bf2
bugfix in modulation
2018-01-25 16:20:25 +01:00
Raymond Knopp
2d610d95c8
Merge branch 'develop-nos1-fixes' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nos1-fixes
2018-01-25 15:55:24 +01:00
Raymond Knopp
fe1912a193
correcting issues after merge with develop
2018-01-25 06:54:01 -08:00
Raymond Knopp
8b052dadd5
Merge branch 'develop-nos1-fixes' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nos1-fixes
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/RRC/LITE/rrc_UE.c
openair2/RRC/LITE/rrc_common.c
targets/SIMU/USER/oaisim_functions.c
2018-01-25 00:00:24 -08:00
Raymond Knopp
ceb4edf7e6
minor changes
2018-01-25 08:53:40 +01:00
Raymond Knopp
f8b0cd5bd4
Merge remote-tracking branch 'origin/develop' into develop-nos1-fixes
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair2/RRC/LITE/rrc_UE.c
2018-01-24 23:36:39 -08:00
Raymond Knopp
866a23a136
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop
2018-01-24 23:25:16 -08:00
Massive
a6db17ffcd
Merge branch 'RU-RAU-split-parallel-EMUFH' of http://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split-parallel-EMUFH
2018-01-24 15:29:24 +01:00
Robert Schmidt
6198a673f0
correctly instantiate flexran agent
2018-01-24 11:51:35 +01:00
Robert Schmidt
ab3f9dad49
add flexran sample config
2018-01-24 11:51:35 +01:00
Robert Schmidt
fac968246d
define FlexRAN data in RAN context and use it
...
- defines RCconfig data structures
- adds method to read data
- use it in source files
2018-01-24 11:51:35 +01:00
Robert Schmidt
765d6370f6
update FlexRAN configuration definition (paramdef)
2018-01-24 11:51:35 +01:00
Navid Nikaein
0937339a53
Update MAC scheduler for slicing (not tested)
2018-01-24 11:51:35 +01:00
Robert Schmidt
78dd80b086
Merge branch 'feature-68-enb-agent' into feature-merge-f68
...
Try to merge feature-68-enb-agent into develop
develop should be fast-forwarded later to this branch to complete the merge
This code does not compile yet. Among other things:
- the scheduler structure needs to be reworked for FlexRAN
- the config is structured differently. The files enb_config.{c,h} from develop
have been copied in here, the files with merge annotations are in
enb_config.{c,h}.before_merge
- the restart needs to be restructured, since the PHY vars data structure lives
in RC now
2018-01-24 11:47:28 +01:00
Xu Bo
da94f64c95
Merge remote-tracking branch 'remotes/origin/issue255_256_257_tmp' into ues_test
2018-01-23 09:37:15 +00:00
Xu Bo
573c703cd2
fix issue about nb_rb=0 assertion failed
2018-01-23 09:31:01 +00:00
Cedric Roux
cd8e8458cf
Merge remote-tracking branch 'origin/develop_integration_2018_w04' into develop
...
Summary of changes:
- heavy code cleanup (#ifdef removal)
- bugfixes
2018-01-23 09:30:04 +01:00
Cedric Roux
ecd4aebbe0
Merge remote-tracking branch 'origin/issue-285-connect-disconnect-multiple-time' into develop_integration_2018_w04
2018-01-22 18:44:32 +01:00
Eurecom
30d5f151c3
specified modulation for QPSK
2018-01-22 18:02:02 +01:00
Cedric Roux
97ebc165cc
Merge remote-tracking branch 'origin/282-flags-cleanup' into develop_integration_2018_w04
...
Conflicts:
openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
openair1/SCHED/defs.h
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/RRC/LITE/rrc_eNB.c
2018-01-22 17:47:01 +01:00
Cedric Roux
b5513cadf1
hotfix: fix nfapi for correct compilation on ubuntu 17.10
2018-01-22 16:00:21 +01:00
Cedric Roux
4b5b556493
bugfix: fix issue 285 - connect/disconnect multiple time
...
As reported by Emad Alizade:
According to "Issue255 256 257 paging reesta release" that has been
merged in develop version, we have a question: In rrc_eNB_free_UE()
function only all ulsch related memory of user has been cleaned, but
I think not only ulsch memory but also dlsch memory must be cleaned.
I tested the latest develop version and with repetition UE attach-detach
procedures we find that the dlsch memory has not been cleaned and after
repeat this sequence (45 times) assertion with cause UE_id!=-1 (no free
or exiting dlsch_context, dci_tools.c: fill_dci_and_dlsch() ) occurred
and no UE will be attached to system.
The fixes in this commit are from Emad Alizade.
2018-01-22 15:32:41 +01:00
Massive
5d199f4500
adding an addition error check on harq_pid as it is sometimes not in range. root cause still to be identified
2018-01-22 12:52:37 +01:00
Xu Bo
70371e124d
fix issue about Arithmetic exception for pre_scd thread
2018-01-22 10:15:08 +00:00
Xu Bo
2efaf51280
modify pre_scd thread and add phy_tx thread and rf_tx thread
2018-01-22 05:58:14 +00:00
Xu Bo
b67c169145
Merge branch 'issue255_256_257_tmp' into ues_test
2018-01-22 13:58:56 +09:00
Xu Bo
38eacea022
fix noS1 compile error
2018-01-22 04:53:17 +00:00
Xu Bo
70da4b5902
modify pre_scd thread and add phy_tx and rf_tx thread
2018-01-22 03:59:04 +00:00
Xu Bo
f59a509ec7
fix RRCConnectionRelease timer from 100ms to 200ms and clear MSG3_round after schedule_RA
2018-01-22 02:38:17 +00:00