Raymond Knopp
552bd6979d
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
...
Conflicts:
openair2/RRC/LTE/MESSAGES/asn1_msg.c
2018-11-26 23:01:47 +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
frtabu
d151ce6feb
Add a parameter to load_configmodule API to allow an exec to specify that it may be run with only command line options
2018-11-05 17:28:00 +01:00
frtabu
8dd62b32e3
fix bad build_oai directive to compile libconfig for phy-simulators, fix load_configmodule crash because config source not set.
2018-11-02 18:17:11 +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
Florian Kaltenberger
2811dc7c0d
adding params_libconfig to compilation of phy_simulators
2018-11-02 17:31:54 +01:00
Cedric Roux
9b8e4e4cbe
Merge remote-tracking branch 'origin/update-asn1c-0a7524184f16e7093990a31d8d4db487a16e5782' into develop_integration_2018_w44
2018-11-02 10:31:45 +01:00
Cedric Roux
355f47fb1e
Merge remote-tracking branch 'origin/develop-adding-prefix-to-LTE-RRC' into develop_integration_2018_w44
2018-11-02 10:30:35 +01:00
Cedric Roux
28b0c07df7
Merge remote-tracking branch 'origin/359-dlsim-performance-counters' into develop_integration_2018_w44
2018-11-02 10:30:19 +01:00
Cedric Roux
a7cf0cfa1f
Merge remote-tracking branch 'origin/352-support-for-n300' into develop_integration_2018_w44
2018-11-02 10:30:01 +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
342972c2ea
Update asn1c to commit 0a7524184f16e7093990a31d8d4db487a16e5782
...
Fix the problem that duplicate type names exist in OPEN TYPE.
The following excerpt of ASN.1 of X2AP is one example.
HandoverRequestAcknowledge-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-Old-eNB-UE-X2AP-ID CRITICALITY ignore TYPE UE-X2AP-ID PRESENCE mandatory}|
{ ID id-New-eNB-UE-X2AP-ID CRITICALITY ignore TYPE UE-X2AP-ID PRESENCE mandatory}|
...
}
2018-10-25 10:59:13 +08: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
laurent
97ac780972
fix test case options style for getopts_long()
2018-10-15 10:39:28 +02:00
laurent
bd1c609ca8
issue 359 dlsim CPU measurements
2018-10-12 18:17:57 +02:00
Raphael Defosseux
2903473e29
Merge remote-tracking branch 'origin/update-asn1c-d3aed06bb2bec7df1b5c6d0333f8c7dfc5993372' into develop_integration_2018_w_41
2018-10-11 16:11:21 +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
Florian Kaltenberger
7240604115
changing default uhd version when installing from source
...
this is the one that also works with the n310
2018-10-11 06:05:59 -07:00
Bi-Ruei, Chiu
5eceff9ff0
Update asn1c to commit d3aed06bb2bec7df1b5c6d0333f8c7dfc5993372
...
1. Fix the problem of compiling NR_RangeToBestCell.c of NR-RRC 15.3.0
2. Fix the problem that default OCTET/BIT STRING value not used in APER
3. Add support of extension group inside CHOICE type used in LTE-RRC 15.3.0
4. Fix the problem that NGAP 15.0.0 ASN.1 can not generate C files
2018-10-09 09:18:27 +08:00
laurent
f7b69a7b93
manual merge because conflict
2018-10-03 19:56:29 +02:00
laurent
64959754f4
changed CI for ulsim and fixed one bug in ulsim options parsing
2018-10-03 19:49:54 +02:00
Robert Schmidt
ee048120c4
Change remaining config files to plmn_list style
2018-09-28 17:40:37 +02:00
laurent
3dbd596448
after testing
2018-09-27 15:09:59 +02:00
laurent
dd4f1ab73c
coarse gain cleaning
2018-09-27 14:13:52 +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
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
Cedric Roux
20797a52f8
Merge remote-tracking branch 'origin/generate_sss_tables' into develop_integration_2018_w36
...
Conflicts:
openair1/PHY/INIT/init_top.c
2018-09-07 16:01:58 +02:00
Cedric Roux
9051a0ec45
Merge branch 'recode_itti_from_scratch' into develop_integration_2018_w36
...
Note: we don't include the last commit from origin/recode_itti_from_scratch
because it is just astyle formatting. As of today we don't enforce
astyle and including this work would lead to future merge conflicts.
A proper process to enforce astyle has to be put in place. In the
meantime, no astyle allowed in commits if the changes are too big
and not relevant to work done.
2018-09-07 15:57:13 +02:00
Cedric Roux
8b4d303375
Merge remote-tracking branch 'origin/generate_75KHz_tables' into develop
2018-09-07 15:53:26 +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
Robert Schmidt
21f6609472
FlexRAN: move slice param verification to agent
...
- until now, on every iteration, the scheduler checked for changed parameter
(and verified some)
- this functionality moves to the FlexRAN Agent, which verifies all parameters
* individually, e.g. Max MCS <= 28 for DL
* group-based, e.g. the sum of slice percentages is <= 100
- slice configuration changes are only applied if all verifications pass
- it is assumed in the scheduler, that configuration passed from outside is
correct and can be used "as-is"
fix accounting setting
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
laurent
cea4ef5372
generate sss tables
2018-08-31 11:47:53 +02:00
laurent
4221816f5e
generate 7.5KHz tables
2018-08-31 10:46:36 +02:00
frtabu
77f70e77ea
MSC logging utility as a config option
2018-08-24 17:43:14 +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
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
dfee206027
Merge remote-tracking branch 'origin/fix_missing_s1ap_15.2.0_asn_module_and_update_asn1c_commit' into develop_integration_2018_w33
2018-08-17 15:38:55 +02:00
Cedric Roux
d4a8b5f35e
compilation warning "jobserver unavailable" removal
...
This commit removes the warning:
make[4]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule.
Basically, inside a Makefile we should use $(MAKE) instead of make.
2018-08-17 12:25:13 +02:00
Cedric Roux
55ba99ac62
T: check consistency of T_messages.txt with VCD functions and variables traces
...
Since VCD has now to go through the T tracer, we enforce the consistency
of data found in common/utils/LOG/vcd_signal_dumper.[ch] with data
found in common/utils/T/T_messages.txt.
We might get completely rid of common/utils/LOG/vcd_signal_dumper.[ch] at some
point. For the moment, let's keep it.
This commit adds the program common/utils/T/check_vcd.c and necessary
modifications to enforce its use at compilation time.
If you modify common/utils/LOG/vcd_signal_dumper.[ch] but do not update
common/utils/T/T_messages.txt an error will pop up when you compile the
software. You have to keep both modules synchronized.
2018-08-17 12:24:39 +02:00
Bi-Ruei, Chiu
6562577e96
Update asn1c commit with two new fixes
2018-08-16 16:36:41 +08:00
laurent
1603e99d7e
fix other targets after CI trial
2018-08-06 17:54:34 +02:00
laurent
4c475c429b
first commit new itti
2018-08-06 16:52:27 +02:00