Wang Tsu-Han
f88a43ca60
fixes for getting config by command line
2018-11-29 16:11:58 +01:00
Raphael Defosseux
f8ccd284a0
Merge remote-tracking branch 'origin/develop' into 374-missing-rrc-inactivity-timer-missing-default-drx-ie-in-s1-setup-ue-s1-id-unknown-after-detach-for-switch-off
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2018-11-23 14:10:50 +01:00
Louis Adrien Dufrene
ed61d774f6
add test on ue_context
2018-11-21 17:03:52 +01:00
Louis Adrien Dufrene
e77d910398
Macro removed in enb_config.c, but rrc timer thresh still set to 0 (deactivated)
2018-11-21 13:26:12 +01:00
Louis Adrien Dufrene
cf07c4d394
astyle applied
2018-11-20 16:39:05 +01:00
Louis Adrien Dufrene
d082b50896
add MACRO for timer threshold
2018-11-20 16:19:37 +01:00
OAI-admin
1094835db1
RRC timer fixed and tested
2018-11-20 15:07:43 +01:00
Louis Adrien Dufrene
c194956da3
RRC timer thres removed from UE context and added to eNB RRC context, value 0 of thres equivalent to infinity
2018-11-20 14:15:50 +01:00
Louis Adrien Dufrene
bfb65b57f7
astyle applied
2018-11-16 11:36:44 +01:00
Louis Adrien Dufrene
700437f184
astyle applied
2018-11-16 08:49:28 +01:00
Louis Adrien Dufrene
a409614185
Merge develop done, conflicts resolved
2018-11-13 10:49:20 +01:00
Louis Adrien Dufrene
1c196a9eff
rrc inactivity timer reset in RRC Connection Release generation
2018-11-05 16:48:50 +01:00
frtabu
18ec5d8047
abort execution when an unknown option is passed via the command line: add config_check_cmdlineopt API to config module, create lte-softmodem-common.c source to remove duplicate code in lte-softmodem.c and lte-uesoftmodem.c, fix segfaults in exec_function of lte-uesoftmodem
2018-11-02 18:17:11 +01:00
Louis Adrien Dufrene
1bb53286bb
Bug fixed: S1 setup requst sends the correct default DRX value
2018-11-02 16:23:32 +01:00
Bi-Ruei, Chiu
f58ad3c39f
Add prefix LTE_ to LTE-RRC generated data types by ASN1C_PREFIX=LTE_
...
1. Modify all expressions using original LTE-RRC data types for new generated ones
2. Does not change any program logic
2018-10-17 15:46:12 +08:00
kvyat
c0ae3ce21f
X2: fixing order of calls
...
Signed-off-by: kvyat <kvyat@kvyat.eurecom.fr >
2018-10-12 16:38:18 +02:00
Raphael Defosseux
d254f5b522
Merge branch 'feature-s1-flex' into develop_integration_2018_w_41
...
Introduction of S1-flex. It handles multiple PLMN IDs (up to 6) in the SIB as well as the selection of an MME based on the selected PLMN identity.
Major impact: changes on the eNB configuration files:
tracking_area_code = 1;
plmn_list = (
{ mcc = 208; mnc = 94; mnc_length = 2; },
{ mcc = 208; mnc = 95; mnc_length = 2; }
)
See https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/s1-flex-conf-nnsf for more details.
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2018-10-11 15:57:36 +02:00
Raphael Defosseux
405bb0bba1
CI: astyling for ease of merge
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2018-10-11 15:08:21 +02:00
Raphael Defosseux
7e7acef764
CI: astyling to ease merge
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2018-10-11 15:07:16 +02:00
Raphael Defosseux
bb566eaeb8
Merge remote-tracking branch 'origin/x2' into develop_integration_2018_w39
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2018-09-28 17:00:21 +02:00
Raphael Defosseux
38d09bc733
Merge remote-tracking branch 'origin/parallel-config' into develop_integration_2018_w39
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2018-09-28 16:58:12 +02:00
Robert Schmidt
b1d1d4c834
X2AP configuration: Use more idiomatic AssertFatal than if
2018-09-28 11:46:11 +02:00
Robert Schmidt
b485310ef6
Read X2AP PLMN ID from new configuration file structure
2018-09-28 11:46:11 +02:00
Robert Schmidt
5f4432a351
Read configuration parameter Broadcast PLMN index for MME
2018-09-28 11:45:56 +02:00
Robert Schmidt
3c6d0aed1b
Read PLMN list configuration into RRC/S1AP
2018-09-22 22:52:15 +02:00
Konstantinos Alexandris
67cc97a42c
Merge remote-tracking branch 'origin/develop' into x2
2018-09-21 16:01:52 +02:00
Konstantinos Alexandris
2c27a38dc3
x2ap: implement x2setuprequest, x2setupresponse, x2setupfailure
2018-09-21 15:58:36 +02:00
Wang Tsu-Han
2dc3dfa373
adding parallel config in dlsim and ulsim
2018-09-20 15:17:32 +02:00
laurent
d8472426c4
fix_issue_350_gtpu_init
2018-09-20 12:37:26 +02:00
Wang Tsu-Han
0511ff45dc
adding both configurable at config file and commandline
2018-09-20 12:06:55 +02:00
Wang Tsu-Han
c5cd47f976
fixes for not having parallel config inside the config file
2018-09-12 15:32:44 +02:00
Wang Tsu-Han
3005929bca
modify threading option into config file
2018-09-11 18:50:11 +02:00
Robert Schmidt
204281e3af
change types in RCconfig_flexran(), avoid seg fault
...
the integration of the nfapi-L2-emulator-for-develop (f254107b2 ) added more
types in the RCconfig_flexran(), but they were partially wrong. This commit
fixes those types after the rebase of this branch on top of 2018.w19
2018-09-03 18:10:28 +02:00
Robert Schmidt
0bb6a19f71
only initialize RC.mac once
2018-09-03 18:10:28 +02:00
Cedric Roux
c22180ff31
Merge remote-tracking branch 'origin/issue326_LOGreview' into develop_integration_2018_w35
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/SCHED_UE/phy_procedures_lte_ue.c
openair2/LAYER2/MAC/eNB_scheduler_phytest.c
2018-08-31 12:55:28 +02:00
frtabu
51c86dd49e
fix noS1 build failure
2018-08-24 20:06:02 +02:00
frtabu
24f8fcf346
Use common log mechanism in layer 3, mapping specific macros to common ones and extending common log utilities to support specific layer3 requirements
2018-08-24 17:43:14 +02:00
frtabu
79588a494e
LOG_F replaced by LOG_DUMPMSG. Add a generic function to dump a buffer or message. Go on with LOG_M implementation improvement. Remove redundant options to enable/disable logs.
2018-08-24 17:43:14 +02:00
Konstantinos Alexandris
3b3b971807
minor fixes for x2 + modify conf files
...
The configuration file has now to contain ENB_IPV4_ADDRESS_FOR_X2C and
ENB_PORT_FOR_X2C in the NETWORK_INTERFACES section.
For example:
NETWORK_INTERFACES :
{
ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24";
ENB_INTERFACE_NAME_FOR_S1U = "eth0";
ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24";
ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.12.111/24";
ENB_PORT_FOR_X2C = 36422; # Spec 36422
};
2018-08-23 16:15:14 +02:00
Konstantinos Alexandris
d3edb3a095
Merge remote-tracking branch 'origin/develop' into x2
2018-08-22 16:02:24 +02:00
Konstantinos Alexandris
40942e34a0
Initial commit on X2AP (add target eNBs as input)
2018-08-22 15:32:22 +02:00
Cedric Roux
69338c694b
bugfix: fix array index
...
As reported by Konstantinos Alexandris and Robert Schmidt.
2018-08-17 15:55:04 +02:00
frtabu
30509955c2
remove compilation warnings, especially when disabling T_TRACER. enhance LOG_M macro implementation, introduce LOG_DEBUG_XXX macro to replace #ifdef DEBUG_XXX
2018-07-30 20:07:22 +02:00
frtabu
b85cbddeec
log.c simplification, fix usefull functionality which never worked, move all log code from openair2 to common
2018-07-30 20:07:22 +02:00
matzakos
74d1853ef6
Minor modifications to make nfapi-L2-emulator work again and redundant logs removal.
2018-06-21 17:56:29 +02:00
Cedric Roux
2f639e45b6
Merge remote-tracking branch 'origin/ulSNRs' into develop
...
Conflicts:
openair2/ENB_APP/MACRLC_paramdef.h
openair2/LAYER2/MAC/mac.h
2018-06-18 16:01:25 +02:00
Cedric Roux
437bd9cbe1
minor: cleaner indentation
2018-06-18 11:33:47 +02:00
Cedric Roux
5c6ad3142d
Merge remote-tracking branch 'origin/develop' into mu_with_tdd1
...
The monolithic eNodeB is not fully functional in FDD.
The TDD mode has not been tested.
Do not consider this commit as functional.
Conflicts:
cmake_targets/CMakeLists.txt
cmake_targets/build_oai
common/utils/itti/intertask_interface.c
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c
openair1/PHY/LTE_TRANSPORT/transport_eNB.h
openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
openair1/PHY/defs_eNB.h
openair1/PHY/impl_defs_lte.h
openair1/SCHED/fapi_l1.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/pusch_pc.c
openair2/COMMON/platform_types.h
openair2/COMMON/rrc_messages_types.h
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_paramdef.h
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/flexran_agent_scheduler_dlsch_ue.c
openair2/LAYER2/MAC/mac.h
openair2/LAYER2/MAC/mac_proto.h
openair2/LAYER2/MAC/pre_processor.c
openair2/LAYER2/RLC/rlc.c
openair2/LAYER2/RLC/rlc_rrc.c
openair2/RRC/LITE/rrc_common.c
openair2/RRC/LTE/L2_interface.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/rrc_eNB.c
openair2/UTIL/LOG/log.h
targets/COMMON/openairinterface5g_limits.h
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.h
2018-06-12 16:23:36 +02:00
Rajeev Gangula
c5c66eeb4a
Merge branch 'develop' into ulSNRs
...
Conflicts:
openair2/ENB_APP/enb_config.c
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/mac.h
2018-05-29 09:50:05 +02:00
Cedric Roux
ed49592754
integration fix: remove warnings
...
Remove warnings popping up on:
./build_oai --eNB -w USRP
Maybe not always the best solution.
2018-05-24 17:15:42 +02:00