Commit Graph
895 Commits
Author SHA1 Message Date
Robert Schmidt 1f590efe2b Merge branch 'develop' into feature-127-protocol-split 2019-03-19 14:49:07 +01:00
Raphael Defosseux 872a99fbec Merge remote-tracking branch 'origin/eMTC-testing' into develop_integration_2019_w11 2019-03-14 21:48:02 +01:00
Robert Schmidt 62d9b8cf36 Merge branch 'develop' into feature-127-protocol-split 2019-03-14 13:10:21 +01:00
Cedric Roux 9456fe584a x2ap: timers, cleanup
This commit introduces X2AP timers (t_reloc_prep, tx2_reloc_overall).
You need to set the values in the configuration file.

X2AP can be enabled or disabled in the configuration file too (disabled
by default).

Some deadcode was removed.
2019-03-13 15:28:37 +01:00
Raphael Defosseux d8e16e37a5 Merge remote-tracking branch 'origin/develop' into eMTC-testing
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2019-03-13 14:17:24 +01:00
Robert Schmidt e3bb3ab7d3 Change integer based conf parameter from string 2019-03-05 18:27:54 +01:00
Robert Schmidt 1e3d0c9a16 Update F1 CU/DU configuration (tested, formatted) 2019-02-27 15:31:52 +01:00
nepes d74f2da9a8 changes to configuration file for eMTC (pucch parameters) 2019-02-25 17:54:44 +01:00
Robert Schmidt 030e11ba9a Merge branch 'develop' into feature-127-protocol-split 2019-02-21 20:18:35 +01:00
Raymond Knopp e704e7ccc0 Merge remote-tracking branch 'origin/develop' into enhancement-ltem 2019-02-07 23:58:17 +01:00
matzakos eb92fa917b Fixed eNB threading issues creating problems for nfapi emulator. 2019-01-17 15:29:15 +01:00
Cedric Roux aea6b4b5a6 fix a lot of file mode
For whatever reason most of the files had their permission
changed from 644 to 755, which is not wanted.
2019-01-07 16:22:28 +01:00
Raymond Knopp 44a225c6b7 Merge remote-tracking branch 'origin/develop' into enhancement-ltem
Conflicts:
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	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/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/LAYER2/MAC/mac.h
	openair2/RRC/LTE/L2_interface.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.h
	openair2/RRC/LTE/rrc_eNB.c
	openair2/RRC/LTE/rrc_eNB_S1AP.c
	targets/RT/USER/lte-enb.c
2019-01-05 23:28:31 +01:00
Raphael Defosseux ee9f8d8fa7 Merge remote-tracking branch 'origin/iris_hw_new' into develop_integration_2018_w51 2018-12-18 14:44:50 +01:00
rdoost 6c41b6d77a parametrized gains 2018-12-17 20:24:14 -06:00
Clayton Shepard 5832204fe1 Added Iris hardware support.
Signed-off-by: Rahman Doost <doost@rice.edu>
2018-12-05 09:47:15 -06:00
Wang Tsu-Han 1c025c2dfa Merge branch 'develop' into L1_renaming
Conflicts:
	common/utils/LOG/log.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
2018-11-30 14:52:56 +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
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
Raymond Knopp f8d7ce3276 regular LTE functional (simulation) 2018-11-07 00:37:40 +01:00
Wang Tsu-Han 2c5e5c7a0c print removel and config file chenge back to one RU 2018-11-05 18:41:04 +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
Wang Tsu-Han 1d24208370 bug fix for RU_mask_tx 2018-10-26 17:33:46 +02:00
Wang Tsu-Han 265f110691 using mask for ru_thread_tx 2018-10-26 16:49:50 +02:00
Raymond Knopp 506edcaec2 lowered debug level for RF simulator 2018-10-20 09:16:24 +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
Robert Schmidt ee048120c4 Change remaining config files to plmn_list style 2018-09-28 17:40:37 +02:00
Robert Schmidt f1cc914d4e Change configuration to match new format 2018-09-28 11:46:11 +02:00
Raymond Knopp 1e5f95cd95 fixes for monolithic case. Still doesn't work to RRCConnectionSetup, context allocation problem. 2018-09-21 17:23:08 +02:00
Raymond Knopp 5a8622960e partial removal of warning 2018-09-20 16:13:59 -04:00
Raymond Knopp 825c33df1b handling of nr_cellid and creation of context upon CCCH transmission.
Connection goes until generation of RRCConnectionSetup in CU which crashes (it calls rrc_mac_config_req. For DU this should be replaced with filling DL_RRC_MESSAGE_TRANSFER
2018-09-16 23:07:14 +02:00
Raymond Knopp d670138b69 fixes for SIB2/3 handling in DU 2018-09-15 12:57:17 +02:00
Wang Tsu-Han d7fd3013a1 config file adding parallel configuration 2018-09-12 10:49:57 +02:00
Wang Tsu-Han 3005929bca modify threading option into config file 2018-09-11 18:50:11 +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
Raymond Knopp 32a39e9a67 CU configuration modifications 2018-09-05 22:28:56 +02:00
Raymond Knopp 3e987bc143 update of cu configuration file 2018-09-05 11:53:08 +02:00
Raymond Knopp b584ddeda8 added configuration files for cu/du, ngran_types.h 2018-09-04 09:36:01 +02:00
Calvin HSU b58ef54608 Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split 2018-08-28 12:22:59 +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
Wang Tsu-Han d45fcd6fc2 Merge branch 'develop' into parallel-phy-test-EMUFH
Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/PHY/LTE_UE_TRANSPORT/get_pmi.c
	openair2/LAYER2/MAC/eNB_scheduler_phytest.c
	openair3/S1AP/MESSAGES/ASN1/R8/s1ap-8.10.0.asn1
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/rfsim.h
2018-07-30 11:42:34 +02:00
Wang Tsu-Han aa00a4734a reset for remerging 2018-07-30 11:24:08 +02:00
Raymond Knopp 230acb9e88 fixes to ulsim/dlsim and system simulator after merge 2018-07-06 07:42:57 +02:00
Raymond Knopp 934373e1d9 bugfix in dci_tools_ue.c (check_format1_1a_coherency issue) 2018-06-29 15:31:23 -07:00
Raymond Knopp 5a808cb1ca Merge branch 'develop' into enhancement-rfsim
Conflicts:
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/RRC/LTE/rrc_UE.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-uesoftmodem.c
2018-06-28 14:54:15 -07:00
Raymond Knopp ecfad451d8 added sample TDD configuration files 2018-06-28 14:45:50 -07:00
Raymond Knopp 27892e0935 Merge remote-tracking branch 'origin/develop' into enhancement-rfsim
Conflicts:
	cmake_targets/build_oai
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c
2018-06-28 14:44:47 -07:00
Cedric Roux d789166d4c hotfix: disable phy_test_mode in default configuration file 2018-06-26 10:49:22 +02:00
Cedric Roux 45cf2e1b8b set pucch_n1_AN to 0
Same idea as commit cce51f69bc.
2018-06-19 11:33:57 +02:00
Cedric Roux 0c445bedda Merge remote-tracking branch 'origin/bugfix-310-IQrecplay' into develop 2018-06-18 16:25:48 +02:00