Commit Graph
254 Commits
Author SHA1 Message Date
Raymond Knopp 97cd210514 Merge remote-tracking branch 'origin/develop-nr' into nr_prach
Conflicts:
	cmake_targets/build_oai
	executables/nr-gnb.c
	openair1/PHY/INIT/nr_init.c
	openair1/PHY/defs_gNB.h
	openair1/SCHED_NR/fapi_nr_l1.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
	openair2/RRC/NR/rrc_gNB.c
2019-06-03 14:31:32 +02:00
Raymond Knopp 1f228ee4d1 - reworked configuration file and configuration for gNB (write directly to ASN1 structure from config module instead of passing intermediate structures)
- added prach procedures for gNB with configuration of PRACH L1/L2 parameters
2019-06-02 23:40:57 +02:00
Raymond Knopp da9b879112 Merge remote-tracking branch 'origin/develop-nr' into develop-nr-less-logging
Conflicts:
	openair1/SCHED_NR/sched_nr.h
2019-05-18 15:49:13 +02:00
Francesco Mani a5025d4c4f SSB positions in burst from config file 2019-02-21 15:30:09 +01:00
Raymond Knopp 81c1e1b309 tested with slot-based processing for 40 and 80 MHz channels 2018-12-30 00:32:57 +01:00
Florian Kaltenberger 83e9908adb merging develop with develop-nr 2018-10-25 03:15:09 -07: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 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
Robert Schmidt 81e70dfc25 NAS First REQ: Forward selected PLMN Identity 2018-09-28 11:46:06 +02:00
Robert Schmidt 77b9ad2bfc Change type S1AP REG REQ: Pass Broadcast PLMN index for MME selection 2018-09-28 11:45:56 +02:00
Robert Schmidt 72ef8be88e Change types in S1AP Register REQ: list of MCC/MNC/TAC 2018-09-22 22:52:11 +02:00
Robert Schmidt d85054c214 Change types in RRC: list of MCC/MNC/TAC 2018-09-22 22:51:48 +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
laurent d8472426c4 fix_issue_350_gtpu_init 2018-09-20 12:37:26 +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 2b85c4a3a6 Pass multi socket descriptor in SCTP + add SCTP multi init req/resp mechanism 2018-09-07 15:15:41 +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 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
Niccolò Iardella 9efd5d6f27 Inter/intra-slice sharing are now optional 2018-09-03 18:10:28 +02:00
Niccolò Iardella 8d9a8ab59a Add UE sorting on LCID priority 2018-09-03 18:10:28 +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 40942e34a0 Initial commit on X2AP (add target eNBs as input) 2018-08-22 15:32:22 +02:00
WEI-TAI CHEN 4dd74fbd9c Upata the loss config 2018-08-08 16:15:40 -07:00
laurent 4c475c429b first commit new itti 2018-08-06 16:52:27 +02:00
WEI-TAI CHEN 9b7143ca86 merge develop 2018-08-05 06:19:32 -07:00
WEI-TAI CHEN 09c00b291b merge develop-nr 2018-08-03 03:33:28 -07:00
WEI-TAI CHEN 037e37eab4 do_SERVINGCELLCONFIGCOMMON will be reuse for fill common config 2018-08-03 03:29:17 -07:00
WEI-TAI CHEN 307b763b8d -Uppdate RRC ASN1 Version to 38331-f21
But NR-RRC-Definitions.asn file only include the NR-RRC-Definitions DEFINITIONS section
If we include the NR-UE-Variables into asn file, it will can't be compile in asn tool
and also some of implict problem for new version asn file
2018-08-02 06:39:55 -07:00
Calvin HSU bf6744686e UE: Add DL_CONFIG_REQ for PDCCH(DCI) and DLSCH config
clean code
2018-07-24 10:31:45 +02:00
Bi-Ruei, Chiu a247907d3a Use an un-official community collaboration version of asn1c
1. It's no need to modify LTE-RRC's ASN.1 file for enabling option group
   feature in generate_asn1.
2. It's no need to patch the C header files generated from
   LTE-RRC/S1AP/X2AP's ASN.1 in fix_asn1.
3. It's no need to pre-process S1AP/X2AP's ASN.1 for enabling information
   object class feature by asn1tostruct.py.

This commit requires an un-official version of asn1c which are
collaboration of asn1c community members and `build_helper` is modified
in this commit accordingly :

  https://github.com/brchiu/asn1c/tree/velichkov_s1ap_plus_option_group

This asn1c can also convert ASN.1 of 5G NR RRC (38.331, v15.1.0) and
generate C files with -findirect-choice command line option without
tweaking ASN.1 file.

Examples for how to use this asn1c for S1AP are in S1AP files, e.g.
s1ap_eNB_nas_procedures.c and s1ap_eNB_handler.c.

There is an modified openair-cn (based on tag 0.5.0) with this new asn1c at :

  https://github.com/brchiu/openair-cn/tree/new-asn1c

Basic S1AP interaction and data transfer operation between OAI eNB and
this modified openair-cn has been tested.

Note: Community version of asn1c is keeping evolved to provide better usage.
2018-07-13 10:04:46 +08:00
Bi-Ruei, Chiu df1e5b21c8 Change 'RRC/LITE' to 'RRC/LTE' 2018-07-12 15:33:31 +08:00
WEI-TAI CHEN 26d61373ba gNB_scheduler in testing not complete yet 2018-07-10 01:35:39 -07:00
Haruki NAOI 76282a84b8 fix: nb_rbs is not correctly pass to per-prosessor when fairRR scheduler is used. 2018-06-26 15:23:15 +09:00
Cedric Roux d579a74e54 Merge remote-tracking branch 'origin/migrate_rel10_rel14_to_make_version' into develop 2018-06-18 16:25:39 +02:00
WEI-TAI CHEN 73cfa6bbb6 - Maintain The Configuration Module
- Create task for GAB_APP and GAN_RRC
- Create the NR FAPI for P5 interface
- *It could be build, but still have a lot of warning need to maintain
2018-06-14 06:02:26 -07: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
WEI-TAI CHEN 5b94aeac77 Merge nr_initialsync 2018-05-29 03:13:08 -07:00
Bi-Ruei, Chiu f097cca7a5 Compare RRC_VERSION with MAKE_VERSION(x,y,z) macro to provide better SW configuration
To minimize migration effort, we follow the logic of legacy macro Rel10 and Rel14 used
for conditional compilation of current code.

In the future, they might be changed to accommodate finer software configuration, e.g.
MAKE_VERSION(12,2,0) or MAKE_VERSION(13,1,0) .... etc.
2018-05-29 18:00:58 +08:00
WEI-TAI CHEN e9ce528ed7 Modified and fixed common config 2018-05-28 04:52:39 -07:00
WEI-TAI CHEN 6c1c711e08 1. NR gNB Application use ITTI transmit config. to RRC
2.NR RRC do_SERVINGCELLCONFIGCOMMON for all of common config. will be transmit to lower layer by rrc_mac_config_req_gNB"
2018-05-18 08:00:30 -07:00
Masayuki HARADA 677ad4298c Devide source file of scheduler 2018-05-17 10:48:39 +09:00
Cedric Roux 343bbbac68 Merge remote-tracking branch 'origin/feature-better-sw-configuration-between-various-version' into develop_integration_2018_w19
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/print_stats.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/sched_common.h
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/LAYER2/MAC/mac.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
	openair2/LAYER2/PDCP_v10.1.0/pdcp.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
	openair2/LAYER2/RLC/rlc.c
	openair2/PHY_INTERFACE/defs.h
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.h
	openair2/RRC/LTE/rrc_UE.c
	openair2/RRC/LTE/rrc_eNB.c
	targets/SIMU/USER/oaisim_functions.c
2018-05-15 17:43:12 +02:00
Cedric Roux a42e2de0e0 Merge remote-tracking branch 'origin/bugfix-add-error-indication-handling' into develop_integration_2018_w19 2018-05-15 15:23:00 +02:00
Masayuki HARADA de1996ec3e change compile option from UE_EXPANSION to UE_EXPANSION,PHY_TX_THREAD,PRE_SCD_THREAD. 2018-05-15 17:37:43 +09:00
Cedric Roux 68479fa4f8 Merge remote-tracking branch 'origin/develop-uedirectorysplit' into develop_integration_2018_w19
Status so far:
- monolithic eNB compiles and is functional with 1 UE in FDD, 5/10/20MHz.
  For 20MHz we don't have a nice TCP downlink (on haswell).
- oaisim does not compile
- UE does not compile
- phy simulators don't compile
- many new warnings

Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/LTE_TRANSPORT/transport_eNB.h
	openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
	openair1/PHY/defs_eNB.h
	openair1/SCHED/pusch_pc.c
	openair1/SCHED/sched_common.h
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_mch.c
	openair2/LAYER2/MAC/mac.h
	openair2/LAYER2/MAC/ra_procedures.c
	openair2/LAYER2/MAC/ue_procedures.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.h
	openair2/RRC/LTE/rrc_UE.c
	openair2/RRC/LTE/rrc_defs.h
	targets/RT/USER/lte-softmodem.h
	targets/RT/USER/lte-ue.c
2018-05-14 16:28:04 +02:00
Wu Jing 7807e677e7 fix RM902 base on sp3_master 2018-05-10 11:53:06 +09:00