Raymond Knopp
55ed97ebfa
correction to include file name.
2018-11-19 12:53:20 +01:00
Raymond Knopp
7474b69c29
added missing files. updates for testing in eMTC configuration after merge.
2018-11-19 09:26:03 +01:00
Raymond Knopp
6266d5c389
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
...
Conflicts:
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/edci.c
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/LTE_TRANSPORT/transport_eNB.h
openair1/SCHED/fapi_l1.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/COMMON/rrc_messages_types.h
openair2/ENB_APP/enb_config.c
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_bch.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/mac.h
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/rrc_defs.h
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB_S1AP.c
2018-11-19 00:43:49 +01:00
Raymond Knopp
246ee327fb
rework of configuration for eMTC/Sidelink. Removal of warnings introduced by eMTC code. Validation of configuration component for eMTC and regular LTE. Sidelink is still not configured.
2018-11-18 20:17:18 +01:00
Raymond Knopp
f8d7ce3276
regular LTE functional (simulation)
2018-11-07 00:37:40 +01:00
Raymond Knopp
374d00d857
removal of warnings during configuration
2018-11-04 00:03:44 +01:00
Raymond Knopp
b27ed63fa9
lte-softmodem compiles, many memory faults during configuration ...
2018-11-03 22:51:24 +01:00
Raymond Knopp
d24f521a5a
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
...
Conflicts:
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
openair1/PHY/LTE_TRANSPORT/edci.c
openair1/PHY/LTE_TRANSPORT/if4_tools.c
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/LTE_TRANSPORT/print_stats.c
openair1/PHY/LTE_TRANSPORT/pucch.c
openair1/PHY/LTE_TRANSPORT/transport_eNB.h
openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
openair1/PHY/impl_defs_lte.h
openair1/SCHED/fapi_l1.c
openair1/SCHED/phy_procedures_lte_eNb.c
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/defs.h
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_bch.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/pre_processor.c
openair2/LAYER2/MAC/rar_tools.c
openair2/LAYER2/MAC/ue_procedures.c
openair2/PHY_INTERFACE/IF_Module.c
openair2/RRC/LITE/rrc_common.c
openair2/RRC/LTE/L2_interface_ue.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/rrc_eNB.c
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ru.c
2018-10-29 07:54:17 +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
Florian Kaltenberger
3547d525f4
Merge remote-tracking branch 'origin/develop' into 352-support-for-n300
2018-09-29 12:09:51 -07: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
Florian Kaltenberger
84d04b3cd5
new interpretation of sdr_addrs string in RU config file: this is now directly passed to the uhd to specify a device. It may contain a device type (i.e., "type=x300") or an IP address (i.e., "addr=192.168.10.2")
2018-09-28 00:11:35 -07: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
Cedric Roux
73da898f9b
integration fix: fix bad merge conflict resolution + fix compilation error
2018-09-07 16:57:55 +02:00
Cedric Roux
afb2fd4012
Merge remote-tracking branch 'origin/x2' into develop_integration_2018_w36
2018-09-07 16:15:13 +02:00
Cedric Roux
2cb87ddd02
Merge remote-tracking branch 'origin/feature-slice+restart-w35' into develop_integration_2018_w36
...
Conflicts:
openair2/ENB_APP/flexran_agent_common_internal.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
2018-09-07 16:13:40 +02:00
Konstantinos Alexandris
938e0242e2
Merge remote-tracking branch 'origin/develop' into x2
...
Conflicts:
cmake_targets/CMakeLists.txt
openair2/ENB_APP/enb_app.c
openair2/X2AP/x2ap_common.h
2018-09-07 15:30:49 +02:00
Konstantinos Alexandris
1729b3dc66
X2AP: init funcs (register/association) + handler/management functions
...
SCTP: one to many sockets implementation
2018-09-06 15:49:59 +02:00
laurent
46231a5d5d
merge with latest develop
2018-09-06 09:43:26 +02:00
laurent
abbffef015
fix some exit situations, that was badly done by SIGUSR1 handler
2018-09-05 17:03:19 +02:00
Robert Schmidt
70e1841bb1
Fix: RAN API: remove_ul_slice() frees ul sched_name pointer, when sched_name set, free it when resetting
2018-09-05 14:21:39 +02:00
Robert Schmidt
cbc78cd3db
Don't warn of ignoring sorting
2018-09-05 14:21:39 +02:00
Robert Schmidt
fa27b6dcce
Fix: Correct numbering of protobuf messages (as in RTC)
2018-09-05 14:21:39 +02:00
Robert Schmidt
972f52fd56
fix remove LOG_N in restart
2018-09-03 18:10:28 +02:00
Robert Schmidt
08b122e3ff
FlexRAN: update slice config array dimensions
2018-09-03 18:10:28 +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
cca5c1b71a
FlexRAN: use correct identifiers for PDCP, RRC
...
* give the correct UE_id instead an index of the protobuf message (they can
diverge from each other)
* in the PDCP part of the RAN API, the RAN API has to make the conversion UE_id
(MAC) to UID (PDCP)
* a follow up commit could clean up the interfaces:
- the MAC functions take the UE_id
- the RRC functions take the RNTI
- the PDCP functions take the UID
this would mean the caller has to find those ID but would decrease
computations since the RAN API functions do not have to do that themselves
2018-09-03 18:10:28 +02:00
Robert Schmidt
3b80c73f93
FlexRAN: Loop over UEs using UE_id, not index
2018-09-03 18:10:28 +02:00
Robert Schmidt
9399bed23a
FlexRAN MAC: align allocated memory for lfds
2018-09-03 18:10:28 +02:00
Robert Schmidt
0bb6a19f71
only initialize RC.mac once
2018-09-03 18:10:28 +02:00
Robert Schmidt
62957b97d8
bugfix FlexRAN: only write to file if file is not null
2018-09-03 18:10:28 +02:00
Robert Schmidt
604ec25a68
improve soft-restarting messages
2018-09-03 18:10:28 +02:00
Robert Schmidt
917b9ca0c2
correct ITTI task name
2018-09-03 18:10:28 +02:00
Robert Schmidt
c4077f3cf7
cell reconfiguration/restart: take protobuf, perform in ENB_APP
...
* instead of the lengthy YAML parsing, can now handle protobuf message
* after setting the parameters, send a message to ENB_APP to perform it
* old YAML way still works
2018-09-03 18:10:28 +02:00
Robert Schmidt
ef0d86564c
when sending config report, copy slice config to new mem
2018-09-03 18:10:28 +02:00