maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,325 Commits 5 Branches 0 Tags
38d0dca0bf2df12799db7adcd101d2fa7a4400d4
Commit Graph
8160 Commits
Author SHA1 Message Date
rmagueta 1d1aaa30e7 Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements 
# Conflicts:
#	openair1/PHY/INIT/nr_init.c
#	openair1/PHY/INIT/nr_init_ue.c
#	openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
 2022-03-28 15:06:23 +01:00
rmagueta 181e576698 Fix warning after merge 2022-03-28 13:53:35 +01:00
rmagueta 0abcf3d9c4 Merge remote-tracking branch 'origin/develop' into develop-CSI 
# Conflicts:
#	openair1/PHY/INIT/nr_init.c
#	openair1/PHY/INIT/nr_init_ue.c
#	openair1/PHY/NR_REFSIG/nr_gold.c
#	openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
#	openair1/PHY/defs_nr_common.h
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
 2022-03-28 13:32:46 +01:00
Robert Schmidt bf58c6b475 Merge remote-tracking branch 'origin/fix_rballoc_mask_type' into integration_2022_wk12_a 2022-03-25 08:29:52 +01:00
luis_pereira87 9a884af00a Fix rballoc_mask variable type from uint8_t to uint16_t 2022-03-24 14:19:02 +00:00
Robert Schmidt 7684803c64 Merge remote-tracking branch 'origin/nr-lc-sched' into integration_2022_wk12_a 2022-03-24 11:34:26 +01:00
rmagueta e834acfaf2 Temporary commit to test CSI-RS without core 2022-03-22 18:25:29 +00:00
rmagueta 17504695f8 Fix updated configurations that was reverted in merge 2022-03-22 18:02:12 +00:00
rmagueta a47861628b Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements 
# Conflicts:
#	openair1/PHY/INIT/nr_init.c
#	openair1/PHY/INIT/nr_init_ue.c
#	openair1/PHY/NR_REFSIG/nr_gold.c
#	openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
#	openair1/PHY/defs_nr_common.h
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/nr_rrc_proto.h
#	openair2/RRC/NR/rrc_gNB_reconfig.c
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
 2022-03-22 17:18:22 +00:00
Raymond Knopp d840ca0dee Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR 
Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
 2022-03-22 07:03:40 +01:00
rmagueta 199680d24d Address reviewer comments 2022-03-21 17:37:29 +00:00
francescomani 3dc7da3b22 fix for bad merge issues 2022-03-20 15:08:56 +01:00
Robert Schmidt d3b80b4785 Merge remote-tracking branch 'origin/nr-ue-fixes' into integration_2022_wk11 2022-03-18 16:48:43 +01:00
luis_pereira87 f439095c6e Fix bug after merge 2022-03-17 18:19:42 +00:00
Robert Schmidt b1eaa6606b Merge remote-tracking branch 'origin/NR_MIMO_memory' into integration_2022_wk11 2022-03-17 17:45:00 +01:00
rmagueta 190eaa1e42 Move CSI-RS configuration from fill_initial_SpCellConfig() to update_cellGroupConfig() 2022-03-17 16:36:50 +00:00
rmagueta 8704f81025 Remove duplicated code 2022-03-17 16:35:06 +00:00
rmagueta b59b84e904 Merge remote-tracking branch 'origin/develop' into develop-CSI 2022-03-17 01:03:35 +00:00
Robert Schmidt 7cbca077e0 Merge remote-tracking branch 'origin/NR_UL_VRB_MAP_improv' into integration_2022_wk11 2022-03-16 23:26:59 +01:00
rmagueta 2f2bc2a5e8 Merge remote-tracking branch 'origin/nr_csirs_rrc_harmonization' into develop-CSI 
# Conflicts:
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/nr_rrc_config.c
#	openair2/RRC/NR/nr_rrc_config.h
#	openair2/RRC/NR/rrc_gNB_reconfig.c
 2022-03-16 17:45:39 +00:00
rmagueta 3f88cc1fb1 Intermediate commit: move CSI configuration to a separate function 2022-03-16 17:19:36 +00:00
Robert Schmidt b0dd17f938 Merge remote-tracking branch 'origin/NR_SR_bugfix' into integration_2022_wk10 2022-03-14 19:11:17 +01:00
francescomani 1ab1fde7b8 fix for fdd and other warnings 2022-03-11 14:00:30 +01:00
Robert Schmidt 0c5242ea85 Apply review comment 2022-03-11 11:36:07 +00:00
Raymond Knopp d24068a33b some bugfixes for CSI reporting with PUCCH2. Configuration of cqi_Table 2 for CSI reporting when 256-QAM is enabled. 2022-03-11 01:23:39 +01:00
francescomani 48cd851cab SA SR bugfix 2022-03-10 18:31:46 +01:00
francescomani ddbc306246 Merge branch 'NR_UL_VRB_MAP_improv' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UL_VRB_MAP_improv 2022-03-09 14:57:33 +01:00
francescomani e7508533b6 review fix 2022-03-09 14:57:26 +01:00
Robert Schmidt 73bd9034aa Use strtok_r() to split strings in gnb_config.c 2022-03-09 14:39:38 +01:00
rmagueta db0ce84aa5 Fix FAPI for CSI-RS pdu and associated procedures 2022-03-08 13:18:17 +00:00
francescomani deee2a9ca1 Merge remote-tracking branch 'origin/develop' into NR_MIMO_memory 2022-03-08 09:16:18 +01:00
Robert Schmidt d8209228e7 Hide warning of unused variable 
From the comment above the line with the warning:
> This asn1cCalloc leaks memory but also masks a bug.
> If we delete this asn1cCalloc statement, eNB will crash in NSA mode.
> Please don't delete the following line unless the bug has been found
 2022-03-07 23:24:50 +01:00
Robert Schmidt 9714877ee0 Merge remote-tracking branch 'origin/remove-NR_UE_PBCH' into integration_2022_wk10 2022-03-07 23:12:49 +01:00
Robert Schmidt e285b003dc Merge remote-tracking branch 'origin/isolate-lfds' into integration_2022_wk10 2022-03-07 23:11:55 +01:00
Thomas Schlichter e3901a499b call process_CellGroup() after add_new_nr_ue() in gNB_scheduler_ulsch.c 
In case of do-ra mode (NSA) the OAI UE needs this, so the gNB correctly establishes the DRB.
 2022-03-07 16:22:50 +01:00
Thomas Schlichter e7500354c1 harmonize RLC and PDCP configurations in nr_DRB_preconfiguration() and fill_default_secondaryCellGroup() 
nr_DRB_preconfiguration() is used in phy-test mode by both, OAI UE and gNB, and in all other modes by OAI UE.
Because of inconsistencies, data transfer with OAI UE was only reliably working in phy-test mode.
Ultimately, OAI UE should use nr_DRB_preconfiguration() only in phy-test mode and do proper DRB configuration instead in all other modes!
 2022-03-07 16:02:01 +01:00
rmagueta bbe806a870 Merge remote-tracking branch 'origin/develop' into develop-CSI 
# Conflicts:
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.h
#	openair2/RRC/NR/nr_rrc_config.c
#	openair2/RRC/NR/nr_rrc_config.h
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR/rrc_gNB_nsa.c
 2022-03-07 13:10:40 +00:00
francescomani 1dac24844b Merge remote-tracking branch 'origin/develop' into NR_UL_VRB_MAP_improv 2022-03-07 09:47:19 +01:00
francescomani 4e76491f79 Merge remote-tracking branch 'origin/develop' into nr_csirs_rrc_harmonization 2022-03-07 09:09:17 +01:00
Raymond Knopp 2bd90d5b49 Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR 
Conflicts:
	openair2/RRC/NR/MESSAGES/asn1_msg.h
 2022-03-07 07:38:03 +01:00
Raymond Knopp fcd88de2ab SR/CSI multiplexing fix. default sl_head=6 instead of 4 to check if RF simulator behaves better 2022-03-07 00:08:12 +01:00
Laurent Thomas 939b249ba8 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into remove-NR_UE_PBCH 2022-03-06 15:53:09 +01:00
Laurent Thomas aa910f52b6 debug after develop merge 2022-03-06 15:52:42 +01:00
Raymond Knopp 3402ea00cc build for NR UE 2022-03-06 09:40:36 +01:00
Raymond Knopp f99754a5ea Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR 
Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
	openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	openair2/GNB_APP/gnb_config.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
 2022-03-05 21:12:32 +01:00
Raymond Knopp 79a5249a72 for testing 2022-03-05 16:18:06 +01:00
Robert Schmidt 07e6ea7edd Merge remote-tracking branch 'origin/fix-nrofHARQ' into integration_2022_wk09_b 2022-03-05 13:35:06 +01:00
Robert Schmidt cadbf67f67 Merge remote-tracking branch 'origin/tx-thread-stats-fix' into integration_2022_wk09_b 2022-03-05 13:34:15 +01:00
Robert Schmidt 0220f4a6e9 Merge remote-tracking branch 'origin/NR_RRC_256QAM_DL' into integration_2022_wk09_b 2022-03-05 13:33:18 +01:00
rmagueta a77769d45b Fix build after merge 2022-03-05 02:32:34 +00:00