Nikos Makris
4195681fc9
Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
...
Tested with one UE
Possibly broken FLEXRAN (different methods for configuring the link manager)
2018-04-05 13:22:12 +03:00
Robert Schmidt
9c47c860bc
FlexRAN: RCconfig_flexran(): only read necessary information
...
if the FlexRAN agent is disabled, do not read all the data and skip reading
of more information
2018-03-23 09:20:19 +01:00
Robert Schmidt
d54d415125
FlexRAN: add Information in enb_config_reply msg
2018-03-22 18:43:15 +01:00
Robert Schmidt
1854826053
FlexRAN: send agent_id (aka enb_id)
2018-03-22 18:43:15 +01:00
Robert Schmidt
e7a60fc992
FlexRAN: make agent_id for identification purposes, discern from mod_id
...
The agent_id is a uint64 consisting of: module ID (i.e. mod_id, the several
instances of OAI at once, 16 bit), the enb_id from the configuration file (32
bit) and the cell_id from the configuration file (16 bit).
The module ID is part of the agent ID but it is easier to have it directly in
the struct.
2018-03-22 18:41:14 +01:00
Cedric Roux
92bb82eb2b
integration fix: fix license version to 1.1
2018-03-09 16:40:09 +01:00
Cedric Roux
cd103f7c3d
Merge remote-tracking branch 'origin/fixes-flexran' into develop_integration_2018_w10
...
* bug fix in the FlexRAN API (correct a check)
* bug fix for sending the right RNTI in a FlexRAN message
2018-03-09 14:58:51 +01:00
oai
da50d68b06
more NB-IoT integration
2018-03-08 17:35:35 +01:00
oai
45302792ee
config module fix and extensions for Nb-IoT, shared lib loader and telnet server implementation
2018-03-08 17:24:23 +01:00
Robert Schmidt
4924b18ebd
FlexRAN: send RNTI in protobuf mac_stats_reply message
2018-03-02 17:36:43 +01:00
Robert Schmidt
8cace6537e
correctly check for MAC presence in FlexRAN RAN API
2018-03-02 17:36:43 +01:00
Robert Schmidt
7d8d1588c3
remove unnecessary function declaration
...
has been introduced in commit 365ca71a4a
2018-03-01 09:04:41 +01:00
Cedric Roux
365ca71a4a
remove compilation warnings
2018-02-22 15:03:45 +01:00
Cedric Roux
8ca5fb4ef2
integration: cleanup
...
- remove spaces at the end of lines
- remove useless dead code
use: git show -p <this commit> -w
to see it clearly
2018-02-22 15:03:09 +01:00
Robert Schmidt
e66bd0e2b1
RAN API: unify style, declare missing function in header
2018-02-22 12:03:10 +01:00
shahab SHARIAT BAGHERI
9a9c867a75
additional Mac stats and Improvements
2018-02-20 15:09:24 +01:00
Cedric Roux
b2ac257ef5
integration fix: compilation failed
...
The following compilation failed before this commit:
./build_oai --eNB -w USRP -c --T-tracer
2018-02-15 13:40:34 +01:00
Robert Schmidt
50f7053159
return 0 for unsigned in RAN API
2018-02-14 16:44:29 +01:00
Robert Schmidt
d741b951fa
define&send IMSI in Protobuf
2018-02-13 19:01:47 +01:00
Robert Schmidt
df43d19c35
refactoring of the original IMSI extraction code
...
- move IMSI extraction code to function, remove FLEXRAN comp. directive
- refactor the code, esp. don't do deep if-nesting
- remove m-tmsi part (does not give correct value)
- copy complete IMSI info to UE context, decode in RAN API
2018-02-13 19:01:47 +01:00
Robert Schmidt
d8a6715395
store IMSI information + provide FlexRAN API to query UE's IMSI
2018-02-13 19:01:47 +01:00
Robert Schmidt
ef78dcde55
send UE Capabilities to Flexran RTController
2018-02-13 19:00:34 +01:00
Robert Schmidt
12ac8b180d
prevent warnings: init Protocol__FlexHeader to NULL
2018-02-13 14:29:15 +01:00
Robert Schmidt
219b5bc92f
make FlexRAN Agent activation configurable
2018-02-12 15:11:19 +01:00
Robert Schmidt
adec4e39df
remove all conditional FlexRAN-related compilation directives
2018-02-12 14:38:44 +01:00
Robert Schmidt
cf0a5ca920
fix RAN API due to merge + repair functions
2018-02-12 13:50:48 +01:00
Robert Schmidt
a21bc513bb
Merge branch 'develop' into feature-merge-f68
2018-02-08 18:05:28 +01:00
Nikos Makris
fc43139e6a
Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
...
Compile with ./build_oai --eNB -w USRP --pdcp-split
2018-02-07 19:31:51 +02:00
Nikos Makris
bc0f49cea0
Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
...
OAISIM NoS1 broken, needs fixing (no linking of libraries for the UE code)
2018-02-02 20:21:34 +02:00
Robert Schmidt
fcddbc2b44
RAN API: add functions using UE_Capability
...
- flexran_get_half_duplex()
- flexran_get_intra_sf_hopping()
- flexran_get_type2_sb_1()
- flexran_get_ue_category()
- flexran_get_res_alloc_type1()
2018-01-31 16:49:24 +01:00
Robert Schmidt
e669f83dc1
Navid: revise RAN API
2018-01-31 16:49:24 +01:00
Robert Schmidt
6dcac9234c
Navid: revise FlexRAN
2018-01-31 16:49:24 +01:00
Robert Schmidt
d5b8310fb9
add some logging for RRM command parsing
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
6179d9d748
Navid: fix access to non-existent harq_pid_* variables via RC read
2018-01-31 16:49:01 +01:00
Robert Schmidt
356d406cff
Navid: remove FlexRAN Agent MAC xface function callbacks for scheduling
2018-01-31 16:48:37 +01:00
Robert Schmidt
3740afecc7
consider changed RAN API
2018-01-31 16:48:36 +01:00
Robert Schmidt
56d4d0ebef
Bugfix: avoid cyclic header dependency, use FlexRAN variables instead
2018-01-31 16:48:36 +01:00
Robert Schmidt
6a6729bdac
fix various compilaton errors due to merge
2018-01-31 16:48:29 +01:00
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
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
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
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
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
bruno mongazon
9c93307ab4
Fix #582 , merge from develop
2018-01-16 14:31:23 +01:00