Bi-Ruei, Chiu
5c23af773a
Compare version number using MAKE_VERSION macro to provide better SW configuration:
...
1. Previous SW configuration for different RRC version relies on whether macro Rel10,
Rel14 defined or not by checking #ifdef Rel14 or #if defined(Rel10) || defined(R14).
Whenever there is a newer RRC version, e.g. Rel15, it will be very a tedious and
error-prone job to add defined(Rel15) in every place.
2. Some RRC messages are defined in release 13 instead of release 14, NB-IoT
feature is one of such example. Our code shall reflect this fact instead of using
an afterward version number in software configuration.
3. Some RRC messages or some fields of certain RRC messages are added in the middle
a release, e.g. SystemInformationBlockType1_v1310_IEs_t defined in RRC 13.1.0
and RRC 9.2.0 made some changes to SIB12 and SIB13 so we have sib12_v920 and
sib13_v920 fields in SIB12 and SIB13's struct.
We need a finer grain of control when using ASN1 from different RRC version.
4. S1AP also has this problem that it use UPDATE_RELEASE_9 and UPDATE_RELEASE_10 to
differentiate between various S1AP version.
This commit propose using MAKE_VERSION(x,y,z) to designate the version number and
modify current conditional compilation accordingly.
Note: 2018/04/16, Modified based on Cedric's comment.
2018-04-16 12:32:29 +02:00
Raymond Knopp
8b1416b862
debugging of new directory structure, file renaming, and eNB/UE splitting. dlsim/ulsim functional.
2018-04-09 15:32:49 -07:00
Raymond Knopp
be816fab6f
Merge branch 'develop' into RU-RAU-split-parallel-EMUFH-phy-test-merge
2018-04-06 15:12:46 +02:00
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
Raymond Knopp
8d90eda600
bug fix after merge
2018-03-14 16:21:51 +01:00
Raymond Knopp
b2cc1252c6
Merge remote-tracking branch 'origin/develop' into RU-RAU-split-parallel-EMUFH-phy-test-merge
...
Conflicts:
cmake_targets/build_oai
common/utils/itti/intertask_interface.c
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/PHY/defs.h
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/ENB_APP/enb_paramdef.h
openair2/LAYER2/MAC/defs.h
openair2/LAYER2/MAC/eNB_scheduler.c
targets/ARCH/COMMON/common_lib.c
targets/COMMON/create_tasks.c
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-softmodem.h
2018-03-12 12:10:48 +01:00
Raymond Knopp
4d71261cb9
Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/INIT/lte_init_ru.c
openair1/PHY/defs.h
openair2/ENB_APP/enb_paramdef.h
targets/RT/USER/lte-ru.c
2018-03-11 08:45:09 +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
Wu Jing
8a89a16fde
fix issue about att_rx and att_tx config
2018-03-08 12:01:43 +09: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
khadraou
de5e5beee1
Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement
2018-02-22 17:11:44 +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
Wu Jing
c641f334bb
fix total usable RBs when pucch rb=6
2018-02-12 18:38:26 +09: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
Younes
785a435fe0
bugfix in configuring ru from file, at_rx was set to att_tx
2018-02-02 10:53:22 +01:00
Wu Jing
ba8a111ea1
merge the latest develop branch into issue289
2018-02-01 19:25:29 +09: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