maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,377 Commits 5 Branches 0 Tags
ad5a3e8d9475d92d22c19ecea86f86d0d85ec5a8
Commit Graph
4713 Commits
Author SHA1 Message Date
Melissa Elkadi ecaa20ed14 Re-do fix for merge issues 2021-02-15 15:08:46 -08:00
Melissa Elkadi bc524ea192 Minor fixes and new definitions for build success 2021-02-15 09:00:22 -08:00
Cedric Roux 73f3a458cf NSA: finalize nea2 security for gNB 
- a new section in the configuration file to select security algorithms,
  with new code to deal with it
- cleanup CG-ConfigInfo: specs seem to indicate that we must not
  add mcg_RB_Config; the gNB has to deal with that
- as a consequence, modify fill_default_rbconfig() that is called in
  every cases and needs security and bearer parameters

The new section in the configuration file looks like:

    security = {
      # preferred ciphering algorithms
      # the first one of the list that an UE supports in chosen
      # valid values: nea0, nea1, nea2, nea3
      ciphering_algorithms = ( "nea0", "nea2" );

      # preferred integrity algorithms
      # the first one of the list that an UE supports in chosen
      # valid values: nia0, nia1, nia2, nia3
      integrity_algorithms = ( "nia0" );
    };
 2021-02-15 15:25:52 +01:00
Laurent Thomas abfa103247 fix re-reading and end marker code 2021-02-15 10:54:35 +01:00
Raymond Knopp 5b865df202 fixed for oairu target after merge with develop 2021-02-14 14:05:16 +01:00
Raymond Knopp 5ed79a27de Merge remote-tracking branch 'origin/develop' into oairu 2021-02-14 07:18:13 +01:00
Raymond Knopp a446eb0ebc Merge branch 'episys/master' into episys-merge 
Conflicts:
	common/utils/LOG/log.h
	common/utils/ocp_itti/intertask_interface.cpp
	nfapi/oai_integration/nfapi_vnf.c
	nfapi/open-nFAPI/nfapi/src/nfapi.c
	openair2/LAYER2/MAC/main_ue.c
	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
	openair2/PHY_INTERFACE/phy_stub_UE.c
	openair2/RRC/LTE/rrc_UE.c
	openair2/RRC/LTE/rrc_eNB.c
	openair3/NAS/UE/ESM/esm_ebr_context.c
	targets/COMMON/openairinterface5g_limits.h
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c
 2021-02-13 22:52:33 +01:00
Thomas Schlichter d2f353acf6 Merge remote-tracking branch 'develop' into NR_DL_MIMO 2021-02-12 15:33:51 +01:00
Mahesh f69af6abaf merge MR978 (5G nFAPI) into develop 2021-02-12 16:26:22 +05:30
rmagueta 7011b04b75 Code clean up and minor correction in RA for SA 2021-02-12 00:24:31 +00:00
Mahesh eb19e02cf3 Merging MR978 with develop 2021-02-11 22:50:25 +05:30
francescomani cb296fa050 Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO 2021-02-11 18:15:12 +01:00
Raymond Knopp a30eabbe21 OTA testing 4G, configuration parameters for fairRR scheduler and common parameters for both fairRR and default 2021-02-11 13:43:25 +01:00
rmagueta c5ab33ffd9 Merge remote-tracking branch 'origin/develop' into develop-SA-RA 
# Conflicts:
#	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
 2021-02-11 12:27:06 +00:00
Laurent Thomas c93482c4c6 trivial merge with develop" 2021-02-11 13:27:00 +01:00
Laurent Thomas b3e21ad87b only a printf 2021-02-10 17:58:10 +01:00
Laurent Thomas 2c5bd9fa8c improve rfsim 2021-02-10 17:49:14 +01:00
Raymond Knopp 37ef411c2e traces for fairRR scheduler 2021-02-10 14:14:29 +01:00
Xue Song e1a92eadba Merge branch 'master' into develop_SA_rfsim_for_F1 
Conflicts:
	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NGAP/ngap_gNB.c
	openair3/NGAP/ngap_gNB_nas_procedures.c
 2021-02-10 15:56:50 +09:00
He Shanyun 01999cfcc7 fix build error of enb and ittisim 2021-02-10 01:07:02 +00:00
Thomas Schlichter 75cd4c79d9 update tx_sample_advance for 40 MHz and USRP X300 (3/4 sampling) 
Testing RA with OAI gNB and UE both using X300 via PCIe link indicated a value of 15 was way too small.
The correct value for this setup seems to be 65.
 2021-02-09 18:09:11 +01:00
Thomas Schlichter b9e99f1e64 update tx_sample_advance for 10 MHz and USRP X300 
Tests with our USRP X300, connected via PCIe, show that tx_sample_advance of 45 is slightly too much.
Unfortunately, transmitting the PRACH preamble too early is very bad, slightly too late is no problem.
So change this value from 45 to 40. This helps receiving the PRACH preamble reliably.
 2021-02-09 17:51:33 +01:00
Thomas Schlichter 28f739bb70 add 10 MHz configuration file for USRP X300 2021-02-09 17:50:32 +01:00
dir cfebcd19bd Corrections to 217RBs, 273RB configuration files. RFSIM works with these changes 2021-02-09 17:32:51 +02:00
Florian Kaltenberger 04a4a6f451 Merge remote-tracking branch 'origin/develop' into benetel_driver_update 2021-02-09 11:13:01 +01:00
Florian Kaltenberger 12517f02e2 Reverting shifting the TX 4 bits to the left to exploit dynamic range. 
adapted ssb_block_power to measured value

This partially reverts commit 857f9179f3.

Conflicts:
	targets/ARCH/ETHERNET/benetel/5g/benetel.c
 2021-02-09 11:10:58 +01:00
Thomas Schlichter 14e84f8782 Merge remote-tracking branch 'develop' into NR_DL_MIMO 2021-02-09 10:02:54 +01:00
rmagueta 03b52cec84 Merge remote-tracking branch 'origin/develop' into develop-SA-RA 
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/LAYER2/NR_MAC_UE/rar_tools_nrUE.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/RRC/NR_UE/rrc_UE.c
 2021-02-08 15:17:12 +00:00
Raymond Knopp 4d47e3da96 IF4p5 testing. seems to work again with fixes after merge with develop 2021-02-08 15:27:37 +01:00
Sakthivel Velumani 8902902706 Merge branch 'develop' into ue-fixes 2021-02-08 15:06:17 +01:00
Thomas Schlichter 3743ead91a Merge remote-tracking branch 'develop' into NR_10MHz 2021-02-08 14:20:20 +01:00
Parminder Singh 222b37ff13 Merge remote-tracking branch 'origin/develop' into ptrs_rrc_config 2021-02-08 14:16:36 +01:00
Mahesh 0e6f1e6ad6 Merge conflicts resolved 2021-02-08 18:05:29 +05:30
francescomani 58ad2bf06f Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO 2021-02-08 12:05:06 +01:00
Laurent Thomas fa63d9a4e6 merge develop 2021-02-08 11:56:42 +01:00
Raymond Knopp 846c67b9bd Merge remote-tracking branch 'origin/develop' into oairu 
Conflicts:
	openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
 2021-02-07 18:23:46 +01:00
Raymond Knopp d06018d1e3 Merge branch 'four_antenna_eNB' into oairu 2021-02-07 17:46:23 +01:00
Raymond Knopp edff477050 reduced 5G memory limits for CI 2021-02-07 09:40:22 +01:00
Cedric Roux b7ea4e0f6d benetel 5g: support for two antennas 2021-02-05 16:48:30 +01:00
hardy 663dd1251c Merge remote-tracking branch 'origin/NR_RA_cleanup' into integration_2021_wk05 2021-02-05 12:00:38 +01:00
francescomani 28cb2c6c77 Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO 2021-02-04 08:26:32 +01:00
Cedric Roux a9f57407c7 benetel 4g: support two antennas 2021-02-03 17:07:18 +01:00
Thomas Schlichter 8b00361f56 fix warnings identified by CI 2021-02-03 10:50:38 +01:00
hardy c00b44028b Merge remote-tracking branch 'origin/develop-sib1-update' into integration_2021_wk05 2021-02-02 15:40:22 +01:00
rmagueta 76b974508b Merge branch 'develop' into develop-sib1-update-ue 
# Conflicts:
#	cmake_targets/CMakeLists.txt
 2021-02-02 12:10:12 +00:00
Raymond Knopp 4e9afb30b0 Merge remote-tracking branch 'origin/develop' into oairu 2021-02-02 12:09:56 +01:00
Khodr Saaifan 283a060497 Allow gNB to read pusch_AntennPorts from config file 2021-02-02 09:02:19 +01:00
Mahesh ae422aca1f Merge conficts resolved 2021-02-02 09:36:49 +05:30
luis_pereira87 6885668273 Fix AssertFatal in replay_node when file size is not a multiple of block size 2021-02-01 20:55:58 +00:00
Sakthivel Velumani c9dcff3d7e Merge branch 'develop' into ue-fixes 2021-02-01 16:07:58 +01:00