Robert Schmidt
6bd69d6eaa
Leave OER support in asn1c enabled
...
OER can be disable with the switch -DASN_DISABLE_OER_SUPPORT. In F1AP,
disabling OER leads to a typedef void a_type; leading to lots of compilation
errors because of illegal void variable declarations. This commit leaves OER
support enabled, avoiding this error.
2018-11-07 16:13:03 +01:00
Robert Schmidt
397d2f4815
Merge commit 'develop' into feature-127-protocol-split
...
* remove a lot of white spaces
* many conflicts in enb_config.c
2018-11-07 16:07:59 +01:00
Robert Schmidt
c81535a8b0
Add FlexRAN PHY CM
2018-11-07 10:40:17 +01: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
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
Raymond Knopp
4cdc01384d
Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split
...
Conflicts:
cmake_targets/tools/build_helper
2018-09-20 16:25:05 -04:00
Raymond Knopp
05c7681b5a
cu machine @ RH
2018-09-20 16:23:35 -04:00
Raymond Knopp
5a8622960e
partial removal of warning
2018-09-20 16:13:59 -04:00
Robert Schmidt
d94ae11fe0
Add test programs to verify F1U
2018-09-20 15:03:47 +02:00
Bing-Kai Hong
f7f7daf715
Restore some template files for CMake
2018-09-16 22:02:33 +08:00
Raymond Knopp
fc6afc8116
simulation up to CCCH reception in DU is functional
2018-09-15 13:59:11 +02:00
Bing-Kai Hong
f736213d09
Update F1AP new code structure to closer implementing all the procedures
2018-09-13 16:25:51 +02:00
Wolfgang A. Mozart
f1253ee7e9
UE compiles now
2018-09-12 08:34:24 +02:00
Bing-Kai Hong
9f098a3461
Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
2018-09-10 15:33:03 +02:00
Bing-Kai Hong
ab412cb39d
Normalization of the file names for CU and DU
2018-09-10 13:39:48 +02:00
Robert Schmidt
5a74b790a2
Restructure code, CMakeLists fixes
...
- move the configuration reading code before task creation
- fix CMakeLists.txt so that lte-softmodem-nos1 compiles
2018-09-08 18:55:30 +02:00
Robert Schmidt
a1439effe3
Revert "Restructure create_tasks(): start tasks depending on RAN type, is read in RCconfig_RRC()"
...
This reverts commit 87093e1b55 .
2018-09-08 15:21:47 +02:00
Bing-Kai Hong
5105766ec5
Remove unwanted files and function for sctp and f1 unit test
2018-09-07 19:14:12 +02:00
Bing-Kai Hong
021d7abf8a
Create the F1 pingpong procedure with SCTP
2018-09-07 19:04:45 +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
Robert Schmidt
2e453eff69
move F1AP_get_next_transaction_identifier() to f1ap_common.c
2018-09-07 12:17:03 +02:00
Robert Schmidt
54aa295eb4
Use f1ap_encoder.c file for F1AP encoding functionality
2018-09-07 12:15:35 +02:00
Robert Schmidt
87093e1b55
Restructure create_tasks(): start tasks depending on RAN type, is read in RCconfig_RRC()
2018-09-06 18:12:47 +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
Bing-Kai Hong
cdfca6c00a
F1:
...
1.create the f1ap handlers procedure
2.hide asn1c warning when in compile
2018-09-05 11:14:35 +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
Bing-Kai Hong
3021cf114d
F1 & MAC:
...
1. Fix UE_CONTEXT_SETUP_REQUEST and CONTEXT_MODIFICATION_REQUEST encode/decode
2. Add gNB_DU_CONFIGURATION_UPDATE and gNB_CU_CONFIGURATION_UPDATE procedure
3. Add C_RNTI_TO_BIT_STRING function
4. Add INITIAL_UL_RRC_MESSAGE_TRANSFER procedure and with mac_du_data_ind (MSG3)
5. Add GNB-CUSystemInformation extension part for the F1SetupResponse procedure
2018-08-31 15:55:42 +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
Bing-Kai Hong
b797dafdc6
1.Update the F1 messages with F1AP spec R15.2.1 and build scripts for proper generation of F1 messages
...
2.Add SCTP procedure (without ITTI) with F1AP
3.Add F1AP test code
2018-08-28 15:05:05 +02:00
Calvin HSU
b58ef54608
Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
2018-08-28 12:22:59 +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