Cedric Roux
365ca71a4a
remove compilation warnings
2018-02-22 15:03:45 +01:00
Raymond Knopp
1c46dd7c69
updates for oaisim
2018-02-18 17:31:40 +01:00
Cedric Roux
8cab562b9f
Merge remote-tracking branch 'origin/feature-merge-merge-f68' into develop_integration_2018_w07
2018-02-15 09:58:26 +01:00
Robert Schmidt
a4f260f5a4
fix: no FLEXRAN_AGENT_SB_IF compilation directive
2018-02-14 17:50:41 +01:00
Robert Schmidt
7b1afbb0bf
provide stop_L1L2()/restart_L1L2() in oaisim
...
the functions are meant to restart the lte-softmodem (lower layers) and are not
supported in oaisim. They are provided to make oaisim compile.
2018-02-14 16:45:14 +01:00
Robert Schmidt
9dcd1f9b89
bugfix: max_allowed_rbs has been renamed max_rbs_allowed_slice
2018-02-14 16:45:14 +01:00
Robert Schmidt
54e803e71a
Sample configuration FlexRAN: Agent is disabled
2018-02-12 15:21:44 +01:00
Emad
1056604b25
I tried to change rx and tx attenuation by the config file, but they are not changed. The bug is because att_rx and att_tx do not put in RC.rru when local_rf is "yes" in config file. We need to put att_rx and att_rx for both local_rf = "yes" and "no". Also RF config which send to RF device must be fill by this parameters.
2018-02-12 15:12:22 +01:00
Robert Schmidt
adec4e39df
remove all conditional FlexRAN-related compilation directives
2018-02-12 14:38:44 +01:00
Robert Schmidt
e8e58e2594
Merge branch 'develop' into feature-merge-merge-f68
2018-02-09 17:10:41 +01:00
Robert Schmidt
d746ff6127
update comments in restart_L1L2()
2018-02-09 16:29:59 +01:00
Robert Schmidt
1eabadb137
remove unnecessary code from lte-enb.c
2018-02-09 15:47:59 +01:00
Cedric Roux
26073a353b
Merge remote-tracking branch 'origin/fix-enb-name-2018-w06' into develop_integration_2018_w06
2018-02-09 11:04:56 +01:00
Robert Schmidt
6cff88b9c8
free memory on teardown after all RU/eNB threads have been released
2018-02-09 10:56:14 +01:00
Cedric Roux
11fe5f97c7
bugfix: fix eNB name in configuration files
...
'_' is not a valid character.
S1AP specs say:
ENBname ::= PrintableString (SIZE (1..150,...))
And X.680 (08/2015) 41.4 table 10 lists the valid characters for
PrintableString. '_' is not there. We replace by '-' which is there.
Connection of eNB to ppenair-cn has not been tested. There is no reason
why it would fail.
2018-02-09 10:49:50 +01:00
Robert Schmidt
c8ae5b7c09
decrease warning
2018-02-08 18:55:23 +01:00
Robert Schmidt
a21bc513bb
Merge branch 'develop' into feature-merge-f68
2018-02-08 18:05:28 +01:00
Cedric Roux
a21c0b809f
bugfix: fix RRC Release 10 compilation
...
The following compilation did not work anymore:
./build_oai --eNB -w USRP -r Rel10 -c
(Rel8 still does not work.)
2018-02-05 17:21:40 +01:00
Robert Schmidt
d092231181
free memory when stopping/restarting lte-softmodem
...
- add function free_td() -> complements init_td() [seems to not be used, added
for completeness]
- add function free_td8() -> undoes init_td8() [free memory of 8-bit LLR Turbo
decoder]
- add function free_td16() -> undoes init_td16() [free memory of 16-bit LLR
Turbo decoder]
- change function free_tdavx216() -> undoes init_tdavx216() [free memory of
16-bit LLR Turbo decoder, AVX2 version]
- add free_lte_top() -> frees memory allocated by init_lte_top()
- change free_ul_ref_sigs() to set freed pointers to NULL
- add method free_transport() -> frees memory of ULSCH/DLSCH transport channels
- use the above functions when stopping/restarting the lte-softmodem
2018-01-31 16:49:24 +01:00
Robert Schmidt
4f1c51f38c
add phy_free_RU() and phy_free_lte_eNB()
...
this methods free the memory that is allocated by the functions
phy_init_RU() and phy_init_lte_eNB()
2018-01-31 16:49:24 +01:00
Robert Schmidt
3f043c7d73
FlexRAN: implement possibilty to await a configuration
...
Through configuration, the lte-softmodem can be halted to await a
reconfiguration from the lte-softmodem. A mutex and condition variable are used
to implement this.
Furthermore, the dependance of lte-softmodem.c on FlexRAN has been reduced to
one include and the flexran_agent_start() call.
2018-01-31 16:49:24 +01:00
Robert Schmidt
811ada2429
soft-restart (i.e. only layers PHY-RRC) the lte-softmodem
2018-01-31 16:49:24 +01:00
Robert Schmidt
8e9d9807ae
lte-ru.c: fct for interface -dependant config, export more functions
...
- add set_function_spec_param() which configures RU_t instance depending on its
function(al split)
- export more functions like kill_RU_proc() so that they can be reused by
restart functionality
2018-01-31 16:49:24 +01:00
Robert Schmidt
a91a35877d
join all RU threads
2018-01-31 16:49:24 +01:00
Robert Schmidt
9333c16ecb
bugfixes: correctly initialize mutexes, conds of RU_proc_t, unlock RU.mutex after using
2018-01-31 16:49:24 +01:00
Robert Schmidt
6a6729bdac
fix various compilaton errors due to merge
2018-01-31 16:48:29 +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
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
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
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
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
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
Rohit Gupta
046589e76d
fixes after merge with develop. Partial UE/eNB separation in build to avoid problems with NFAPI in oaisim UE/RRU.
...
tested with simulator.
2018-01-21 22:15:45 +01:00
Cedric Roux
282f6a5077
Merge branch 'issue255_256_257_paging_reesta_release' into develop_integration_2018_w03
...
Conflicts:
targets/RT/USER/lte-softmodem.c
2018-01-17 11:49:44 +01:00
bruno mongazon
9c93307ab4
Fix #582 , merge from develop
2018-01-16 14:31:23 +01:00
Raymond Knopp
d32cdd1f33
Merge remote-tracking branch 'origin/develop' into develop-nos1-fixes
...
Conflicts:
openair1/SCHED/fapi_l1.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/LAYER2/MAC/config.c
2018-01-16 03:55:37 -08:00
bruno mongazon
8d2f0931a7
Fix #582 , NB_ANTENNAS_TXRX removed
2018-01-16 12:35:56 +01:00
bruno mongazon
88d0b68c7b
Fix #582 , MIH_C_MEDIEVAL_EXTENSIONS removed
2018-01-16 12:24:58 +01:00
bruno mongazon
ea3aff84e9
Fix #582 , PUCCH removed
2018-01-16 11:33:45 +01:00
bruno mongazon
f44064a221
Fix #582 , NEW_FFT removed
2018-01-16 11:16:49 +01:00
bruno mongazon
2157727f5f
Fix #582 , PC_TARGET removed
2018-01-16 11:10:05 +01:00
bruno mongazon
dac7888f27
Fix #582 , PC_DSP removed
2018-01-16 10:52:41 +01:00
bruno mongazon
71a6b5d0f0
Fix #582 , ENABLE_FXP removed
2018-01-16 10:35:53 +01:00
bruno mongazon
d62fe071cb
Fix #582 , ENABLE_PGM_TRANSPORT removed, RRH related removed
2018-01-16 10:15:35 +01:00
bruno mongazon
cf0e9175dd
Fix #582 , RTAI, RTAI_ENABLED, ENABLE_RTAI_CLOCK, RTAI_ISNT_POSIX, _RTAI_MATH_H, CELLULAR, TIMER_ONESHOT_MODE, EMOS, EMOS_CHANNEL, OAI_EMU, OPENAIR_EMU, PHY_ABSTRACTION, PHY_ABSTRACTION_UL removed
2018-01-15 18:47:07 +01:00
Cedric Roux
55641754d9
Merge remote-tracking branch 'origin/issue281_iq_filename' into develop_integration_2018_w02
2018-01-15 15:58:48 +01:00